webpipe-js 0.1.3 → 0.1.5

package/dist/index.cjs

@@ -20,11 +20,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  formatConfigValue: () => formatConfigValue,
+  formatPipelineRef: () => formatPipelineRef,
+  formatPipelineStep: () => formatPipelineStep,
+  formatStepConfig: () => formatStepConfig,
+  formatWhen: () => formatWhen,
   getPipelineRanges: () => getPipelineRanges,
   getVariableRanges: () => getVariableRanges,
   parseProgram: () => parseProgram,
   parseProgramWithDiagnostics: () => parseProgramWithDiagnostics,
-  prettyPrint: () => prettyPrint
+  prettyPrint: () => prettyPrint,
+  printCondition: () => printCondition,
+  printConfig: () => printConfig,
+  printDescribe: () => printDescribe,
+  printMock: () => printMock,
+  printPipeline: () => printPipeline,
+  printRoute: () => printRoute,
+  printTest: () => printTest,
+  printVariable: () => printVariable
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -577,57 +590,98 @@ var ParseFailure = class extends Error {
     this.at = at;
   }
 };
-function prettyPrint(program) {
+function printRoute(route) {
   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("");
+  lines.push(`${route.method} ${route.path}`);
+  const pipelineLines = formatPipelineRef(route.pipeline);
+  pipelineLines.forEach((line) => lines.push(line));
+  return lines.join("\n");
+}
+function printConfig(config) {
+  const lines = [];
+  lines.push(`config ${config.name} {`);
+  config.properties.forEach((prop) => {
+    const value = formatConfigValue(prop.value);
+    lines.push(`  ${prop.key}: ${value}`);
   });
-  program.variables.forEach((variable) => {
-    lines.push(`${variable.varType} ${variable.name} = \`${variable.value}\``);
+  lines.push("}");
+  return lines.join("\n");
+}
+function printPipeline(pipeline) {
+  const lines = [];
+  lines.push(`pipeline ${pipeline.name} =`);
+  pipeline.pipeline.steps.forEach((step) => {
+    lines.push(formatPipelineStep(step));
   });
-  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));
-    });
+  return lines.join("\n");
+}
+function printVariable(variable) {
+  return `${variable.varType} ${variable.name} = \`${variable.value}\``;
+}
+function printMock(mock, indent = "  ") {
+  return `${indent}with mock ${mock.target} returning \`${mock.returnValue}\``;
+}
+function printCondition(condition, indent = "    ") {
+  const condType = condition.conditionType.toLowerCase();
+  const jqPart = condition.jqExpr ? ` \`${condition.jqExpr}\`` : "";
+  const value = condition.value.startsWith("`") ? condition.value : condition.value.includes("\n") || condition.value.includes("{") || condition.value.includes("[") ? `\`${condition.value}\`` : condition.value;
+  return `${indent}${condType} ${condition.field}${jqPart} ${condition.comparison} ${value}`;
+}
+function printTest(test) {
+  const lines = [];
+  lines.push(`  it "${test.name}"`);
+  test.mocks.forEach((mock) => {
+    lines.push(printMock(mock, "    "));
+  });
+  lines.push(`    when ${formatWhen(test.when)}`);
+  if (test.input) {
+    lines.push(`    with input \`${test.input}\``);
+  }
+  test.conditions.forEach((condition) => {
+    lines.push(printCondition(condition));
+  });
+  return lines.join("\n");
+}
+function printDescribe(describe) {
+  const lines = [];
+  lines.push(`describe "${describe.name}"`);
+  describe.mocks.forEach((mock) => {
+    lines.push(printMock(mock));
+  });
+  if (describe.mocks.length > 0) {
+    lines.push("");
+  }
+  describe.tests.forEach((test) => {
+    lines.push(printTest(test));
     lines.push("");
   });
+  return lines.join("\n").replace(/\n\n$/, "\n");
+}
+function prettyPrint(program) {
+  const lines = [];
   program.routes.forEach((route) => {
-    lines.push(`${route.method} ${route.path}`);
-    const pipelineLines = formatPipelineRef(route.pipeline);
-    pipelineLines.forEach((line) => lines.push(line));
+    lines.push(printRoute(route));
     lines.push("");
   });
   program.describes.forEach((describe) => {
-    lines.push(`describe "${describe.name}"`);
-    describe.mocks.forEach((mock) => {
-      lines.push(`  with mock ${mock.target} returning \`${mock.returnValue}\``);
-    });
+    lines.push(printDescribe(describe));
     lines.push("");
-    describe.tests.forEach((test) => {
-      lines.push(`  it "${test.name}"`);
-      test.mocks.forEach((mock) => {
-        lines.push(`    with mock ${mock.target} returning \`${mock.returnValue}\``);
-      });
-      lines.push(`    when ${formatWhen(test.when)}`);
-      if (test.input) {
-        lines.push(`    with input \`${test.input}\``);
-      }
-      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}`);
-      });
+  });
+  if (program.configs.length > 0) {
+    lines.push("## Config");
+    program.configs.forEach((config) => {
+      lines.push(printConfig(config));
       lines.push("");
     });
+  }
+  program.pipelines.forEach((pipeline) => {
+    lines.push(printPipeline(pipeline));
+    lines.push("");
+  });
+  program.variables.forEach((variable) => {
+    lines.push(printVariable(variable));
   });
+  if (program.variables.length > 0) lines.push("");
   return lines.join("\n").trim();
 }
 function formatConfigValue(value) {
@@ -658,9 +712,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;
@@ -689,9 +743,22 @@ function formatWhen(when) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  formatConfigValue,
+  formatPipelineRef,
+  formatPipelineStep,
+  formatStepConfig,
+  formatWhen,
   getPipelineRanges,
   getVariableRanges,
   parseProgram,
   parseProgramWithDiagnostics,
-  prettyPrint
+  prettyPrint,
+  printCondition,
+  printConfig,
+  printDescribe,
+  printMock,
+  printPipeline,
+  printRoute,
+  printTest,
+  printVariable
 });

package/dist/index.d.cts

@@ -127,6 +127,19 @@ declare function getVariableRanges(text: string): Map<string, {
     start: number;
     end: number;
 }>;
+declare function printRoute(route: Route): string;
+declare function printConfig(config: Config): string;
+declare function printPipeline(pipeline: NamedPipeline): string;
+declare function printVariable(variable: Variable): string;
+declare function printMock(mock: Mock, indent?: string): string;
+declare function printCondition(condition: Condition, indent?: string): string;
+declare function printTest(test: It): string;
+declare function printDescribe(describe: Describe): string;
 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): string;
+declare function formatPipelineRef(ref: PipelineRef): string[];
+declare function formatWhen(when: When): string;
 
-export { type Condition, type Config, type ConfigProperty, 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, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint };
+export { type Condition, type Config, type ConfigProperty, 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, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };

package/dist/index.d.ts

@@ -127,6 +127,19 @@ declare function getVariableRanges(text: string): Map<string, {
     start: number;
     end: number;
 }>;
+declare function printRoute(route: Route): string;
+declare function printConfig(config: Config): string;
+declare function printPipeline(pipeline: NamedPipeline): string;
+declare function printVariable(variable: Variable): string;
+declare function printMock(mock: Mock, indent?: string): string;
+declare function printCondition(condition: Condition, indent?: string): string;
+declare function printTest(test: It): string;
+declare function printDescribe(describe: Describe): string;
 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): string;
+declare function formatPipelineRef(ref: PipelineRef): string[];
+declare function formatWhen(when: When): string;
 
-export { type Condition, type Config, type ConfigProperty, 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, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint };
+export { type Condition, type Config, type ConfigProperty, 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, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };

package/dist/index.mjs

@@ -547,57 +547,98 @@ var ParseFailure = class extends Error {
     this.at = at;
   }
 };
-function prettyPrint(program) {
+function printRoute(route) {
   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("");
+  lines.push(`${route.method} ${route.path}`);
+  const pipelineLines = formatPipelineRef(route.pipeline);
+  pipelineLines.forEach((line) => lines.push(line));
+  return lines.join("\n");
+}
+function printConfig(config) {
+  const lines = [];
+  lines.push(`config ${config.name} {`);
+  config.properties.forEach((prop) => {
+    const value = formatConfigValue(prop.value);
+    lines.push(`  ${prop.key}: ${value}`);
   });
-  program.variables.forEach((variable) => {
-    lines.push(`${variable.varType} ${variable.name} = \`${variable.value}\``);
+  lines.push("}");
+  return lines.join("\n");
+}
+function printPipeline(pipeline) {
+  const lines = [];
+  lines.push(`pipeline ${pipeline.name} =`);
+  pipeline.pipeline.steps.forEach((step) => {
+    lines.push(formatPipelineStep(step));
   });
-  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));
-    });
+  return lines.join("\n");
+}
+function printVariable(variable) {
+  return `${variable.varType} ${variable.name} = \`${variable.value}\``;
+}
+function printMock(mock, indent = "  ") {
+  return `${indent}with mock ${mock.target} returning \`${mock.returnValue}\``;
+}
+function printCondition(condition, indent = "    ") {
+  const condType = condition.conditionType.toLowerCase();
+  const jqPart = condition.jqExpr ? ` \`${condition.jqExpr}\`` : "";
+  const value = condition.value.startsWith("`") ? condition.value : condition.value.includes("\n") || condition.value.includes("{") || condition.value.includes("[") ? `\`${condition.value}\`` : condition.value;
+  return `${indent}${condType} ${condition.field}${jqPart} ${condition.comparison} ${value}`;
+}
+function printTest(test) {
+  const lines = [];
+  lines.push(`  it "${test.name}"`);
+  test.mocks.forEach((mock) => {
+    lines.push(printMock(mock, "    "));
+  });
+  lines.push(`    when ${formatWhen(test.when)}`);
+  if (test.input) {
+    lines.push(`    with input \`${test.input}\``);
+  }
+  test.conditions.forEach((condition) => {
+    lines.push(printCondition(condition));
+  });
+  return lines.join("\n");
+}
+function printDescribe(describe) {
+  const lines = [];
+  lines.push(`describe "${describe.name}"`);
+  describe.mocks.forEach((mock) => {
+    lines.push(printMock(mock));
+  });
+  if (describe.mocks.length > 0) {
+    lines.push("");
+  }
+  describe.tests.forEach((test) => {
+    lines.push(printTest(test));
     lines.push("");
   });
+  return lines.join("\n").replace(/\n\n$/, "\n");
+}
+function prettyPrint(program) {
+  const lines = [];
   program.routes.forEach((route) => {
-    lines.push(`${route.method} ${route.path}`);
-    const pipelineLines = formatPipelineRef(route.pipeline);
-    pipelineLines.forEach((line) => lines.push(line));
+    lines.push(printRoute(route));
     lines.push("");
   });
   program.describes.forEach((describe) => {
-    lines.push(`describe "${describe.name}"`);
-    describe.mocks.forEach((mock) => {
-      lines.push(`  with mock ${mock.target} returning \`${mock.returnValue}\``);
-    });
+    lines.push(printDescribe(describe));
     lines.push("");
-    describe.tests.forEach((test) => {
-      lines.push(`  it "${test.name}"`);
-      test.mocks.forEach((mock) => {
-        lines.push(`    with mock ${mock.target} returning \`${mock.returnValue}\``);
-      });
-      lines.push(`    when ${formatWhen(test.when)}`);
-      if (test.input) {
-        lines.push(`    with input \`${test.input}\``);
-      }
-      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}`);
-      });
+  });
+  if (program.configs.length > 0) {
+    lines.push("## Config");
+    program.configs.forEach((config) => {
+      lines.push(printConfig(config));
       lines.push("");
     });
+  }
+  program.pipelines.forEach((pipeline) => {
+    lines.push(printPipeline(pipeline));
+    lines.push("");
+  });
+  program.variables.forEach((variable) => {
+    lines.push(printVariable(variable));
   });
+  if (program.variables.length > 0) lines.push("");
   return lines.join("\n").trim();
 }
 function formatConfigValue(value) {
@@ -628,9 +669,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;
@@ -658,9 +699,22 @@ function formatWhen(when) {
   }
 }
 export {
+  formatConfigValue,
+  formatPipelineRef,
+  formatPipelineStep,
+  formatStepConfig,
+  formatWhen,
   getPipelineRanges,
   getVariableRanges,
   parseProgram,
   parseProgramWithDiagnostics,
-  prettyPrint
+  prettyPrint,
+  printCondition,
+  printConfig,
+  printDescribe,
+  printMock,
+  printPipeline,
+  printRoute,
+  printTest,
+  printVariable
 };

package/package.json

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