webpipe-js 0.1.6 → 0.1.8

package/dist/index.cjs

@@ -240,11 +240,11 @@ var Parser = class {
   }
   parseStepConfig() {
     const bt = this.tryParse(() => this.parseBacktickString());
-    if (bt !== null) return bt;
+    if (bt !== null) return { config: bt, configType: "backtick" };
     const dq = this.tryParse(() => this.parseQuotedString());
-    if (dq !== null) return dq;
+    if (dq !== null) return { config: dq, configType: "quoted" };
     const id = this.tryParse(() => this.parseIdentifier());
-    if (id !== null) return id;
+    if (id !== null) return { config: id, configType: "identifier" };
     throw new ParseFailure("step-config", this.pos);
   }
   parseConfigValue() {
@@ -316,9 +316,9 @@ var Parser = class {
     const name = this.parseIdentifier();
     this.expect(":");
     this.skipInlineSpaces();
-    const config = this.parseStepConfig();
+    const { config, configType } = this.parseStepConfig();
     this.skipSpaces();
-    return { kind: "Regular", name, config };
+    return { kind: "Regular", name, config, configType };
   }
   parseResultStep() {
     this.skipSpaces();
@@ -659,14 +659,6 @@ function printDescribe(describe) {
 }
 function prettyPrint(program) {
   const lines = [];
-  program.routes.forEach((route) => {
-    lines.push(printRoute(route));
-    lines.push("");
-  });
-  program.describes.forEach((describe) => {
-    lines.push(printDescribe(describe));
-    lines.push("");
-  });
   if (program.configs.length > 0) {
     lines.push("## Config");
     program.configs.forEach((config) => {
@@ -674,6 +666,10 @@ function prettyPrint(program) {
       lines.push("");
     });
   }
+  program.routes.forEach((route) => {
+    lines.push(printRoute(route));
+    lines.push("");
+  });
   program.pipelines.forEach((pipeline) => {
     lines.push(printPipeline(pipeline));
     lines.push("");
@@ -682,6 +678,10 @@ function prettyPrint(program) {
     lines.push(printVariable(variable));
   });
   if (program.variables.length > 0) lines.push("");
+  program.describes.forEach((describe) => {
+    lines.push(printDescribe(describe));
+    lines.push("");
+  });
   return lines.join("\n").trim();
 }
 function formatConfigValue(value) {
@@ -698,7 +698,7 @@ function formatConfigValue(value) {
 }
 function formatPipelineStep(step, indent = "  ") {
   if (step.kind === "Regular") {
-    return `${indent}|> ${step.name}: ${formatStepConfig(step.config)}`;
+    return `${indent}|> ${step.name}: ${formatStepConfig(step.config, step.configType)}`;
   } else {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {
@@ -711,33 +711,16 @@ function formatPipelineStep(step, indent = "  ") {
     return lines.join("\n");
   }
 }
-function formatStepConfig(config) {
-  if (config.includes("\n") || config.includes("{") || config.includes("[") || config.includes(".") || config.includes("(")) {
-    return `\`${config}\``;
-  } else if (config.includes(" ")) {
-    return `"${config}"`;
-  } else if (isAuthStringValue(config)) {
-    return `"${config}"`;
-  } else {
-    return config;
+function formatStepConfig(config, configType) {
+  switch (configType) {
+    case "backtick":
+      return `\`${config}\``;
+    case "quoted":
+      return `"${config}"`;
+    case "identifier":
+      return config;
   }
 }
-function isAuthStringValue(config) {
-  const authValues = [
-    "login",
-    "logout",
-    "register",
-    "required",
-    "optional"
-  ];
-  if (authValues.includes(config)) {
-    return true;
-  }
-  if (config.startsWith("type:")) {
-    return true;
-  }
-  return false;
-}
 function formatPipelineRef(ref) {
   if (ref.kind === "Named") {
     return [`  |> pipeline: ${ref.name}`];

package/dist/index.d.cts

@@ -51,10 +51,12 @@ type PipelineRef = {
 interface Pipeline {
     steps: PipelineStep[];
 }
+type ConfigType = 'backtick' | 'quoted' | 'identifier';
 type PipelineStep = {
     kind: 'Regular';
     name: string;
     config: string;
+    configType: ConfigType;
 } | {
     kind: 'Result';
     branches: ResultBranch[];
@@ -138,8 +140,8 @@ 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 formatStepConfig(config: string, configType: ConfigType): 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, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };
+export { 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, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };

package/dist/index.d.ts

@@ -51,10 +51,12 @@ type PipelineRef = {
 interface Pipeline {
     steps: PipelineStep[];
 }
+type ConfigType = 'backtick' | 'quoted' | 'identifier';
 type PipelineStep = {
     kind: 'Regular';
     name: string;
     config: string;
+    configType: ConfigType;
 } | {
     kind: 'Result';
     branches: ResultBranch[];
@@ -138,8 +140,8 @@ 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 formatStepConfig(config: string, configType: ConfigType): 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, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };
+export { 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, printCondition, printConfig, printDescribe, printMock, printPipeline, printRoute, printTest, printVariable };

package/dist/index.mjs

@@ -197,11 +197,11 @@ var Parser = class {
   }
   parseStepConfig() {
     const bt = this.tryParse(() => this.parseBacktickString());
-    if (bt !== null) return bt;
+    if (bt !== null) return { config: bt, configType: "backtick" };
     const dq = this.tryParse(() => this.parseQuotedString());
-    if (dq !== null) return dq;
+    if (dq !== null) return { config: dq, configType: "quoted" };
     const id = this.tryParse(() => this.parseIdentifier());
-    if (id !== null) return id;
+    if (id !== null) return { config: id, configType: "identifier" };
     throw new ParseFailure("step-config", this.pos);
   }
   parseConfigValue() {
@@ -273,9 +273,9 @@ var Parser = class {
     const name = this.parseIdentifier();
     this.expect(":");
     this.skipInlineSpaces();
-    const config = this.parseStepConfig();
+    const { config, configType } = this.parseStepConfig();
     this.skipSpaces();
-    return { kind: "Regular", name, config };
+    return { kind: "Regular", name, config, configType };
   }
   parseResultStep() {
     this.skipSpaces();
@@ -616,14 +616,6 @@ function printDescribe(describe) {
 }
 function prettyPrint(program) {
   const lines = [];
-  program.routes.forEach((route) => {
-    lines.push(printRoute(route));
-    lines.push("");
-  });
-  program.describes.forEach((describe) => {
-    lines.push(printDescribe(describe));
-    lines.push("");
-  });
   if (program.configs.length > 0) {
     lines.push("## Config");
     program.configs.forEach((config) => {
@@ -631,6 +623,10 @@ function prettyPrint(program) {
       lines.push("");
     });
   }
+  program.routes.forEach((route) => {
+    lines.push(printRoute(route));
+    lines.push("");
+  });
   program.pipelines.forEach((pipeline) => {
     lines.push(printPipeline(pipeline));
     lines.push("");
@@ -639,6 +635,10 @@ function prettyPrint(program) {
     lines.push(printVariable(variable));
   });
   if (program.variables.length > 0) lines.push("");
+  program.describes.forEach((describe) => {
+    lines.push(printDescribe(describe));
+    lines.push("");
+  });
   return lines.join("\n").trim();
 }
 function formatConfigValue(value) {
@@ -655,7 +655,7 @@ function formatConfigValue(value) {
 }
 function formatPipelineStep(step, indent = "  ") {
   if (step.kind === "Regular") {
-    return `${indent}|> ${step.name}: ${formatStepConfig(step.config)}`;
+    return `${indent}|> ${step.name}: ${formatStepConfig(step.config, step.configType)}`;
   } else {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {
@@ -668,33 +668,16 @@ function formatPipelineStep(step, indent = "  ") {
     return lines.join("\n");
   }
 }
-function formatStepConfig(config) {
-  if (config.includes("\n") || config.includes("{") || config.includes("[") || config.includes(".") || config.includes("(")) {
-    return `\`${config}\``;
-  } else if (config.includes(" ")) {
-    return `"${config}"`;
-  } else if (isAuthStringValue(config)) {
-    return `"${config}"`;
-  } else {
-    return config;
+function formatStepConfig(config, configType) {
+  switch (configType) {
+    case "backtick":
+      return `\`${config}\``;
+    case "quoted":
+      return `"${config}"`;
+    case "identifier":
+      return config;
   }
 }
-function isAuthStringValue(config) {
-  const authValues = [
-    "login",
-    "logout",
-    "register",
-    "required",
-    "optional"
-  ];
-  if (authValues.includes(config)) {
-    return true;
-  }
-  if (config.startsWith("type:")) {
-    return true;
-  }
-  return false;
-}
 function formatPipelineRef(ref) {
   if (ref.kind === "Named") {
     return [`  |> pipeline: ${ref.name}`];

package/package.json

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