webpipe-js 2.0.50 → 2.0.52

package/dist/index.cjs

@@ -127,21 +127,27 @@ var Parser = class {
       const originalPos = this.pos;
       this.pos++;
       const restOfLine = this.consumeWhile((ch) => ch !== "\n");
+      const end = this.pos;
       return {
         type: "standalone",
         text: restOfLine,
         style: "#",
-        lineNumber: this.getLineNumber(start)
+        lineNumber: this.getLineNumber(start),
+        start,
+        end
       };
     }
     if (this.text.startsWith("//", this.pos)) {
       this.pos += 2;
       const text = this.consumeWhile((ch) => ch !== "\n");
+      const end = this.pos;
       return {
         type: "standalone",
         text,
         style: "//",
-        lineNumber: this.getLineNumber(start)
+        lineNumber: this.getLineNumber(start),
+        start,
+        end
       };
     }
     return null;
@@ -889,14 +895,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 +919,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 +941,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 +1615,22 @@ 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) => {
+    if (comment.start !== void 0) {
+      items.push({ type: "comment", item: comment, position: comment.start });
+    }
+  });
+  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 +2029,22 @@ 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) => {
+      if (comment.start !== void 0) {
+        items.push({ type: "comment", item: comment, position: comment.start });
+      }
+    });
+    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

@@ -16,6 +16,8 @@ interface Comment {
     text: string;
     style: '#' | '//';
     lineNumber?: number;
+    start?: number;
+    end?: number;
 }
 interface Config {
     name: string;
@@ -116,6 +118,7 @@ type PipelineRef = {
 };
 interface Pipeline {
     steps: PipelineStep[];
+    comments: Comment[];
     start: number;
     end: number;
 }

package/dist/index.d.ts

@@ -16,6 +16,8 @@ interface Comment {
     text: string;
     style: '#' | '//';
     lineNumber?: number;
+    start?: number;
+    end?: number;
 }
 interface Config {
     name: string;
@@ -116,6 +118,7 @@ type PipelineRef = {
 };
 interface Pipeline {
     steps: PipelineStep[];
+    comments: Comment[];
     start: number;
     end: number;
 }

package/dist/index.mjs

@@ -74,21 +74,27 @@ var Parser = class {
       const originalPos = this.pos;
       this.pos++;
       const restOfLine = this.consumeWhile((ch) => ch !== "\n");
+      const end = this.pos;
       return {
         type: "standalone",
         text: restOfLine,
         style: "#",
-        lineNumber: this.getLineNumber(start)
+        lineNumber: this.getLineNumber(start),
+        start,
+        end
       };
     }
     if (this.text.startsWith("//", this.pos)) {
       this.pos += 2;
       const text = this.consumeWhile((ch) => ch !== "\n");
+      const end = this.pos;
       return {
         type: "standalone",
         text,
         style: "//",
-        lineNumber: this.getLineNumber(start)
+        lineNumber: this.getLineNumber(start),
+        start,
+        end
       };
     }
     return null;
@@ -836,14 +842,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 +866,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 +888,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 +1562,22 @@ 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) => {
+    if (comment.start !== void 0) {
+      items.push({ type: "comment", item: comment, position: comment.start });
+    }
+  });
+  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 +1976,22 @@ 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) => {
+      if (comment.start !== void 0) {
+        items.push({ type: "comment", item: comment, position: comment.start });
+      }
+    });
+    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.52",
   "description": "Web Pipe parser",
   "license": "ISC",
   "author": "William Cotton",