webpipe-js 0.1.11 → 2.0.0

package/dist/index.cjs

@@ -24,6 +24,8 @@ __export(index_exports, {
   formatPipelineRef: () => formatPipelineRef,
   formatPipelineStep: () => formatPipelineStep,
   formatStepConfig: () => formatStepConfig,
+  formatTag: () => formatTag,
+  formatTags: () => formatTags,
   formatWhen: () => formatWhen,
   getPipelineRanges: () => getPipelineRanges,
   getVariableRanges: () => getVariableRanges,
@@ -316,6 +318,54 @@ var Parser = class {
     if (id !== null) return { config: id, configType: "identifier" };
     throw new ParseFailure("step-config", this.pos);
   }
+  parseTag() {
+    this.expect("@");
+    const negated = this.cur() === "!";
+    if (negated) this.pos++;
+    const name = this.parseIdentifier();
+    let args = [];
+    if (this.cur() === "(") {
+      args = this.parseTagArgs();
+    }
+    return { name, negated, args };
+  }
+  parseTagArgs() {
+    this.expect("(");
+    const args = [];
+    this.skipInlineSpaces();
+    if (this.cur() === ")") {
+      throw new ParseFailure("empty tag arguments not allowed", this.pos);
+    }
+    args.push(this.parseIdentifier());
+    this.skipInlineSpaces();
+    while (this.cur() === ",") {
+      this.pos++;
+      this.skipInlineSpaces();
+      if (this.cur() === ")") {
+        throw new ParseFailure("trailing comma in tag arguments", this.pos);
+      }
+      args.push(this.parseIdentifier());
+      this.skipInlineSpaces();
+    }
+    this.expect(")");
+    return args;
+  }
+  parseTags() {
+    const tags = [];
+    while (!this.eof()) {
+      this.skipInlineSpaces();
+      const ch = this.cur();
+      if (ch === "\n" || ch === "\r" || ch === "#" || this.text.startsWith("//", this.pos)) {
+        break;
+      }
+      if (ch === "@") {
+        tags.push(this.parseTag());
+      } else {
+        break;
+      }
+    }
+    return tags;
+  }
   parseConfigValue() {
     const envWithDefault = this.tryParse(() => {
       this.expect("$");
@@ -387,8 +437,9 @@ var Parser = class {
     this.expect(":");
     this.skipInlineSpaces();
     const { config, configType } = this.parseStepConfig();
+    const tags = this.parseTags();
     this.skipWhitespaceOnly();
-    return { kind: "Regular", name, config, configType };
+    return { kind: "Regular", name, config, configType, tags };
   }
   parseResultStep() {
     this.skipWhitespaceOnly();
@@ -786,12 +837,7 @@ function prettyPrint(program) {
     allItems.push({ type: "comment", item: comment, lineNumber: comment.lineNumber || 0 });
   });
   allItems.sort((a, b) => a.lineNumber - b.lineNumber);
-  let hasConfigs = false;
   allItems.forEach((entry, index) => {
-    if (entry.type === "config" && !hasConfigs) {
-      lines.push("## Config");
-      hasConfigs = true;
-    }
     switch (entry.type) {
       case "comment":
         lines.push(printComment(entry.item));
@@ -835,7 +881,9 @@ function formatConfigValue(value) {
 }
 function formatPipelineStep(step, indent = "  ") {
   if (step.kind === "Regular") {
-    return `${indent}|> ${step.name}: ${formatStepConfig(step.config, step.configType)}`;
+    const configPart = formatStepConfig(step.config, step.configType);
+    const tagsPart = step.tags.length > 0 ? " " + formatTags(step.tags) : "";
+    return `${indent}|> ${step.name}: ${configPart}${tagsPart}`;
   } else {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {
@@ -858,6 +906,14 @@ function formatStepConfig(config, configType) {
       return config;
   }
 }
+function formatTags(tags) {
+  return tags.map(formatTag).join(" ");
+}
+function formatTag(tag) {
+  const negation = tag.negated ? "!" : "";
+  const args = tag.args.length > 0 ? `(${tag.args.join(",")})` : "";
+  return `@${negation}${tag.name}${args}`;
+}
 function formatPipelineRef(ref) {
   if (ref.kind === "Named") {
     return [`  |> pipeline: ${ref.name}`];
@@ -885,6 +941,8 @@ function formatWhen(when) {
   formatPipelineRef,
   formatPipelineStep,
   formatStepConfig,
+  formatTag,
+  formatTags,
   formatWhen,
   getPipelineRanges,
   getVariableRanges,

package/dist/index.d.cts

@@ -67,11 +67,17 @@ interface Pipeline {
     steps: PipelineStep[];
 }
 type ConfigType = 'backtick' | 'quoted' | 'identifier';
+interface Tag {
+    name: string;
+    negated: boolean;
+    args: string[];
+}
 type PipelineStep = {
     kind: 'Regular';
     name: string;
     config: string;
     configType: ConfigType;
+    tags: Tag[];
 } | {
     kind: 'Result';
     branches: ResultBranch[];
@@ -159,7 +165,9 @@ declare function prettyPrint(program: Program): string;
 declare function formatConfigValue(value: ConfigValue): string;
 declare function formatPipelineStep(step: PipelineStep, indent?: string): string;
 declare function formatStepConfig(config: string, configType: ConfigType): string;
+declare function formatTags(tags: Tag[]): string;
+declare function formatTag(tag: Tag): 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 It, type Mock, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type ResultBranch, type ResultBranchType, type Route, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type It, type Mock, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type ResultBranch, type ResultBranchType, type Route, type Tag, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };

package/dist/index.d.ts

@@ -67,11 +67,17 @@ interface Pipeline {
     steps: PipelineStep[];
 }
 type ConfigType = 'backtick' | 'quoted' | 'identifier';
+interface Tag {
+    name: string;
+    negated: boolean;
+    args: string[];
+}
 type PipelineStep = {
     kind: 'Regular';
     name: string;
     config: string;
     configType: ConfigType;
+    tags: Tag[];
 } | {
     kind: 'Result';
     branches: ResultBranch[];
@@ -159,7 +165,9 @@ declare function prettyPrint(program: Program): string;
 declare function formatConfigValue(value: ConfigValue): string;
 declare function formatPipelineStep(step: PipelineStep, indent?: string): string;
 declare function formatStepConfig(config: string, configType: ConfigType): string;
+declare function formatTags(tags: Tag[]): string;
+declare function formatTag(tag: Tag): 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 It, type Mock, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type ResultBranch, type ResultBranchType, type Route, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type It, type Mock, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type ResultBranch, type ResultBranchType, type Route, type Tag, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };

package/dist/index.mjs

@@ -272,6 +272,54 @@ var Parser = class {
     if (id !== null) return { config: id, configType: "identifier" };
     throw new ParseFailure("step-config", this.pos);
   }
+  parseTag() {
+    this.expect("@");
+    const negated = this.cur() === "!";
+    if (negated) this.pos++;
+    const name = this.parseIdentifier();
+    let args = [];
+    if (this.cur() === "(") {
+      args = this.parseTagArgs();
+    }
+    return { name, negated, args };
+  }
+  parseTagArgs() {
+    this.expect("(");
+    const args = [];
+    this.skipInlineSpaces();
+    if (this.cur() === ")") {
+      throw new ParseFailure("empty tag arguments not allowed", this.pos);
+    }
+    args.push(this.parseIdentifier());
+    this.skipInlineSpaces();
+    while (this.cur() === ",") {
+      this.pos++;
+      this.skipInlineSpaces();
+      if (this.cur() === ")") {
+        throw new ParseFailure("trailing comma in tag arguments", this.pos);
+      }
+      args.push(this.parseIdentifier());
+      this.skipInlineSpaces();
+    }
+    this.expect(")");
+    return args;
+  }
+  parseTags() {
+    const tags = [];
+    while (!this.eof()) {
+      this.skipInlineSpaces();
+      const ch = this.cur();
+      if (ch === "\n" || ch === "\r" || ch === "#" || this.text.startsWith("//", this.pos)) {
+        break;
+      }
+      if (ch === "@") {
+        tags.push(this.parseTag());
+      } else {
+        break;
+      }
+    }
+    return tags;
+  }
   parseConfigValue() {
     const envWithDefault = this.tryParse(() => {
       this.expect("$");
@@ -343,8 +391,9 @@ var Parser = class {
     this.expect(":");
     this.skipInlineSpaces();
     const { config, configType } = this.parseStepConfig();
+    const tags = this.parseTags();
     this.skipWhitespaceOnly();
-    return { kind: "Regular", name, config, configType };
+    return { kind: "Regular", name, config, configType, tags };
   }
   parseResultStep() {
     this.skipWhitespaceOnly();
@@ -742,12 +791,7 @@ function prettyPrint(program) {
     allItems.push({ type: "comment", item: comment, lineNumber: comment.lineNumber || 0 });
   });
   allItems.sort((a, b) => a.lineNumber - b.lineNumber);
-  let hasConfigs = false;
   allItems.forEach((entry, index) => {
-    if (entry.type === "config" && !hasConfigs) {
-      lines.push("## Config");
-      hasConfigs = true;
-    }
     switch (entry.type) {
       case "comment":
         lines.push(printComment(entry.item));
@@ -791,7 +835,9 @@ function formatConfigValue(value) {
 }
 function formatPipelineStep(step, indent = "  ") {
   if (step.kind === "Regular") {
-    return `${indent}|> ${step.name}: ${formatStepConfig(step.config, step.configType)}`;
+    const configPart = formatStepConfig(step.config, step.configType);
+    const tagsPart = step.tags.length > 0 ? " " + formatTags(step.tags) : "";
+    return `${indent}|> ${step.name}: ${configPart}${tagsPart}`;
   } else {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {
@@ -814,6 +860,14 @@ function formatStepConfig(config, configType) {
       return config;
   }
 }
+function formatTags(tags) {
+  return tags.map(formatTag).join(" ");
+}
+function formatTag(tag) {
+  const negation = tag.negated ? "!" : "";
+  const args = tag.args.length > 0 ? `(${tag.args.join(",")})` : "";
+  return `@${negation}${tag.name}${args}`;
+}
 function formatPipelineRef(ref) {
   if (ref.kind === "Named") {
     return [`  |> pipeline: ${ref.name}`];
@@ -840,6 +894,8 @@ export {
   formatPipelineRef,
   formatPipelineStep,
   formatStepConfig,
+  formatTag,
+  formatTags,
   formatWhen,
   getPipelineRanges,
   getVariableRanges,

package/package.json

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