webpipe-js 2.0.26 → 2.0.27

package/dist/index.cjs

@@ -1057,21 +1057,31 @@ var Parser = class {
     this.skipInlineSpaces();
     this.expect("=");
     this.skipInlineSpaces();
+    let format;
     const value = (() => {
       const bt = this.tryParse(() => this.parseBacktickString());
-      if (bt !== null) return bt;
+      if (bt !== null) {
+        format = "backtick";
+        return bt;
+      }
       const qt = this.tryParse(() => this.parseQuotedString());
-      if (qt !== null) return qt;
+      if (qt !== null) {
+        format = "quoted";
+        return qt;
+      }
       if (this.text.startsWith("null", this.pos)) {
         this.pos += 4;
+        format = "bare";
         return "null";
       }
       if (this.text.startsWith("true", this.pos)) {
         this.pos += 4;
+        format = "bare";
         return "true";
       }
       if (this.text.startsWith("false", this.pos)) {
         this.pos += 5;
+        format = "bare";
         return "false";
       }
       const num = this.tryParse(() => {
@@ -1085,10 +1095,13 @@ var Parser = class {
         }
         return digits;
       });
-      if (num !== null) return num;
+      if (num !== null) {
+        format = "bare";
+        return num;
+      }
       throw new Error("let value");
     })();
-    return [name, value];
+    return [name, value, format];
   }
   parseIt() {
     this.skipSpaces();
@@ -1377,13 +1390,8 @@ function printTest(test) {
   });
   lines.push(`    when ${formatWhen(test.when)}`);
   if (test.variables) {
-    test.variables.forEach(([name, value]) => {
-      const formattedValue = (() => {
-        if (value.startsWith("`") || value.startsWith('"')) return value;
-        if (value === "true" || value === "false" || /^\d+$/.test(value)) return value;
-        if (value.includes("{") || value.includes("[") || value.includes("\n")) return `\`${value}\``;
-        return `"${value}"`;
-      })();
+    test.variables.forEach(([name, value, format]) => {
+      const formattedValue = format === "quoted" ? `"${value}"` : format === "backtick" ? `\`${value}\`` : value;
       lines.push(`    let ${name} = ${formattedValue}`);
     });
   }
@@ -1421,6 +1429,13 @@ function printDescribe(describe) {
   } else {
     lines.push(describeLine);
   }
+  if (describe.variables && describe.variables.length > 0) {
+    describe.variables.forEach(([name, value, format]) => {
+      const formattedValue = format === "quoted" ? `"${value}"` : format === "backtick" ? `\`${value}\`` : value;
+      lines.push(`  let ${name} = ${formattedValue}`);
+    });
+    lines.push("");
+  }
   describe.mocks.forEach((mock) => {
     lines.push(printMock(mock));
   });

package/dist/index.d.cts

@@ -88,6 +88,7 @@ interface Pipeline {
     steps: PipelineStep[];
 }
 type ConfigType = 'backtick' | 'quoted' | 'identifier';
+type LetValueFormat = 'quoted' | 'backtick' | 'bare';
 interface Tag {
     name: string;
     negated: boolean;
@@ -149,7 +150,7 @@ type ResultBranchType = {
 };
 interface Describe {
     name: string;
-    variables: Array<[string, string]>;
+    variables: Array<[string, string, LetValueFormat]>;
     mocks: Mock[];
     tests: It[];
     lineNumber?: number;
@@ -163,7 +164,7 @@ interface It {
     name: string;
     mocks: Mock[];
     when: When;
-    variables?: Array<[string, string]>;
+    variables?: Array<[string, string, LetValueFormat]>;
     input?: string;
     body?: string;
     headers?: string;
@@ -246,4 +247,4 @@ declare function formatTagExpr(expr: TagExpr): string;
 declare function formatPipelineRef(ref: PipelineRef): string[];
 declare function formatWhen(when: When): string;
 
-export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type It, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type It, type LetValueFormat, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };

package/dist/index.d.ts

@@ -88,6 +88,7 @@ interface Pipeline {
     steps: PipelineStep[];
 }
 type ConfigType = 'backtick' | 'quoted' | 'identifier';
+type LetValueFormat = 'quoted' | 'backtick' | 'bare';
 interface Tag {
     name: string;
     negated: boolean;
@@ -149,7 +150,7 @@ type ResultBranchType = {
 };
 interface Describe {
     name: string;
-    variables: Array<[string, string]>;
+    variables: Array<[string, string, LetValueFormat]>;
     mocks: Mock[];
     tests: It[];
     lineNumber?: number;
@@ -163,7 +164,7 @@ interface It {
     name: string;
     mocks: Mock[];
     when: When;
-    variables?: Array<[string, string]>;
+    variables?: Array<[string, string, LetValueFormat]>;
     input?: string;
     body?: string;
     headers?: string;
@@ -246,4 +247,4 @@ declare function formatTagExpr(expr: TagExpr): string;
 declare function formatPipelineRef(ref: PipelineRef): string[];
 declare function formatWhen(when: When): string;
 
-export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type It, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type It, type LetValueFormat, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };

package/dist/index.mjs

@@ -1007,21 +1007,31 @@ var Parser = class {
     this.skipInlineSpaces();
     this.expect("=");
     this.skipInlineSpaces();
+    let format;
     const value = (() => {
       const bt = this.tryParse(() => this.parseBacktickString());
-      if (bt !== null) return bt;
+      if (bt !== null) {
+        format = "backtick";
+        return bt;
+      }
       const qt = this.tryParse(() => this.parseQuotedString());
-      if (qt !== null) return qt;
+      if (qt !== null) {
+        format = "quoted";
+        return qt;
+      }
       if (this.text.startsWith("null", this.pos)) {
         this.pos += 4;
+        format = "bare";
         return "null";
       }
       if (this.text.startsWith("true", this.pos)) {
         this.pos += 4;
+        format = "bare";
         return "true";
       }
       if (this.text.startsWith("false", this.pos)) {
         this.pos += 5;
+        format = "bare";
         return "false";
       }
       const num = this.tryParse(() => {
@@ -1035,10 +1045,13 @@ var Parser = class {
         }
         return digits;
       });
-      if (num !== null) return num;
+      if (num !== null) {
+        format = "bare";
+        return num;
+      }
       throw new Error("let value");
     })();
-    return [name, value];
+    return [name, value, format];
   }
   parseIt() {
     this.skipSpaces();
@@ -1327,13 +1340,8 @@ function printTest(test) {
   });
   lines.push(`    when ${formatWhen(test.when)}`);
   if (test.variables) {
-    test.variables.forEach(([name, value]) => {
-      const formattedValue = (() => {
-        if (value.startsWith("`") || value.startsWith('"')) return value;
-        if (value === "true" || value === "false" || /^\d+$/.test(value)) return value;
-        if (value.includes("{") || value.includes("[") || value.includes("\n")) return `\`${value}\``;
-        return `"${value}"`;
-      })();
+    test.variables.forEach(([name, value, format]) => {
+      const formattedValue = format === "quoted" ? `"${value}"` : format === "backtick" ? `\`${value}\`` : value;
       lines.push(`    let ${name} = ${formattedValue}`);
     });
   }
@@ -1371,6 +1379,13 @@ function printDescribe(describe) {
   } else {
     lines.push(describeLine);
   }
+  if (describe.variables && describe.variables.length > 0) {
+    describe.variables.forEach(([name, value, format]) => {
+      const formattedValue = format === "quoted" ? `"${value}"` : format === "backtick" ? `\`${value}\`` : value;
+      lines.push(`  let ${name} = ${formattedValue}`);
+    });
+    lines.push("");
+  }
   describe.mocks.forEach((mock) => {
     lines.push(printMock(mock));
   });

package/package.json

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