webpipe-js 2.0.65 → 2.0.67

package/dist/index.cjs

@@ -152,6 +152,7 @@ var Parser = class {
   parseProgram() {
     this.skipWhitespaceOnly();
     const configs = [];
+    const imports = [];
     const pipelines = [];
     const variables = [];
     const routes = [];
@@ -178,6 +179,15 @@ var Parser = class {
         configs.push(cfg);
         continue;
       }
+      const importStmt = this.tryParse(() => this.parseImport());
+      if (importStmt) {
+        const duplicateAlias = imports.find((i) => i.alias === importStmt.alias);
+        if (duplicateAlias) {
+          this.report(`Duplicate import alias '${importStmt.alias}'`, importStmt.start, importStmt.end, "error");
+        }
+        imports.push(importStmt);
+        continue;
+      }
       const schema = this.tryParse(() => this.parseGraphQLSchema());
       if (schema) {
         schema.lineNumber = this.getLineNumber(start);
@@ -246,7 +256,7 @@ var Parser = class {
       const start = Math.max(0, idx);
       this.report("Unclosed backtick-delimited string", start, start + 1, "warning");
     }
-    return { configs, pipelines, variables, routes, describes, comments, graphqlSchema, queries, mutations, resolvers, featureFlags };
+    return { configs, imports, pipelines, variables, routes, describes, comments, graphqlSchema, queries, mutations, resolvers, featureFlags };
   }
   eof() {
     return this.pos >= this.len;
@@ -489,6 +499,30 @@ var Parser = class {
     const end = this.pos;
     return { name, properties, inlineComment: inlineComment || void 0, start, end };
   }
+  parseImport() {
+    const start = this.pos;
+    this.expect("import");
+    this.skipInlineSpaces();
+    this.expect('"');
+    const path = this.consumeWhile((c) => c !== '"');
+    this.expect('"');
+    this.skipInlineSpaces();
+    this.expect("as");
+    this.skipInlineSpaces();
+    const alias = this.parseIdentifier();
+    this.skipWhitespaceOnly();
+    const end = this.pos;
+    return { path, alias, start, end };
+  }
+  parseScopedIdentifier() {
+    const first = this.parseIdentifier();
+    if (this.text.startsWith("::", this.pos)) {
+      this.pos += 2;
+      const second = this.parseIdentifier();
+      return `${first}::${second}`;
+    }
+    return first;
+  }
   parsePipelineStep() {
     const result = this.tryParse(() => this.parseResultStep());
     if (result) return result;
@@ -798,20 +832,20 @@ var Parser = class {
     this.expect("|>");
     this.skipInlineSpaces();
     this.expect("dispatch");
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const branches = [];
     while (true) {
       const branch = this.tryParse(() => this.parseDispatchBranch());
       if (!branch) break;
       branches.push(branch);
-      this.skipSpaces();
+      this.skipWhitespaceOnly();
     }
     const defaultBranch = this.tryParse(() => {
       this.expect("default:");
-      this.skipSpaces();
+      this.skipWhitespaceOnly();
       return this.parseIfPipeline("end");
     });
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     this.tryParse(() => {
       this.expect("end");
       return true;
@@ -820,14 +854,14 @@ var Parser = class {
     return { kind: "Dispatch", branches, default: defaultBranch || void 0, start, end };
   }
   parseDispatchBranch() {
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const start = this.pos;
     this.expect("case");
     this.skipInlineSpaces();
     const condition = this.parseTagExpr();
     this.skipInlineSpaces();
     this.expect(":");
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const pipeline = this.parseIfPipeline("case", "default:", "end");
     const end = this.pos;
     return { condition, pipeline, start, end };
@@ -1185,8 +1219,8 @@ var Parser = class {
       }
       this.skipInlineSpaces();
       const value2 = (() => {
-        const v1 = this.tryParse(() => this.parseBacktickString());
-        if (v1 !== null) return v1;
+        const v12 = this.tryParse(() => this.parseBacktickString());
+        if (v12 !== null) return v12;
         const v2 = this.tryParse(() => this.parseQuotedString());
         if (v2 !== null) return v2;
         return this.consumeWhile((c) => c !== "\n");
@@ -1234,8 +1268,8 @@ var Parser = class {
         comparison2 = this.consumeWhile((c) => c !== " " && c !== "\n");
         this.skipInlineSpaces();
         value2 = (() => {
-          const v1 = this.tryParse(() => this.parseBacktickString());
-          if (v1 !== null) return v1;
+          const v12 = this.tryParse(() => this.parseBacktickString());
+          if (v12 !== null) return v12;
           const v2 = this.tryParse(() => this.parseQuotedString());
           if (v2 !== null) return v2;
           return this.consumeWhile((c) => c !== "\n");
@@ -1263,8 +1297,8 @@ var Parser = class {
         comparison2 = this.consumeWhile((c) => c !== " " && c !== "\n");
         this.skipInlineSpaces();
         value2 = (() => {
-          const v1 = this.tryParse(() => this.parseBacktickString());
-          if (v1 !== null) return v1;
+          const v12 = this.tryParse(() => this.parseBacktickString());
+          if (v12 !== null) return v12;
           const v2 = this.tryParse(() => this.parseQuotedString());
           if (v2 !== null) return v2;
           return this.consumeWhile((c) => c !== "\n");
@@ -1302,15 +1336,24 @@ var Parser = class {
     this.skipInlineSpaces();
     const comparison = this.consumeWhile((c) => c !== " " && c !== "\n");
     this.skipInlineSpaces();
-    const value = (() => {
-      const v1 = this.tryParse(() => this.parseBacktickString());
-      if (v1 !== null) return v1;
+    let value;
+    let valueFormat;
+    const v1 = this.tryParse(() => this.parseBacktickString());
+    if (v1 !== null) {
+      value = v1;
+      valueFormat = "backtick";
+    } else {
       const v2 = this.tryParse(() => this.parseQuotedString());
-      if (v2 !== null) return v2;
-      return this.consumeWhile((c) => c !== "\n");
-    })();
+      if (v2 !== null) {
+        value = v2;
+        valueFormat = "quoted";
+      } else {
+        value = this.consumeWhile((c) => c !== "\n");
+        valueFormat = "bare";
+      }
+    }
     const end = this.pos;
-    return { conditionType: ct, field, headerName: headerName ?? void 0, jqExpr: jqExpr ?? void 0, comparison, value, start, end };
+    return { conditionType: ct, field, headerName: headerName ?? void 0, jqExpr: jqExpr ?? void 0, comparison, value, valueFormat, start, end };
   }
   parseMockHead(prefixWord) {
     const start = this.pos;
@@ -1758,6 +1801,13 @@ function printMock(mock, indent = "  ") {
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
   const formatConditionValue = (val) => {
+    if (condition.valueFormat) {
+      if (condition.valueFormat === "quoted") return `"${val}"`;
+      if (condition.valueFormat === "backtick") return `\`${val}\``;
+      const isBareTemplate2 = /^\{\{[^}]+\}\}$/.test(val);
+      if (isBareTemplate2) return val;
+      return val;
+    }
     if (val.startsWith("`") || val.startsWith('"')) return val;
     const isBareTemplate = /^\{\{[^}]+\}\}$/.test(val);
     if (isBareTemplate) return val;
@@ -2083,16 +2133,10 @@ function formatPipelineStep(step, indent = "  ", isLastStep = false) {
   } else if (step.kind === "Dispatch") {
     const lines = [`${indent}|> dispatch`];
     step.branches.forEach((branch) => {
-      if (branch.pipeline.steps.length === 1) {
-        const inlineStep = formatPipelineStep(branch.pipeline.steps[0], indent + "    ");
-        const stepContent = inlineStep.substring((indent + "    ").length);
-        lines.push(`${indent}  case ${formatTagExpr(branch.condition)}:   ${stepContent}`);
-      } else {
-        lines.push(`${indent}  case ${formatTagExpr(branch.condition)}:`);
-        branch.pipeline.steps.forEach((branchStep) => {
-          lines.push(formatPipelineStep(branchStep, indent + "    "));
-        });
-      }
+      lines.push(`${indent}  case ${formatTagExpr(branch.condition)}:`);
+      branch.pipeline.steps.forEach((branchStep) => {
+        lines.push(formatPipelineStep(branchStep, indent + "    "));
+      });
     });
     if (step.default) {
       lines.push(`${indent}  default:`);

package/dist/index.d.cts

@@ -1,5 +1,12 @@
+interface Import {
+    path: string;
+    alias: string;
+    start: number;
+    end: number;
+}
 interface Program {
     configs: Config[];
+    imports: Import[];
     pipelines: NamedPipeline[];
     variables: Variable[];
     routes: Route[];
@@ -285,6 +292,7 @@ interface Condition {
     jqExpr?: string;
     comparison: string;
     value: string;
+    valueFormat?: 'quoted' | 'backtick' | 'bare';
     isCallAssertion?: boolean;
     callTarget?: string;
     selector?: string;
@@ -348,4 +356,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 LetValueFormat, type LetVariable, 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 TestLetVariable, type TypeResolver, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printFeatureFlags, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, 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 Import, type It, type LetValueFormat, type LetVariable, 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 TestLetVariable, type TypeResolver, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printFeatureFlags, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, printVariable };

package/dist/index.d.ts

@@ -1,5 +1,12 @@
+interface Import {
+    path: string;
+    alias: string;
+    start: number;
+    end: number;
+}
 interface Program {
     configs: Config[];
+    imports: Import[];
     pipelines: NamedPipeline[];
     variables: Variable[];
     routes: Route[];
@@ -285,6 +292,7 @@ interface Condition {
     jqExpr?: string;
     comparison: string;
     value: string;
+    valueFormat?: 'quoted' | 'backtick' | 'bare';
     isCallAssertion?: boolean;
     callTarget?: string;
     selector?: string;
@@ -348,4 +356,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 LetValueFormat, type LetVariable, 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 TestLetVariable, type TypeResolver, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printFeatureFlags, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, 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 Import, type It, type LetValueFormat, type LetVariable, 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 TestLetVariable, type TypeResolver, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printFeatureFlags, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, printVariable };

package/dist/index.mjs

@@ -98,6 +98,7 @@ var Parser = class {
   parseProgram() {
     this.skipWhitespaceOnly();
     const configs = [];
+    const imports = [];
     const pipelines = [];
     const variables = [];
     const routes = [];
@@ -124,6 +125,15 @@ var Parser = class {
         configs.push(cfg);
         continue;
       }
+      const importStmt = this.tryParse(() => this.parseImport());
+      if (importStmt) {
+        const duplicateAlias = imports.find((i) => i.alias === importStmt.alias);
+        if (duplicateAlias) {
+          this.report(`Duplicate import alias '${importStmt.alias}'`, importStmt.start, importStmt.end, "error");
+        }
+        imports.push(importStmt);
+        continue;
+      }
       const schema = this.tryParse(() => this.parseGraphQLSchema());
       if (schema) {
         schema.lineNumber = this.getLineNumber(start);
@@ -192,7 +202,7 @@ var Parser = class {
       const start = Math.max(0, idx);
       this.report("Unclosed backtick-delimited string", start, start + 1, "warning");
     }
-    return { configs, pipelines, variables, routes, describes, comments, graphqlSchema, queries, mutations, resolvers, featureFlags };
+    return { configs, imports, pipelines, variables, routes, describes, comments, graphqlSchema, queries, mutations, resolvers, featureFlags };
   }
   eof() {
     return this.pos >= this.len;
@@ -435,6 +445,30 @@ var Parser = class {
     const end = this.pos;
     return { name, properties, inlineComment: inlineComment || void 0, start, end };
   }
+  parseImport() {
+    const start = this.pos;
+    this.expect("import");
+    this.skipInlineSpaces();
+    this.expect('"');
+    const path = this.consumeWhile((c) => c !== '"');
+    this.expect('"');
+    this.skipInlineSpaces();
+    this.expect("as");
+    this.skipInlineSpaces();
+    const alias = this.parseIdentifier();
+    this.skipWhitespaceOnly();
+    const end = this.pos;
+    return { path, alias, start, end };
+  }
+  parseScopedIdentifier() {
+    const first = this.parseIdentifier();
+    if (this.text.startsWith("::", this.pos)) {
+      this.pos += 2;
+      const second = this.parseIdentifier();
+      return `${first}::${second}`;
+    }
+    return first;
+  }
   parsePipelineStep() {
     const result = this.tryParse(() => this.parseResultStep());
     if (result) return result;
@@ -744,20 +778,20 @@ var Parser = class {
     this.expect("|>");
     this.skipInlineSpaces();
     this.expect("dispatch");
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const branches = [];
     while (true) {
       const branch = this.tryParse(() => this.parseDispatchBranch());
       if (!branch) break;
       branches.push(branch);
-      this.skipSpaces();
+      this.skipWhitespaceOnly();
     }
     const defaultBranch = this.tryParse(() => {
       this.expect("default:");
-      this.skipSpaces();
+      this.skipWhitespaceOnly();
       return this.parseIfPipeline("end");
     });
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     this.tryParse(() => {
       this.expect("end");
       return true;
@@ -766,14 +800,14 @@ var Parser = class {
     return { kind: "Dispatch", branches, default: defaultBranch || void 0, start, end };
   }
   parseDispatchBranch() {
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const start = this.pos;
     this.expect("case");
     this.skipInlineSpaces();
     const condition = this.parseTagExpr();
     this.skipInlineSpaces();
     this.expect(":");
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const pipeline = this.parseIfPipeline("case", "default:", "end");
     const end = this.pos;
     return { condition, pipeline, start, end };
@@ -1131,8 +1165,8 @@ var Parser = class {
       }
       this.skipInlineSpaces();
       const value2 = (() => {
-        const v1 = this.tryParse(() => this.parseBacktickString());
-        if (v1 !== null) return v1;
+        const v12 = this.tryParse(() => this.parseBacktickString());
+        if (v12 !== null) return v12;
         const v2 = this.tryParse(() => this.parseQuotedString());
         if (v2 !== null) return v2;
         return this.consumeWhile((c) => c !== "\n");
@@ -1180,8 +1214,8 @@ var Parser = class {
         comparison2 = this.consumeWhile((c) => c !== " " && c !== "\n");
         this.skipInlineSpaces();
         value2 = (() => {
-          const v1 = this.tryParse(() => this.parseBacktickString());
-          if (v1 !== null) return v1;
+          const v12 = this.tryParse(() => this.parseBacktickString());
+          if (v12 !== null) return v12;
           const v2 = this.tryParse(() => this.parseQuotedString());
           if (v2 !== null) return v2;
           return this.consumeWhile((c) => c !== "\n");
@@ -1209,8 +1243,8 @@ var Parser = class {
         comparison2 = this.consumeWhile((c) => c !== " " && c !== "\n");
         this.skipInlineSpaces();
         value2 = (() => {
-          const v1 = this.tryParse(() => this.parseBacktickString());
-          if (v1 !== null) return v1;
+          const v12 = this.tryParse(() => this.parseBacktickString());
+          if (v12 !== null) return v12;
           const v2 = this.tryParse(() => this.parseQuotedString());
           if (v2 !== null) return v2;
           return this.consumeWhile((c) => c !== "\n");
@@ -1248,15 +1282,24 @@ var Parser = class {
     this.skipInlineSpaces();
     const comparison = this.consumeWhile((c) => c !== " " && c !== "\n");
     this.skipInlineSpaces();
-    const value = (() => {
-      const v1 = this.tryParse(() => this.parseBacktickString());
-      if (v1 !== null) return v1;
+    let value;
+    let valueFormat;
+    const v1 = this.tryParse(() => this.parseBacktickString());
+    if (v1 !== null) {
+      value = v1;
+      valueFormat = "backtick";
+    } else {
       const v2 = this.tryParse(() => this.parseQuotedString());
-      if (v2 !== null) return v2;
-      return this.consumeWhile((c) => c !== "\n");
-    })();
+      if (v2 !== null) {
+        value = v2;
+        valueFormat = "quoted";
+      } else {
+        value = this.consumeWhile((c) => c !== "\n");
+        valueFormat = "bare";
+      }
+    }
     const end = this.pos;
-    return { conditionType: ct, field, headerName: headerName ?? void 0, jqExpr: jqExpr ?? void 0, comparison, value, start, end };
+    return { conditionType: ct, field, headerName: headerName ?? void 0, jqExpr: jqExpr ?? void 0, comparison, value, valueFormat, start, end };
   }
   parseMockHead(prefixWord) {
     const start = this.pos;
@@ -1704,6 +1747,13 @@ function printMock(mock, indent = "  ") {
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
   const formatConditionValue = (val) => {
+    if (condition.valueFormat) {
+      if (condition.valueFormat === "quoted") return `"${val}"`;
+      if (condition.valueFormat === "backtick") return `\`${val}\``;
+      const isBareTemplate2 = /^\{\{[^}]+\}\}$/.test(val);
+      if (isBareTemplate2) return val;
+      return val;
+    }
     if (val.startsWith("`") || val.startsWith('"')) return val;
     const isBareTemplate = /^\{\{[^}]+\}\}$/.test(val);
     if (isBareTemplate) return val;
@@ -2029,16 +2079,10 @@ function formatPipelineStep(step, indent = "  ", isLastStep = false) {
   } else if (step.kind === "Dispatch") {
     const lines = [`${indent}|> dispatch`];
     step.branches.forEach((branch) => {
-      if (branch.pipeline.steps.length === 1) {
-        const inlineStep = formatPipelineStep(branch.pipeline.steps[0], indent + "    ");
-        const stepContent = inlineStep.substring((indent + "    ").length);
-        lines.push(`${indent}  case ${formatTagExpr(branch.condition)}:   ${stepContent}`);
-      } else {
-        lines.push(`${indent}  case ${formatTagExpr(branch.condition)}:`);
-        branch.pipeline.steps.forEach((branchStep) => {
-          lines.push(formatPipelineStep(branchStep, indent + "    "));
-        });
-      }
+      lines.push(`${indent}  case ${formatTagExpr(branch.condition)}:`);
+      branch.pipeline.steps.forEach((branchStep) => {
+        lines.push(formatPipelineStep(branchStep, indent + "    "));
+      });
     });
     if (step.default) {
       lines.push(`${indent}  default:`);

package/package.json

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