webpipe-js 2.0.50 → 2.0.51

package/dist/index.cjs

@@ -889,14 +889,20 @@ var Parser = class {
   parseIfPipeline(...stopKeywords) {
     const start = this.pos;
     const steps = [];
+    const comments = [];
     while (true) {
       const save = this.pos;
       this.skipSpaces();
+      const comment = this.tryParse(() => this.parseStandaloneComment());
+      if (comment) {
+        comments.push(comment);
+        continue;
+      }
       for (const keyword of stopKeywords) {
         if (this.text.startsWith(keyword, this.pos)) {
           this.pos = save;
           const end2 = this.pos;
-          return { steps, start, end: end2 };
+          return { steps, comments, start, end: end2 };
         }
       }
       if (!this.text.startsWith("|>", this.pos)) {
@@ -907,14 +913,20 @@ var Parser = class {
       steps.push(step);
     }
     const end = this.pos;
-    return { steps, start, end };
+    return { steps, comments, start, end };
   }
   parsePipeline() {
     const start = this.pos;
     const steps = [];
+    const comments = [];
     while (true) {
       const save = this.pos;
       this.skipSpaces();
+      const comment = this.tryParse(() => this.parseStandaloneComment());
+      if (comment) {
+        comments.push(comment);
+        continue;
+      }
       if (!this.text.startsWith("|>", this.pos)) {
         this.pos = save;
         break;
@@ -923,7 +935,7 @@ var Parser = class {
       steps.push(step);
     }
     const end = this.pos;
-    return { steps, start, end };
+    return { steps, comments, start, end };
   }
   parseNamedPipeline() {
     const start = this.pos;
@@ -1597,8 +1609,20 @@ function printPipeline(pipeline) {
   } else {
     lines.push(pipelineLine);
   }
+  const items = [];
   pipeline.pipeline.steps.forEach((step) => {
-    lines.push(formatPipelineStep(step));
+    items.push({ type: "step", item: step, position: step.start });
+  });
+  pipeline.pipeline.comments.forEach((comment) => {
+    items.push({ type: "comment", item: comment, position: comment.lineNumber || 0 });
+  });
+  items.sort((a, b) => a.position - b.position);
+  items.forEach((entry) => {
+    if (entry.type === "step") {
+      lines.push(formatPipelineStep(entry.item));
+    } else {
+      lines.push(`  ${printComment(entry.item)}`);
+    }
   });
   return lines.join("\n");
 }
@@ -1997,8 +2021,20 @@ function formatPipelineRef(ref) {
     return [`  |> pipeline: ${ref.name}`];
   } else {
     const lines = [];
+    const items = [];
     ref.pipeline.steps.forEach((step) => {
-      lines.push(formatPipelineStep(step));
+      items.push({ type: "step", item: step, position: step.start });
+    });
+    ref.pipeline.comments.forEach((comment) => {
+      items.push({ type: "comment", item: comment, position: comment.lineNumber || 0 });
+    });
+    items.sort((a, b) => a.position - b.position);
+    items.forEach((entry) => {
+      if (entry.type === "step") {
+        lines.push(formatPipelineStep(entry.item));
+      } else {
+        lines.push(`  ${printComment(entry.item)}`);
+      }
     });
     return lines;
   }

package/dist/index.d.cts

@@ -116,6 +116,7 @@ type PipelineRef = {
 };
 interface Pipeline {
     steps: PipelineStep[];
+    comments: Comment[];
     start: number;
     end: number;
 }

package/dist/index.d.ts

@@ -116,6 +116,7 @@ type PipelineRef = {
 };
 interface Pipeline {
     steps: PipelineStep[];
+    comments: Comment[];
     start: number;
     end: number;
 }

package/dist/index.mjs

@@ -836,14 +836,20 @@ var Parser = class {
   parseIfPipeline(...stopKeywords) {
     const start = this.pos;
     const steps = [];
+    const comments = [];
     while (true) {
       const save = this.pos;
       this.skipSpaces();
+      const comment = this.tryParse(() => this.parseStandaloneComment());
+      if (comment) {
+        comments.push(comment);
+        continue;
+      }
       for (const keyword of stopKeywords) {
         if (this.text.startsWith(keyword, this.pos)) {
           this.pos = save;
           const end2 = this.pos;
-          return { steps, start, end: end2 };
+          return { steps, comments, start, end: end2 };
         }
       }
       if (!this.text.startsWith("|>", this.pos)) {
@@ -854,14 +860,20 @@ var Parser = class {
       steps.push(step);
     }
     const end = this.pos;
-    return { steps, start, end };
+    return { steps, comments, start, end };
   }
   parsePipeline() {
     const start = this.pos;
     const steps = [];
+    const comments = [];
     while (true) {
       const save = this.pos;
       this.skipSpaces();
+      const comment = this.tryParse(() => this.parseStandaloneComment());
+      if (comment) {
+        comments.push(comment);
+        continue;
+      }
       if (!this.text.startsWith("|>", this.pos)) {
         this.pos = save;
         break;
@@ -870,7 +882,7 @@ var Parser = class {
       steps.push(step);
     }
     const end = this.pos;
-    return { steps, start, end };
+    return { steps, comments, start, end };
   }
   parseNamedPipeline() {
     const start = this.pos;
@@ -1544,8 +1556,20 @@ function printPipeline(pipeline) {
   } else {
     lines.push(pipelineLine);
   }
+  const items = [];
   pipeline.pipeline.steps.forEach((step) => {
-    lines.push(formatPipelineStep(step));
+    items.push({ type: "step", item: step, position: step.start });
+  });
+  pipeline.pipeline.comments.forEach((comment) => {
+    items.push({ type: "comment", item: comment, position: comment.lineNumber || 0 });
+  });
+  items.sort((a, b) => a.position - b.position);
+  items.forEach((entry) => {
+    if (entry.type === "step") {
+      lines.push(formatPipelineStep(entry.item));
+    } else {
+      lines.push(`  ${printComment(entry.item)}`);
+    }
   });
   return lines.join("\n");
 }
@@ -1944,8 +1968,20 @@ function formatPipelineRef(ref) {
     return [`  |> pipeline: ${ref.name}`];
   } else {
     const lines = [];
+    const items = [];
     ref.pipeline.steps.forEach((step) => {
-      lines.push(formatPipelineStep(step));
+      items.push({ type: "step", item: step, position: step.start });
+    });
+    ref.pipeline.comments.forEach((comment) => {
+      items.push({ type: "comment", item: comment, position: comment.lineNumber || 0 });
+    });
+    items.sort((a, b) => a.position - b.position);
+    items.forEach((entry) => {
+      if (entry.type === "step") {
+        lines.push(formatPipelineStep(entry.item));
+      } else {
+        lines.push(`  ${printComment(entry.item)}`);
+      }
     });
     return lines;
   }

package/package.json

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