webpipe-js 2.0.33 → 2.0.35

package/dist/index.cjs

@@ -46,6 +46,7 @@ __export(index_exports, {
   printQueryResolver: () => printQueryResolver,
   printRoute: () => printRoute,
   printTest: () => printTest,
+  printTypeResolver: () => printTypeResolver,
   printVariable: () => printVariable
 });
 module.exports = __toCommonJS(index_exports);
@@ -152,6 +153,7 @@ var Parser = class {
     let graphqlSchema;
     const queries = [];
     const mutations = [];
+    const resolvers = [];
     let featureFlags;
     while (!this.eof()) {
       this.skipWhitespaceOnly();
@@ -187,6 +189,12 @@ var Parser = class {
         mutations.push(mutation);
         continue;
       }
+      const resolver = this.tryParse(() => this.parseTypeResolver());
+      if (resolver) {
+        resolver.lineNumber = this.getLineNumber(start);
+        resolvers.push(resolver);
+        continue;
+      }
       const flags = this.tryParse(() => this.parseFeatureFlags());
       if (flags) {
         featureFlags = flags;
@@ -231,7 +239,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, featureFlags };
+    return { configs, pipelines, variables, routes, describes, comments, graphqlSchema, queries, mutations, resolvers, featureFlags };
   }
   eof() {
     return this.pos >= this.len;
@@ -514,9 +522,15 @@ var Parser = class {
     const name = this.parseIdentifier();
     const args = this.parseInlineArgs();
     this.skipInlineSpaces();
-    this.expect(":");
-    this.skipInlineSpaces();
-    const { config, configType } = this.parseStepConfig();
+    let config = "";
+    let configType = "quoted";
+    if (this.cur() === ":") {
+      this.pos++;
+      this.skipInlineSpaces();
+      const res = this.parseStepConfig();
+      config = res.config;
+      configType = res.configType;
+    }
     const condition = this.parseStepCondition();
     const parsedJoinTargets = name === "join" ? this.parseJoinTaskNames(config) : void 0;
     this.skipWhitespaceOnly();
@@ -990,6 +1004,22 @@ var Parser = class {
     this.skipWhitespaceOnly();
     return { name, pipeline, inlineComment: inlineComment || void 0, start, end };
   }
+  parseTypeResolver() {
+    const start = this.pos;
+    this.expect("resolver");
+    this.skipInlineSpaces();
+    const typeName = this.parseIdentifier();
+    this.expect(".");
+    const fieldName = this.parseIdentifier();
+    this.skipInlineSpaces();
+    this.expect("=");
+    const inlineComment = this.parseInlineComment();
+    this.skipWhitespaceOnly();
+    const pipeline = this.parsePipeline();
+    const end = this.pos;
+    this.skipWhitespaceOnly();
+    return { typeName, fieldName, pipeline, inlineComment: inlineComment || void 0, start, end };
+  }
   parseFeatureFlags() {
     this.expect("featureFlags");
     this.skipInlineSpaces();
@@ -1586,6 +1616,19 @@ function printMutationResolver(mutation) {
   });
   return lines.join("\n");
 }
+function printTypeResolver(resolver) {
+  const lines = [];
+  const resolverLine = `resolver ${resolver.typeName}.${resolver.fieldName} =`;
+  if (resolver.inlineComment) {
+    lines.push(`${resolverLine} ${printComment(resolver.inlineComment)}`);
+  } else {
+    lines.push(resolverLine);
+  }
+  resolver.pipeline.steps.forEach((step) => {
+    lines.push(formatPipelineStep(step));
+  });
+  return lines.join("\n");
+}
 function printMock(mock, indent = "  ") {
   return `${indent}with mock ${mock.target} returning \`${mock.returnValue}\``;
 }
@@ -1694,6 +1737,9 @@ function prettyPrint(program) {
   program.mutations.forEach((mutation) => {
     allItems.push({ type: "mutation", item: mutation, lineNumber: mutation.lineNumber || 0 });
   });
+  program.resolvers.forEach((resolver) => {
+    allItems.push({ type: "resolver", item: resolver, lineNumber: resolver.lineNumber || 0 });
+  });
   program.routes.forEach((route) => {
     allItems.push({ type: "route", item: route, lineNumber: route.lineNumber || 0 });
   });
@@ -1731,6 +1777,10 @@ function prettyPrint(program) {
         lines.push(printMutationResolver(entry.item));
         lines.push("");
         break;
+      case "resolver":
+        lines.push(printTypeResolver(entry.item));
+        lines.push("");
+        break;
       case "route":
         lines.push(printRoute(entry.item));
         lines.push("");
@@ -1906,5 +1956,6 @@ function formatWhen(when) {
   printQueryResolver,
   printRoute,
   printTest,
+  printTypeResolver,
   printVariable
 });

package/dist/index.d.cts

@@ -8,6 +8,7 @@ interface Program {
     graphqlSchema?: GraphQLSchema;
     queries: QueryResolver[];
     mutations: MutationResolver[];
+    resolvers: TypeResolver[];
     featureFlags?: Pipeline;
 }
 interface Comment {
@@ -84,6 +85,15 @@ interface MutationResolver {
     start: number;
     end: number;
 }
+interface TypeResolver {
+    typeName: string;
+    fieldName: string;
+    pipeline: Pipeline;
+    lineNumber?: number;
+    inlineComment?: Comment;
+    start: number;
+    end: number;
+}
 interface Route {
     method: string;
     path: string;
@@ -306,6 +316,7 @@ declare function printVariable(variable: Variable): string;
 declare function printGraphQLSchema(schema: GraphQLSchema): string;
 declare function printQueryResolver(query: QueryResolver): string;
 declare function printMutationResolver(mutation: MutationResolver): string;
+declare function printTypeResolver(resolver: TypeResolver): string;
 declare function printMock(mock: Mock, indent?: string): string;
 declare function printCondition(condition: Condition, indent?: string): string;
 declare function printTest(test: It): string;
@@ -321,4 +332,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 Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, 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 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, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, printVariable };

package/dist/index.d.ts

@@ -8,6 +8,7 @@ interface Program {
     graphqlSchema?: GraphQLSchema;
     queries: QueryResolver[];
     mutations: MutationResolver[];
+    resolvers: TypeResolver[];
     featureFlags?: Pipeline;
 }
 interface Comment {
@@ -84,6 +85,15 @@ interface MutationResolver {
     start: number;
     end: number;
 }
+interface TypeResolver {
+    typeName: string;
+    fieldName: string;
+    pipeline: Pipeline;
+    lineNumber?: number;
+    inlineComment?: Comment;
+    start: number;
+    end: number;
+}
 interface Route {
     method: string;
     path: string;
@@ -306,6 +316,7 @@ declare function printVariable(variable: Variable): string;
 declare function printGraphQLSchema(schema: GraphQLSchema): string;
 declare function printQueryResolver(query: QueryResolver): string;
 declare function printMutationResolver(mutation: MutationResolver): string;
+declare function printTypeResolver(resolver: TypeResolver): string;
 declare function printMock(mock: Mock, indent?: string): string;
 declare function printCondition(condition: Condition, indent?: string): string;
 declare function printTest(test: It): string;
@@ -321,4 +332,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 Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, 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 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, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, printVariable };

package/dist/index.mjs

@@ -100,6 +100,7 @@ var Parser = class {
     let graphqlSchema;
     const queries = [];
     const mutations = [];
+    const resolvers = [];
     let featureFlags;
     while (!this.eof()) {
       this.skipWhitespaceOnly();
@@ -135,6 +136,12 @@ var Parser = class {
         mutations.push(mutation);
         continue;
       }
+      const resolver = this.tryParse(() => this.parseTypeResolver());
+      if (resolver) {
+        resolver.lineNumber = this.getLineNumber(start);
+        resolvers.push(resolver);
+        continue;
+      }
       const flags = this.tryParse(() => this.parseFeatureFlags());
       if (flags) {
         featureFlags = flags;
@@ -179,7 +186,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, featureFlags };
+    return { configs, pipelines, variables, routes, describes, comments, graphqlSchema, queries, mutations, resolvers, featureFlags };
   }
   eof() {
     return this.pos >= this.len;
@@ -462,9 +469,15 @@ var Parser = class {
     const name = this.parseIdentifier();
     const args = this.parseInlineArgs();
     this.skipInlineSpaces();
-    this.expect(":");
-    this.skipInlineSpaces();
-    const { config, configType } = this.parseStepConfig();
+    let config = "";
+    let configType = "quoted";
+    if (this.cur() === ":") {
+      this.pos++;
+      this.skipInlineSpaces();
+      const res = this.parseStepConfig();
+      config = res.config;
+      configType = res.configType;
+    }
     const condition = this.parseStepCondition();
     const parsedJoinTargets = name === "join" ? this.parseJoinTaskNames(config) : void 0;
     this.skipWhitespaceOnly();
@@ -938,6 +951,22 @@ var Parser = class {
     this.skipWhitespaceOnly();
     return { name, pipeline, inlineComment: inlineComment || void 0, start, end };
   }
+  parseTypeResolver() {
+    const start = this.pos;
+    this.expect("resolver");
+    this.skipInlineSpaces();
+    const typeName = this.parseIdentifier();
+    this.expect(".");
+    const fieldName = this.parseIdentifier();
+    this.skipInlineSpaces();
+    this.expect("=");
+    const inlineComment = this.parseInlineComment();
+    this.skipWhitespaceOnly();
+    const pipeline = this.parsePipeline();
+    const end = this.pos;
+    this.skipWhitespaceOnly();
+    return { typeName, fieldName, pipeline, inlineComment: inlineComment || void 0, start, end };
+  }
   parseFeatureFlags() {
     this.expect("featureFlags");
     this.skipInlineSpaces();
@@ -1534,6 +1563,19 @@ function printMutationResolver(mutation) {
   });
   return lines.join("\n");
 }
+function printTypeResolver(resolver) {
+  const lines = [];
+  const resolverLine = `resolver ${resolver.typeName}.${resolver.fieldName} =`;
+  if (resolver.inlineComment) {
+    lines.push(`${resolverLine} ${printComment(resolver.inlineComment)}`);
+  } else {
+    lines.push(resolverLine);
+  }
+  resolver.pipeline.steps.forEach((step) => {
+    lines.push(formatPipelineStep(step));
+  });
+  return lines.join("\n");
+}
 function printMock(mock, indent = "  ") {
   return `${indent}with mock ${mock.target} returning \`${mock.returnValue}\``;
 }
@@ -1642,6 +1684,9 @@ function prettyPrint(program) {
   program.mutations.forEach((mutation) => {
     allItems.push({ type: "mutation", item: mutation, lineNumber: mutation.lineNumber || 0 });
   });
+  program.resolvers.forEach((resolver) => {
+    allItems.push({ type: "resolver", item: resolver, lineNumber: resolver.lineNumber || 0 });
+  });
   program.routes.forEach((route) => {
     allItems.push({ type: "route", item: route, lineNumber: route.lineNumber || 0 });
   });
@@ -1679,6 +1724,10 @@ function prettyPrint(program) {
         lines.push(printMutationResolver(entry.item));
         lines.push("");
         break;
+      case "resolver":
+        lines.push(printTypeResolver(entry.item));
+        lines.push("");
+        break;
       case "route":
         lines.push(printRoute(entry.item));
         lines.push("");
@@ -1853,5 +1902,6 @@ export {
   printQueryResolver,
   printRoute,
   printTest,
+  printTypeResolver,
   printVariable
 };

package/package.json

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