webpipe-js 0.1.2 → 0.1.4

package/dist/index.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -39,7 +29,6 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/parser.ts
-var import_meta = {};
 var Parser = class {
   constructor(text) {
     this.pos = 0;
@@ -590,26 +579,6 @@ var ParseFailure = class extends Error {
 };
 function prettyPrint(program) {
   const lines = [];
-  program.configs.forEach((config) => {
-    lines.push(`config ${config.name} {`);
-    config.properties.forEach((prop) => {
-      const value = formatConfigValue(prop.value);
-      lines.push(`  ${prop.key}: ${value}`);
-    });
-    lines.push("}");
-    lines.push("");
-  });
-  program.variables.forEach((variable) => {
-    lines.push(`${variable.varType} ${variable.name} = \`${variable.value}\``);
-  });
-  if (program.variables.length > 0) lines.push("");
-  program.pipelines.forEach((pipeline) => {
-    lines.push(`pipeline ${pipeline.name} =`);
-    pipeline.pipeline.steps.forEach((step) => {
-      lines.push(formatPipelineStep(step));
-    });
-    lines.push("");
-  });
   program.routes.forEach((route) => {
     lines.push(`${route.method} ${route.path}`);
     const pipelineLines = formatPipelineRef(route.pipeline);
@@ -634,11 +603,35 @@ function prettyPrint(program) {
       test.conditions.forEach((condition) => {
         const condType = condition.conditionType.toLowerCase();
         const jqPart = condition.jqExpr ? ` \`${condition.jqExpr}\`` : "";
-        lines.push(`    ${condType} ${condition.field}${jqPart} ${condition.comparison} ${condition.value}`);
+        const value = condition.value.startsWith("`") ? condition.value : condition.value.includes("\n") || condition.value.includes("{") || condition.value.includes("[") ? `\`${condition.value}\`` : condition.value;
+        lines.push(`    ${condType} ${condition.field}${jqPart} ${condition.comparison} ${value}`);
       });
       lines.push("");
     });
   });
+  if (program.configs.length > 0) {
+    lines.push("## Config");
+    program.configs.forEach((config) => {
+      lines.push(`config ${config.name} {`);
+      config.properties.forEach((prop) => {
+        const value = formatConfigValue(prop.value);
+        lines.push(`  ${prop.key}: ${value}`);
+      });
+      lines.push("}");
+      lines.push("");
+    });
+  }
+  program.pipelines.forEach((pipeline) => {
+    lines.push(`pipeline ${pipeline.name} =`);
+    pipeline.pipeline.steps.forEach((step) => {
+      lines.push(formatPipelineStep(step));
+    });
+    lines.push("");
+  });
+  program.variables.forEach((variable) => {
+    lines.push(`${variable.varType} ${variable.name} = \`${variable.value}\``);
+  });
+  if (program.variables.length > 0) lines.push("");
   return lines.join("\n").trim();
 }
 function formatConfigValue(value) {
@@ -669,9 +662,9 @@ function formatPipelineStep(step, indent = "  ") {
   }
 }
 function formatStepConfig(config) {
-  if (config.includes("`")) {
+  if (config.includes("\n") || config.includes("{") || config.includes("[") || config.includes(".") || config.includes("(")) {
     return `\`${config}\``;
-  } else if (config.includes(" ") || config.includes("\n")) {
+  } else if (config.includes(" ")) {
     return `"${config}"`;
   } else {
     return config;
@@ -698,19 +691,6 @@ function formatWhen(when) {
       return `executing variable ${when.varType} ${when.name}`;
   }
 }
-if (import_meta.url === `file://${process.argv[1]}`) {
-  (async () => {
-    const fs = await import("fs/promises");
-    const path = process.argv[2];
-    if (!path) {
-      console.error("Usage: node dist/index.mjs <file.wp>");
-      process.exit(1);
-    }
-    const src = await fs.readFile(path, "utf8");
-    const program = parseProgram(src);
-    console.log(JSON.stringify(program, null, 2));
-  })();
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getPipelineRanges,

package/dist/index.mjs

@@ -549,26 +549,6 @@ var ParseFailure = class extends Error {
 };
 function prettyPrint(program) {
   const lines = [];
-  program.configs.forEach((config) => {
-    lines.push(`config ${config.name} {`);
-    config.properties.forEach((prop) => {
-      const value = formatConfigValue(prop.value);
-      lines.push(`  ${prop.key}: ${value}`);
-    });
-    lines.push("}");
-    lines.push("");
-  });
-  program.variables.forEach((variable) => {
-    lines.push(`${variable.varType} ${variable.name} = \`${variable.value}\``);
-  });
-  if (program.variables.length > 0) lines.push("");
-  program.pipelines.forEach((pipeline) => {
-    lines.push(`pipeline ${pipeline.name} =`);
-    pipeline.pipeline.steps.forEach((step) => {
-      lines.push(formatPipelineStep(step));
-    });
-    lines.push("");
-  });
   program.routes.forEach((route) => {
     lines.push(`${route.method} ${route.path}`);
     const pipelineLines = formatPipelineRef(route.pipeline);
@@ -593,11 +573,35 @@ function prettyPrint(program) {
       test.conditions.forEach((condition) => {
         const condType = condition.conditionType.toLowerCase();
         const jqPart = condition.jqExpr ? ` \`${condition.jqExpr}\`` : "";
-        lines.push(`    ${condType} ${condition.field}${jqPart} ${condition.comparison} ${condition.value}`);
+        const value = condition.value.startsWith("`") ? condition.value : condition.value.includes("\n") || condition.value.includes("{") || condition.value.includes("[") ? `\`${condition.value}\`` : condition.value;
+        lines.push(`    ${condType} ${condition.field}${jqPart} ${condition.comparison} ${value}`);
       });
       lines.push("");
     });
   });
+  if (program.configs.length > 0) {
+    lines.push("## Config");
+    program.configs.forEach((config) => {
+      lines.push(`config ${config.name} {`);
+      config.properties.forEach((prop) => {
+        const value = formatConfigValue(prop.value);
+        lines.push(`  ${prop.key}: ${value}`);
+      });
+      lines.push("}");
+      lines.push("");
+    });
+  }
+  program.pipelines.forEach((pipeline) => {
+    lines.push(`pipeline ${pipeline.name} =`);
+    pipeline.pipeline.steps.forEach((step) => {
+      lines.push(formatPipelineStep(step));
+    });
+    lines.push("");
+  });
+  program.variables.forEach((variable) => {
+    lines.push(`${variable.varType} ${variable.name} = \`${variable.value}\``);
+  });
+  if (program.variables.length > 0) lines.push("");
   return lines.join("\n").trim();
 }
 function formatConfigValue(value) {
@@ -628,9 +632,9 @@ function formatPipelineStep(step, indent = "  ") {
   }
 }
 function formatStepConfig(config) {
-  if (config.includes("`")) {
+  if (config.includes("\n") || config.includes("{") || config.includes("[") || config.includes(".") || config.includes("(")) {
     return `\`${config}\``;
-  } else if (config.includes(" ") || config.includes("\n")) {
+  } else if (config.includes(" ")) {
     return `"${config}"`;
   } else {
     return config;
@@ -657,19 +661,6 @@ function formatWhen(when) {
       return `executing variable ${when.varType} ${when.name}`;
   }
 }
-if (import.meta.url === `file://${process.argv[1]}`) {
-  (async () => {
-    const fs = await import("fs/promises");
-    const path = process.argv[2];
-    if (!path) {
-      console.error("Usage: node dist/index.mjs <file.wp>");
-      process.exit(1);
-    }
-    const src = await fs.readFile(path, "utf8");
-    const program = parseProgram(src);
-    console.log(JSON.stringify(program, null, 2));
-  })();
-}
 export {
   getPipelineRanges,
   getVariableRanges,

package/package.json

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