@cucumber/cucumber 7.2.0 → 7.3.2

package/lib/cli/profile_loader.d.ts

@@ -1,9 +1,6 @@
-import { Dictionary } from 'lodash';
-import { IUserCodeImporter } from './index';
 export default class ProfileLoader {
     private readonly directory;
-    private readonly importer;
-    constructor(directory: string, importer: IUserCodeImporter);
-    getDefinitions(): Promise<Dictionary<string>>;
+    constructor(directory: string);
+    getDefinitions(): Promise<Record<string, string>>;
     getArgv(profiles: string[]): Promise<string[]>;
 }

package/lib/cli/profile_loader.js

@@ -9,9 +9,8 @@ const path_1 = __importDefault(require("path"));
 const string_argv_1 = __importDefault(require("string-argv"));
 const value_checker_1 = require("../value_checker");
 class ProfileLoader {
-    constructor(directory, importer) {
+    constructor(directory) {
         this.directory = directory;
-        this.importer = importer;
     }
     async getDefinitions() {
         const definitionsFilePath = path_1.default.join(this.directory, 'cucumber.js');
@@ -19,7 +18,7 @@ class ProfileLoader {
         if (!exists) {
             return {};
         }
-        const definitions = await this.importer(definitionsFilePath, true);
+        const definitions = require(definitionsFilePath); // eslint-disable-line @typescript-eslint/no-var-requires
         if (typeof definitions !== 'object') {
             throw new Error(`${definitionsFilePath} does not export an object`);
         }

package/lib/cli/profile_loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"profile_loader.js","sourceRoot":"","sources":["../../src/cli/profile_loader.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsC;AACtC,+CAAsB;AACtB,gDAAuB;AACvB,8DAAoC;AACpC,oDAAkE;AAGlE,MAAqB,aAAa;IAChC,YACmB,SAAiB,EACjB,QAA2B;QAD3B,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAmB;IAC3C,CAAC;IAEJ,KAAK,CAAC,cAAc;QAClB,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACpE,MAAM,MAAM,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QACnD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,EAAE,CAAA;SACV;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAA;QAClE,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,4BAA4B,CAAC,CAAA;SACpE;QACD,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAkB;QAC9B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;QAC/C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,6BAAa,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YAC/D,QAAQ,GAAG,CAAC,SAAS,CAAC,CAAA;SACvB;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACrC,IAAI,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAA;aACjD;YACD,OAAO,qBAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;QACzC,CAAC,CAAC,CAAA;QACF,OAAO,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC;CACF;AAhCD,gCAgCC","sourcesContent":["import _, { Dictionary } from 'lodash'\nimport fs from 'mz/fs'\nimport path from 'path'\nimport stringArgv from 'string-argv'\nimport { doesHaveValue, doesNotHaveValue } from '../value_checker'\nimport { IUserCodeImporter } from './index'\n\nexport default class ProfileLoader {\n  constructor(\n    private readonly directory: string,\n    private readonly importer: IUserCodeImporter\n  ) {}\n\n  async getDefinitions(): Promise<Dictionary<string>> {\n    const definitionsFilePath = path.join(this.directory, 'cucumber.js')\n    const exists = await fs.exists(definitionsFilePath)\n    if (!exists) {\n      return {}\n    }\n    const definitions = await this.importer(definitionsFilePath, true)\n    if (typeof definitions !== 'object') {\n      throw new Error(`${definitionsFilePath} does not export an object`)\n    }\n    return definitions\n  }\n\n  async getArgv(profiles: string[]): Promise<string[]> {\n    const definitions = await this.getDefinitions()\n    if (profiles.length === 0 && doesHaveValue(definitions.default)) {\n      profiles = ['default']\n    }\n    const argvs = profiles.map((profile) => {\n      if (doesNotHaveValue(definitions[profile])) {\n        throw new Error(`Undefined profile: ${profile}`)\n      }\n      return stringArgv(definitions[profile])\n    })\n    return _.flatten(argvs)\n  }\n}\n"]}
+{"version":3,"file":"profile_loader.js","sourceRoot":"","sources":["../../src/cli/profile_loader.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,+CAAsB;AACtB,gDAAuB;AACvB,8DAAoC;AACpC,oDAAkE;AAElE,MAAqB,aAAa;IAGhC,YAAY,SAAiB;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACpE,MAAM,MAAM,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QACnD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,EAAE,CAAA;SACV;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA,CAAC,yDAAyD;QAC1G,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,4BAA4B,CAAC,CAAA;SACpE;QACD,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAkB;QAC9B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;QAC/C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,6BAAa,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YAC/D,QAAQ,GAAG,CAAC,SAAS,CAAC,CAAA;SACvB;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACrC,IAAI,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAA;aACjD;YACD,OAAO,qBAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;QACzC,CAAC,CAAC,CAAA;QACF,OAAO,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC;CACF;AAjCD,gCAiCC","sourcesContent":["import _ from 'lodash'\nimport fs from 'mz/fs'\nimport path from 'path'\nimport stringArgv from 'string-argv'\nimport { doesHaveValue, doesNotHaveValue } from '../value_checker'\n\nexport default class ProfileLoader {\n  private readonly directory: string\n\n  constructor(directory: string) {\n    this.directory = directory\n  }\n\n  async getDefinitions(): Promise<Record<string, string>> {\n    const definitionsFilePath = path.join(this.directory, 'cucumber.js')\n    const exists = await fs.exists(definitionsFilePath)\n    if (!exists) {\n      return {}\n    }\n    const definitions = require(definitionsFilePath) // eslint-disable-line @typescript-eslint/no-var-requires\n    if (typeof definitions !== 'object') {\n      throw new Error(`${definitionsFilePath} does not export an object`)\n    }\n    return definitions\n  }\n\n  async getArgv(profiles: string[]): Promise<string[]> {\n    const definitions = await this.getDefinitions()\n    if (profiles.length === 0 && doesHaveValue(definitions.default)) {\n      profiles = ['default']\n    }\n    const argvs = profiles.map((profile) => {\n      if (doesNotHaveValue(definitions[profile])) {\n        throw new Error(`Undefined profile: ${profile}`)\n      }\n      return stringArgv(definitions[profile])\n    })\n    return _.flatten(argvs)\n  }\n}\n"]}

package/lib/cli/publish_banner.js

@@ -8,7 +8,7 @@ const cli_table3_1 = __importDefault(require("cli-table3"));
 const underlineBoldCyan = (x) => safe_1.default.underline(safe_1.default.bold(safe_1.default.cyan(x)));
 const formattedReportUrl = underlineBoldCyan('https://reports.cucumber.io');
 const formattedEnv = safe_1.default.cyan('CUCUMBER_PUBLISH_ENABLED') + '=' + safe_1.default.cyan('true');
-const formattedMoreInfoUrl = underlineBoldCyan('https://reports.cucumber.io/docs/cucumber-js');
+const formattedMoreInfoUrl = underlineBoldCyan('https://cucumber.io/docs/cucumber/environment-variables/');
 const text = `\
 Share your Cucumber Report with your team at ${formattedReportUrl}
 

package/lib/cli/publish_banner.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish_banner.js","sourceRoot":"","sources":["../../src/cli/publish_banner.ts"],"names":[],"mappings":";;;;;AAAA,uDAAgC;AAChC,4DAA8B;AAE9B,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAU,EAAE,CAC9C,cAAM,CAAC,SAAS,CAAC,cAAM,CAAC,IAAI,CAAC,cAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/C,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,6BAA6B,CAAC,CAAA;AAC3E,MAAM,YAAY,GAChB,cAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,GAAG,GAAG,cAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AACrE,MAAM,oBAAoB,GAAG,iBAAiB,CAC5C,8CAA8C,CAC/C,CAAA;AAED,MAAM,IAAI,GAAG;+CACkC,kBAAkB;;0BAEvC,cAAM,CAAC,IAAI,CAAC,WAAW,CAAC;0BACxB,YAAY;;sBAEhB,oBAAoB;;4CAEE,cAAM,CAAC,IAAI,CAAC,eAAe,CAAC;EACtE,cAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,EAAE,CAAA;AAElE,MAAM,KAAK,GAAG,IAAI,oBAAK,CAAC;IACtB,KAAK,EAAE;QACL,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,CAAC,OAAO,CAAC;KAClB;CACF,CAAC,CAAA;AAEF,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;AAElB,kBAAe,KAAK,CAAC,QAAQ,EAAE,CAAA","sourcesContent":["import colors from 'colors/safe'\nimport Table from 'cli-table3'\n\nconst underlineBoldCyan = (x: string): string =>\n  colors.underline(colors.bold(colors.cyan(x)))\n\nconst formattedReportUrl = underlineBoldCyan('https://reports.cucumber.io')\nconst formattedEnv =\n  colors.cyan('CUCUMBER_PUBLISH_ENABLED') + '=' + colors.cyan('true')\nconst formattedMoreInfoUrl = underlineBoldCyan(\n  'https://reports.cucumber.io/docs/cucumber-js'\n)\n\nconst text = `\\\nShare your Cucumber Report with your team at ${formattedReportUrl}\n\nCommand line option:    ${colors.cyan('--publish')}\nEnvironment variable:   ${formattedEnv}\n\nMore information at ${formattedMoreInfoUrl}\n\nTo disable this message, add this to your ${colors.bold('./cucumber.js')}: \n${colors.bold(\"module.exports = { default: '--publish-quiet' }\")}`\n\nconst table = new Table({\n  style: {\n    head: [],\n    border: ['green'],\n  },\n})\n\ntable.push([text])\n\nexport default table.toString()\n"]}
+{"version":3,"file":"publish_banner.js","sourceRoot":"","sources":["../../src/cli/publish_banner.ts"],"names":[],"mappings":";;;;;AAAA,uDAAgC;AAChC,4DAA8B;AAE9B,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAU,EAAE,CAC9C,cAAM,CAAC,SAAS,CAAC,cAAM,CAAC,IAAI,CAAC,cAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/C,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,6BAA6B,CAAC,CAAA;AAC3E,MAAM,YAAY,GAChB,cAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,GAAG,GAAG,cAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AACrE,MAAM,oBAAoB,GAAG,iBAAiB,CAC5C,0DAA0D,CAC3D,CAAA;AAED,MAAM,IAAI,GAAG;+CACkC,kBAAkB;;0BAEvC,cAAM,CAAC,IAAI,CAAC,WAAW,CAAC;0BACxB,YAAY;;sBAEhB,oBAAoB;;4CAEE,cAAM,CAAC,IAAI,CAAC,eAAe,CAAC;EACtE,cAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,EAAE,CAAA;AAElE,MAAM,KAAK,GAAG,IAAI,oBAAK,CAAC;IACtB,KAAK,EAAE;QACL,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,CAAC,OAAO,CAAC;KAClB;CACF,CAAC,CAAA;AAEF,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;AAElB,kBAAe,KAAK,CAAC,QAAQ,EAAE,CAAA","sourcesContent":["import colors from 'colors/safe'\nimport Table from 'cli-table3'\n\nconst underlineBoldCyan = (x: string): string =>\n  colors.underline(colors.bold(colors.cyan(x)))\n\nconst formattedReportUrl = underlineBoldCyan('https://reports.cucumber.io')\nconst formattedEnv =\n  colors.cyan('CUCUMBER_PUBLISH_ENABLED') + '=' + colors.cyan('true')\nconst formattedMoreInfoUrl = underlineBoldCyan(\n  'https://cucumber.io/docs/cucumber/environment-variables/'\n)\n\nconst text = `\\\nShare your Cucumber Report with your team at ${formattedReportUrl}\n\nCommand line option:    ${colors.cyan('--publish')}\nEnvironment variable:   ${formattedEnv}\n\nMore information at ${formattedMoreInfoUrl}\n\nTo disable this message, add this to your ${colors.bold('./cucumber.js')}: \n${colors.bold(\"module.exports = { default: '--publish-quiet' }\")}`\n\nconst table = new Table({\n  style: {\n    head: [],\n    border: ['green'],\n  },\n})\n\ntable.push([text])\n\nexport default table.toString()\n"]}

package/lib/formatter/builder.d.ts

@@ -7,10 +7,8 @@ import EventDataCollector from './helpers/event_data_collector';
 import { Writable as WritableStream } from 'stream';
 import { IParsedArgvFormatOptions } from '../cli/argv_parser';
 import { SnippetInterface } from './step_definition_snippet_builder/snippet_syntax';
-import { IUserCodeImporter } from '../cli';
 interface IGetStepDefinitionSnippetBuilderOptions {
     cwd: string;
-    importer: IUserCodeImporter;
     snippetInterface?: SnippetInterface;
     snippetSyntax?: string;
     supportCodeLibrary: ISupportCodeLibrary;
@@ -21,16 +19,14 @@ export interface IBuildOptions {
     eventDataCollector: EventDataCollector;
     log: IFormatterLogFn;
     parsedArgvOptions: IParsedArgvFormatOptions;
-    importer: IUserCodeImporter;
     stream: WritableStream;
     cleanup: IFormatterCleanupFn;
     supportCodeLibrary: ISupportCodeLibrary;
 }
 declare const FormatterBuilder: {
-    build(type: string, options: IBuildOptions): Promise<Formatter>;
-    getConstructorByType(type: string, cwd: string, importer: IUserCodeImporter): Promise<typeof Formatter>;
-    getStepDefinitionSnippetBuilder({ cwd, importer, snippetInterface, snippetSyntax, supportCodeLibrary, }: IGetStepDefinitionSnippetBuilderOptions): Promise<StepDefinitionSnippetBuilder>;
-    loadCustomFormatter(customFormatterPath: string, cwd: string, importer: IUserCodeImporter): Promise<any>;
-    resolveConstructor(ImportedCode: any): any;
+    build(type: string, options: IBuildOptions): Formatter;
+    getConstructorByType(type: string, cwd: string): typeof Formatter;
+    getStepDefinitionSnippetBuilder({ cwd, snippetInterface, snippetSyntax, supportCodeLibrary, }: IGetStepDefinitionSnippetBuilderOptions): StepDefinitionSnippetBuilder;
+    loadCustomFormatter(customFormatterPath: string, cwd: string): any;
 };
 export default FormatterBuilder;

package/lib/formatter/builder.js

@@ -19,24 +19,21 @@ const usage_json_formatter_1 = __importDefault(require("./usage_json_formatter")
 const value_checker_1 = require("../value_checker");
 const snippet_syntax_1 = require("./step_definition_snippet_builder/snippet_syntax");
 const html_formatter_1 = __importDefault(require("./html_formatter"));
+const create_require_1 = __importDefault(require("create-require"));
 const FormatterBuilder = {
-    async build(type, options) {
-        const FormatterConstructor = await FormatterBuilder.getConstructorByType(type, options.cwd, options.importer);
+    build(type, options) {
+        const FormatterConstructor = FormatterBuilder.getConstructorByType(type, options.cwd);
         const colorFns = get_color_fns_1.default(options.parsedArgvOptions.colorsEnabled);
-        const snippetBuilder = await FormatterBuilder.getStepDefinitionSnippetBuilder({
+        const snippetBuilder = FormatterBuilder.getStepDefinitionSnippetBuilder({
             cwd: options.cwd,
-            importer: options.importer,
             snippetInterface: options.parsedArgvOptions.snippetInterface,
             snippetSyntax: options.parsedArgvOptions.snippetSyntax,
             supportCodeLibrary: options.supportCodeLibrary,
         });
-        return new FormatterConstructor({
-            colorFns,
-            snippetBuilder,
-            ...options,
-        });
+        return new FormatterConstructor(Object.assign({ colorFns,
+            snippetBuilder }, options));
     },
-    async getConstructorByType(type, cwd, importer) {
+    getConstructorByType(type, cwd) {
         switch (type) {
             case 'json':
                 return json_formatter_1.default;
@@ -59,45 +56,33 @@ const FormatterBuilder = {
             case 'usage-json':
                 return usage_json_formatter_1.default;
             default:
-                return await FormatterBuilder.loadCustomFormatter(type, cwd, importer);
+                return FormatterBuilder.loadCustomFormatter(type, cwd);
         }
     },
-    async getStepDefinitionSnippetBuilder({ cwd, importer, snippetInterface, snippetSyntax, supportCodeLibrary, }) {
+    getStepDefinitionSnippetBuilder({ cwd, snippetInterface, snippetSyntax, supportCodeLibrary, }) {
         if (value_checker_1.doesNotHaveValue(snippetInterface)) {
             snippetInterface = snippet_syntax_1.SnippetInterface.Synchronous;
         }
         let Syntax = javascript_snippet_syntax_1.default;
         if (value_checker_1.doesHaveValue(snippetSyntax)) {
             const fullSyntaxPath = path_1.default.resolve(cwd, snippetSyntax);
-            Syntax = await importer(fullSyntaxPath, true);
-            Syntax = FormatterBuilder.resolveConstructor(Syntax);
+            Syntax = require(fullSyntaxPath); // eslint-disable-line @typescript-eslint/no-var-requires
         }
         return new step_definition_snippet_builder_1.default({
             snippetSyntax: new Syntax(snippetInterface),
             parameterTypeRegistry: supportCodeLibrary.parameterTypeRegistry,
         });
     },
-    async loadCustomFormatter(customFormatterPath, cwd, importer) {
-        let CustomFormatter = customFormatterPath.startsWith(`.`)
-            ? await importer(path_1.default.resolve(cwd, customFormatterPath), true)
-            : await importer(customFormatterPath);
-        CustomFormatter = FormatterBuilder.resolveConstructor(CustomFormatter);
-        if (value_checker_1.doesHaveValue(CustomFormatter)) {
+    loadCustomFormatter(customFormatterPath, cwd) {
+        const CustomFormatter = create_require_1.default(cwd)(customFormatterPath);
+        if (typeof CustomFormatter === 'function') {
             return CustomFormatter;
         }
-        else {
-            throw new Error(`Custom formatter (${customFormatterPath}) does not export a function`);
-        }
-    },
-    resolveConstructor(ImportedCode) {
-        if (typeof ImportedCode === 'function') {
-            return ImportedCode;
-        }
-        else if (value_checker_1.doesHaveValue(ImportedCode) &&
-            typeof ImportedCode.default === 'function') {
-            return ImportedCode.default;
+        else if (value_checker_1.doesHaveValue(CustomFormatter) &&
+            typeof CustomFormatter.default === 'function') {
+            return CustomFormatter.default;
         }
-        return null;
+        throw new Error(`Custom formatter (${customFormatterPath}) does not export a function`);
     },
 };
 exports.default = FormatterBuilder;

package/lib/formatter/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/formatter/builder.ts"],"names":[],"mappings":"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","sourcesContent":["import getColorFns from './get_color_fns'\nimport JavascriptSnippetSyntax from './step_definition_snippet_builder/javascript_snippet_syntax'\nimport JsonFormatter from './json_formatter'\nimport MessageFormatter from './message_formatter'\nimport path from 'path'\nimport ProgressBarFormatter from './progress_bar_formatter'\nimport ProgressFormatter from './progress_formatter'\nimport RerunFormatter from './rerun_formatter'\nimport SnippetsFormatter from './snippets_formatter'\nimport StepDefinitionSnippetBuilder from './step_definition_snippet_builder'\nimport SummaryFormatter from './summary_formatter'\nimport UsageFormatter from './usage_formatter'\nimport UsageJsonFormatter from './usage_json_formatter'\nimport { ISupportCodeLibrary } from '../support_code_library_builder/types'\nimport Formatter, { IFormatterCleanupFn, IFormatterLogFn } from '.'\nimport { doesHaveValue, doesNotHaveValue } from '../value_checker'\nimport { EventEmitter } from 'events'\nimport EventDataCollector from './helpers/event_data_collector'\nimport { Writable as WritableStream } from 'stream'\nimport { IParsedArgvFormatOptions } from '../cli/argv_parser'\nimport { SnippetInterface } from './step_definition_snippet_builder/snippet_syntax'\nimport HtmlFormatter from './html_formatter'\nimport { IUserCodeImporter } from '../cli'\n\ninterface IGetStepDefinitionSnippetBuilderOptions {\n  cwd: string\n  importer: IUserCodeImporter\n  snippetInterface?: SnippetInterface\n  snippetSyntax?: string\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nexport interface IBuildOptions {\n  cwd: string\n  eventBroadcaster: EventEmitter\n  eventDataCollector: EventDataCollector\n  log: IFormatterLogFn\n  parsedArgvOptions: IParsedArgvFormatOptions\n  importer: IUserCodeImporter\n  stream: WritableStream\n  cleanup: IFormatterCleanupFn\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nconst FormatterBuilder = {\n  async build(type: string, options: IBuildOptions): Promise<Formatter> {\n    const FormatterConstructor = await FormatterBuilder.getConstructorByType(\n      type,\n      options.cwd,\n      options.importer\n    )\n    const colorFns = getColorFns(options.parsedArgvOptions.colorsEnabled)\n    const snippetBuilder = await FormatterBuilder.getStepDefinitionSnippetBuilder(\n      {\n        cwd: options.cwd,\n        importer: options.importer,\n        snippetInterface: options.parsedArgvOptions.snippetInterface,\n        snippetSyntax: options.parsedArgvOptions.snippetSyntax,\n        supportCodeLibrary: options.supportCodeLibrary,\n      }\n    )\n    return new FormatterConstructor({\n      colorFns,\n      snippetBuilder,\n      ...options,\n    })\n  },\n\n  async getConstructorByType(\n    type: string,\n    cwd: string,\n    importer: IUserCodeImporter\n  ): Promise<typeof Formatter> {\n    switch (type) {\n      case 'json':\n        return JsonFormatter\n      case 'message':\n        return MessageFormatter\n      case 'html':\n        return HtmlFormatter\n      case 'progress':\n        return ProgressFormatter\n      case 'progress-bar':\n        return ProgressBarFormatter\n      case 'rerun':\n        return RerunFormatter\n      case 'snippets':\n        return SnippetsFormatter\n      case 'summary':\n        return SummaryFormatter\n      case 'usage':\n        return UsageFormatter\n      case 'usage-json':\n        return UsageJsonFormatter\n      default:\n        return await FormatterBuilder.loadCustomFormatter(type, cwd, importer)\n    }\n  },\n\n  async getStepDefinitionSnippetBuilder({\n    cwd,\n    importer,\n    snippetInterface,\n    snippetSyntax,\n    supportCodeLibrary,\n  }: IGetStepDefinitionSnippetBuilderOptions) {\n    if (doesNotHaveValue(snippetInterface)) {\n      snippetInterface = SnippetInterface.Synchronous\n    }\n    let Syntax = JavascriptSnippetSyntax\n    if (doesHaveValue(snippetSyntax)) {\n      const fullSyntaxPath = path.resolve(cwd, snippetSyntax)\n      Syntax = await importer(fullSyntaxPath, true)\n      Syntax = FormatterBuilder.resolveConstructor(Syntax)\n    }\n    return new StepDefinitionSnippetBuilder({\n      snippetSyntax: new Syntax(snippetInterface),\n      parameterTypeRegistry: supportCodeLibrary.parameterTypeRegistry,\n    })\n  },\n\n  async loadCustomFormatter(\n    customFormatterPath: string,\n    cwd: string,\n    importer: IUserCodeImporter\n  ) {\n    let CustomFormatter = customFormatterPath.startsWith(`.`)\n      ? await importer(path.resolve(cwd, customFormatterPath), true)\n      : await importer(customFormatterPath)\n    CustomFormatter = FormatterBuilder.resolveConstructor(CustomFormatter)\n    if (doesHaveValue(CustomFormatter)) {\n      return CustomFormatter\n    } else {\n      throw new Error(\n        `Custom formatter (${customFormatterPath}) does not export a function`\n      )\n    }\n  },\n\n  resolveConstructor(ImportedCode: any) {\n    if (typeof ImportedCode === 'function') {\n      return ImportedCode\n    } else if (\n      doesHaveValue(ImportedCode) &&\n      typeof ImportedCode.default === 'function'\n    ) {\n      return ImportedCode.default\n    }\n    return null\n  },\n}\n\nexport default FormatterBuilder\n"]}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/formatter/builder.ts"],"names":[],"mappings":"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","sourcesContent":["import getColorFns from './get_color_fns'\nimport JavascriptSnippetSyntax from './step_definition_snippet_builder/javascript_snippet_syntax'\nimport JsonFormatter from './json_formatter'\nimport MessageFormatter from './message_formatter'\nimport path from 'path'\nimport ProgressBarFormatter from './progress_bar_formatter'\nimport ProgressFormatter from './progress_formatter'\nimport RerunFormatter from './rerun_formatter'\nimport SnippetsFormatter from './snippets_formatter'\nimport StepDefinitionSnippetBuilder from './step_definition_snippet_builder'\nimport SummaryFormatter from './summary_formatter'\nimport UsageFormatter from './usage_formatter'\nimport UsageJsonFormatter from './usage_json_formatter'\nimport { ISupportCodeLibrary } from '../support_code_library_builder/types'\nimport Formatter, { IFormatterCleanupFn, IFormatterLogFn } from '.'\nimport { doesHaveValue, doesNotHaveValue } from '../value_checker'\nimport { EventEmitter } from 'events'\nimport EventDataCollector from './helpers/event_data_collector'\nimport { Writable as WritableStream } from 'stream'\nimport { IParsedArgvFormatOptions } from '../cli/argv_parser'\nimport { SnippetInterface } from './step_definition_snippet_builder/snippet_syntax'\nimport HtmlFormatter from './html_formatter'\nimport createRequire from 'create-require'\n\ninterface IGetStepDefinitionSnippetBuilderOptions {\n  cwd: string\n  snippetInterface?: SnippetInterface\n  snippetSyntax?: string\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nexport interface IBuildOptions {\n  cwd: string\n  eventBroadcaster: EventEmitter\n  eventDataCollector: EventDataCollector\n  log: IFormatterLogFn\n  parsedArgvOptions: IParsedArgvFormatOptions\n  stream: WritableStream\n  cleanup: IFormatterCleanupFn\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nconst FormatterBuilder = {\n  build(type: string, options: IBuildOptions): Formatter {\n    const FormatterConstructor = FormatterBuilder.getConstructorByType(\n      type,\n      options.cwd\n    )\n    const colorFns = getColorFns(options.parsedArgvOptions.colorsEnabled)\n    const snippetBuilder = FormatterBuilder.getStepDefinitionSnippetBuilder({\n      cwd: options.cwd,\n      snippetInterface: options.parsedArgvOptions.snippetInterface,\n      snippetSyntax: options.parsedArgvOptions.snippetSyntax,\n      supportCodeLibrary: options.supportCodeLibrary,\n    })\n    return new FormatterConstructor({\n      colorFns,\n      snippetBuilder,\n      ...options,\n    })\n  },\n\n  getConstructorByType(type: string, cwd: string): typeof Formatter {\n    switch (type) {\n      case 'json':\n        return JsonFormatter\n      case 'message':\n        return MessageFormatter\n      case 'html':\n        return HtmlFormatter\n      case 'progress':\n        return ProgressFormatter\n      case 'progress-bar':\n        return ProgressBarFormatter\n      case 'rerun':\n        return RerunFormatter\n      case 'snippets':\n        return SnippetsFormatter\n      case 'summary':\n        return SummaryFormatter\n      case 'usage':\n        return UsageFormatter\n      case 'usage-json':\n        return UsageJsonFormatter\n      default:\n        return FormatterBuilder.loadCustomFormatter(type, cwd)\n    }\n  },\n\n  getStepDefinitionSnippetBuilder({\n    cwd,\n    snippetInterface,\n    snippetSyntax,\n    supportCodeLibrary,\n  }: IGetStepDefinitionSnippetBuilderOptions) {\n    if (doesNotHaveValue(snippetInterface)) {\n      snippetInterface = SnippetInterface.Synchronous\n    }\n    let Syntax = JavascriptSnippetSyntax\n    if (doesHaveValue(snippetSyntax)) {\n      const fullSyntaxPath = path.resolve(cwd, snippetSyntax)\n      Syntax = require(fullSyntaxPath) // eslint-disable-line @typescript-eslint/no-var-requires\n    }\n    return new StepDefinitionSnippetBuilder({\n      snippetSyntax: new Syntax(snippetInterface),\n      parameterTypeRegistry: supportCodeLibrary.parameterTypeRegistry,\n    })\n  },\n\n  loadCustomFormatter(customFormatterPath: string, cwd: string) {\n    const CustomFormatter = createRequire(cwd)(customFormatterPath)\n\n    if (typeof CustomFormatter === 'function') {\n      return CustomFormatter\n    } else if (\n      doesHaveValue(CustomFormatter) &&\n      typeof CustomFormatter.default === 'function'\n    ) {\n      return CustomFormatter.default\n    }\n    throw new Error(\n      `Custom formatter (${customFormatterPath}) does not export a function`\n    )\n  },\n}\n\nexport default FormatterBuilder\n"]}

package/lib/formatter/get_color_fns.d.ts

@@ -1,8 +1,12 @@
-import { messages } from '@cucumber/messages';
+import { TestStepResultStatus } from '@cucumber/messages';
 export declare type IColorFn = (text: string) => string;
 export interface IColorFns {
-    forStatus: (status: messages.TestStepFinished.TestStepResult.Status) => IColorFn;
+    forStatus: (status: TestStepResultStatus) => IColorFn;
     location: IColorFn;
     tag: IColorFn;
+    diffAdded: IColorFn;
+    diffRemoved: IColorFn;
+    errorMessage: IColorFn;
+    errorStack: IColorFn;
 }
 export default function getColorFns(enabled: boolean): IColorFns;

package/lib/formatter/get_color_fns.js

@@ -3,35 +3,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = __importDefault(require("lodash"));
 const safe_1 = __importDefault(require("colors/safe"));
-const status_1 = __importDefault(require("../status"));
 safe_1.default.enable();
 function getColorFns(enabled) {
     if (enabled) {
         return {
             forStatus(status) {
                 return {
-                    [status_1.default.AMBIGUOUS]: safe_1.default.red.bind(safe_1.default),
-                    [status_1.default.FAILED]: safe_1.default.red.bind(safe_1.default),
-                    [status_1.default.PASSED]: safe_1.default.green.bind(safe_1.default),
-                    [status_1.default.PENDING]: safe_1.default.yellow.bind(safe_1.default),
-                    [status_1.default.SKIPPED]: safe_1.default.cyan.bind(safe_1.default),
-                    [status_1.default.UNDEFINED]: safe_1.default.yellow.bind(safe_1.default),
-                    [status_1.default.UNKNOWN]: safe_1.default.yellow.bind(safe_1.default),
+                    AMBIGUOUS: safe_1.default.red.bind(safe_1.default),
+                    FAILED: safe_1.default.red.bind(safe_1.default),
+                    PASSED: safe_1.default.green.bind(safe_1.default),
+                    PENDING: safe_1.default.yellow.bind(safe_1.default),
+                    SKIPPED: safe_1.default.cyan.bind(safe_1.default),
+                    UNDEFINED: safe_1.default.yellow.bind(safe_1.default),
+                    UNKNOWN: safe_1.default.yellow.bind(safe_1.default),
                 }[status];
             },
             location: safe_1.default.gray.bind(safe_1.default),
             tag: safe_1.default.cyan.bind(safe_1.default),
+            diffAdded: safe_1.default.green.bind(safe_1.default),
+            diffRemoved: safe_1.default.red.bind(safe_1.default),
+            errorMessage: safe_1.default.red.bind(safe_1.default),
+            errorStack: safe_1.default.grey.bind(safe_1.default),
         };
     }
     else {
         return {
             forStatus(status) {
-                return lodash_1.default.identity;
+                return (x) => x;
             },
-            location: lodash_1.default.identity,
-            tag: lodash_1.default.identity,
+            location: (x) => x,
+            tag: (x) => x,
+            diffAdded: (x) => x,
+            diffRemoved: (x) => x,
+            errorMessage: (x) => x,
+            errorStack: (x) => x,
         };
     }
 }

package/lib/formatter/get_color_fns.js.map

@@ -1 +1 @@
-{"version":3,"file":"get_color_fns.js","sourceRoot":"","sources":["../../src/formatter/get_color_fns.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,uDAAgC;AAChC,uDAA8B;AAG9B,cAAM,CAAC,MAAM,EAAE,CAAA;AAYf,SAAwB,WAAW,CAAC,OAAgB;IAClD,IAAI,OAAO,EAAE;QACX,OAAO;YACL,SAAS,CAAC,MAAuD;gBAC/D,OAAO;oBACL,CAAC,gBAAM,CAAC,SAAS,CAAC,EAAE,cAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAM,CAAC;oBAC3C,CAAC,gBAAM,CAAC,MAAM,CAAC,EAAE,cAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAM,CAAC;oBACxC,CAAC,gBAAM,CAAC,MAAM,CAAC,EAAE,cAAM,CAAC,KAAK,CAAC,IAAI,CAAC,cAAM,CAAC;oBAC1C,CAAC,gBAAM,CAAC,OAAO,CAAC,EAAE,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAM,CAAC;oBAC5C,CAAC,gBAAM,CAAC,OAAO,CAAC,EAAE,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAM,CAAC;oBAC1C,CAAC,gBAAM,CAAC,SAAS,CAAC,EAAE,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAM,CAAC;oBAC9C,CAAC,gBAAM,CAAC,OAAO,CAAC,EAAE,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAM,CAAC;iBAC7C,CAAC,MAAM,CAAC,CAAA;YACX,CAAC;YACD,QAAQ,EAAE,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAM,CAAC;YAClC,GAAG,EAAE,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAM,CAAC;SAC9B,CAAA;KACF;SAAM;QACL,OAAO;YACL,SAAS,CAAC,MAAuD;gBAC/D,OAAO,gBAAC,CAAC,QAAQ,CAAA;YACnB,CAAC;YACD,QAAQ,EAAE,gBAAC,CAAC,QAAQ;YACpB,GAAG,EAAE,gBAAC,CAAC,QAAQ;SAChB,CAAA;KACF;AACH,CAAC;AA1BD,8BA0BC","sourcesContent":["import _ from 'lodash'\nimport colors from 'colors/safe'\nimport Status from '../status'\nimport { messages } from '@cucumber/messages'\n\ncolors.enable()\n\nexport type IColorFn = (text: string) => string\n\nexport interface IColorFns {\n  forStatus: (\n    status: messages.TestStepFinished.TestStepResult.Status\n  ) => IColorFn\n  location: IColorFn\n  tag: IColorFn\n}\n\nexport default function getColorFns(enabled: boolean): IColorFns {\n  if (enabled) {\n    return {\n      forStatus(status: messages.TestStepFinished.TestStepResult.Status) {\n        return {\n          [Status.AMBIGUOUS]: colors.red.bind(colors),\n          [Status.FAILED]: colors.red.bind(colors),\n          [Status.PASSED]: colors.green.bind(colors),\n          [Status.PENDING]: colors.yellow.bind(colors),\n          [Status.SKIPPED]: colors.cyan.bind(colors),\n          [Status.UNDEFINED]: colors.yellow.bind(colors),\n          [Status.UNKNOWN]: colors.yellow.bind(colors),\n        }[status]\n      },\n      location: colors.gray.bind(colors),\n      tag: colors.cyan.bind(colors),\n    }\n  } else {\n    return {\n      forStatus(status: messages.TestStepFinished.TestStepResult.Status) {\n        return _.identity\n      },\n      location: _.identity,\n      tag: _.identity,\n    }\n  }\n}\n"]}
+{"version":3,"file":"get_color_fns.js","sourceRoot":"","sources":["../../src/formatter/get_color_fns.ts"],"names":[],"mappings":";;;;;AAAA,uDAAgC;AAGhC,cAAM,CAAC,MAAM,EAAE,CAAA;AAcf,SAAwB,WAAW,CAAC,OAAgB;IAClD,IAAI,OAAO,EAAE;QACX,OAAO;YACL,SAAS,CAAC,MAA4B;gBACpC,OAAO;oBACL,SAAS,EAAE,cAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAM,CAAC;oBAClC,MAAM,EAAE,cAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAM,CAAC;oBAC/B,MAAM,EAAE,cAAM,CAAC,KAAK,CAAC,IAAI,CAAC,cAAM,CAAC;oBACjC,OAAO,EAAE,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAM,CAAC;oBACnC,OAAO,EAAE,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAM,CAAC;oBACjC,SAAS,EAAE,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAM,CAAC;oBACrC,OAAO,EAAE,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAM,CAAC;iBACpC,CAAC,MAAM,CAAC,CAAA;YACX,CAAC;YACD,QAAQ,EAAE,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAM,CAAC;YAClC,GAAG,EAAE,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAM,CAAC;YAC7B,SAAS,EAAE,cAAM,CAAC,KAAK,CAAC,IAAI,CAAC,cAAM,CAAC;YACpC,WAAW,EAAE,cAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAM,CAAC;YACpC,YAAY,EAAE,cAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAM,CAAC;YACrC,UAAU,EAAE,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAM,CAAC;SACrC,CAAA;KACF;SAAM;QACL,OAAO;YACL,SAAS,CAAC,MAA4B;gBACpC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;YACjB,CAAC;YACD,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAClB,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACb,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACnB,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACrB,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACtB,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;SACrB,CAAA;KACF;AACH,CAAC;AAlCD,8BAkCC","sourcesContent":["import colors from 'colors/safe'\nimport { TestStepResultStatus } from '@cucumber/messages'\n\ncolors.enable()\n\nexport type IColorFn = (text: string) => string\n\nexport interface IColorFns {\n  forStatus: (status: TestStepResultStatus) => IColorFn\n  location: IColorFn\n  tag: IColorFn\n  diffAdded: IColorFn\n  diffRemoved: IColorFn\n  errorMessage: IColorFn\n  errorStack: IColorFn\n}\n\nexport default function getColorFns(enabled: boolean): IColorFns {\n  if (enabled) {\n    return {\n      forStatus(status: TestStepResultStatus) {\n        return {\n          AMBIGUOUS: colors.red.bind(colors),\n          FAILED: colors.red.bind(colors),\n          PASSED: colors.green.bind(colors),\n          PENDING: colors.yellow.bind(colors),\n          SKIPPED: colors.cyan.bind(colors),\n          UNDEFINED: colors.yellow.bind(colors),\n          UNKNOWN: colors.yellow.bind(colors),\n        }[status]\n      },\n      location: colors.gray.bind(colors),\n      tag: colors.cyan.bind(colors),\n      diffAdded: colors.green.bind(colors),\n      diffRemoved: colors.red.bind(colors),\n      errorMessage: colors.red.bind(colors),\n      errorStack: colors.grey.bind(colors),\n    }\n  } else {\n    return {\n      forStatus(status: TestStepResultStatus) {\n        return (x) => x\n      },\n      location: (x) => x,\n      tag: (x) => x,\n      diffAdded: (x) => x,\n      diffRemoved: (x) => x,\n      errorMessage: (x) => x,\n      errorStack: (x) => x,\n    }\n  }\n}\n"]}

package/lib/formatter/helpers/event_data_collector.d.ts

@@ -1,32 +1,29 @@
 /// <reference types="node" />
-import { Dictionary } from 'lodash';
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { EventEmitter } from 'events';
-import { Query } from '@cucumber/query';
 export interface ITestCaseAttempt {
     attempt: number;
-    gherkinDocument: messages.IGherkinDocument;
-    pickle: messages.IPickle;
-    stepAttachments: Dictionary<messages.IAttachment[]>;
-    stepResults: Dictionary<messages.TestStepFinished.ITestStepResult>;
-    testCase: messages.ITestCase;
-    worstTestStepResult: messages.TestStepFinished.ITestStepResult;
+    gherkinDocument: messages.GherkinDocument;
+    pickle: messages.Pickle;
+    stepAttachments: Record<string, messages.Attachment[]>;
+    stepResults: Record<string, messages.TestStepResult>;
+    testCase: messages.TestCase;
+    worstTestStepResult: messages.TestStepResult;
 }
 export default class EventDataCollector {
     private gherkinDocumentMap;
     private pickleMap;
     private testCaseMap;
     private testCaseAttemptDataMap;
-    readonly undefinedParameterTypes: messages.IUndefinedParameterType[];
-    readonly query: Query;
+    readonly undefinedParameterTypes: messages.UndefinedParameterType[];
     constructor(eventBroadcaster: EventEmitter);
-    getGherkinDocument(uri: string): messages.IGherkinDocument;
-    getPickle(pickleId: string): messages.IPickle;
+    getGherkinDocument(uri: string): messages.GherkinDocument;
+    getPickle(pickleId: string): messages.Pickle;
     getTestCaseAttempts(): ITestCaseAttempt[];
     getTestCaseAttempt(testCaseStartedId: string): ITestCaseAttempt;
     parseEnvelope(envelope: messages.Envelope): void;
-    initTestCaseAttempt(testCaseStarted: messages.ITestCaseStarted): void;
-    storeAttachment({ testCaseStartedId, testStepId, body, mediaType, }: messages.IAttachment): void;
-    storeTestStepResult({ testCaseStartedId, testStepId, testStepResult, }: messages.ITestStepFinished): void;
-    storeTestCaseResult({ testCaseStartedId }: messages.ITestCaseFinished): void;
+    private initTestCaseAttempt;
+    storeAttachment(attachment: messages.Attachment): void;
+    storeTestStepResult({ testCaseStartedId, testStepId, testStepResult, }: messages.TestStepFinished): void;
+    storeTestCaseResult({ testCaseStartedId }: messages.TestCaseFinished): void;
 }

package/lib/formatter/helpers/event_data_collector.js

@@ -20,8 +20,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importStar(require("lodash"));
+const messages = __importStar(require("@cucumber/messages"));
 const value_checker_1 = require("../../value_checker");
-const query_1 = require("@cucumber/query");
 class EventDataCollector {
     constructor(eventBroadcaster) {
         this.gherkinDocumentMap = {};
@@ -29,7 +29,6 @@ class EventDataCollector {
         this.testCaseMap = {};
         this.testCaseAttemptDataMap = {};
         this.undefinedParameterTypes = [];
-        this.query = new query_1.Query();
         eventBroadcaster.on('envelope', this.parseEnvelope.bind(this));
     }
     getGherkinDocument(uri) {
@@ -58,7 +57,6 @@ class EventDataCollector {
         };
     }
     parseEnvelope(envelope) {
-        this.query.update(envelope);
         if (value_checker_1.doesHaveValue(envelope.gherkinDocument)) {
             this.gherkinDocumentMap[envelope.gherkinDocument.uri] =
                 envelope.gherkinDocument;
@@ -91,24 +89,32 @@ class EventDataCollector {
             testCaseId: testCaseStarted.testCaseId,
             stepAttachments: {},
             stepResults: {},
-            worstTestStepResult: {},
+            worstTestStepResult: {
+                willBeRetried: false,
+                duration: { seconds: 0, nanos: 0 },
+                status: messages.TestStepResultStatus.UNKNOWN,
+            },
         };
     }
-    storeAttachment({ testCaseStartedId, testStepId, body, mediaType, }) {
+    storeAttachment(attachment) {
+        const { testCaseStartedId, testStepId } = attachment;
+        // TODO: we shouldn't have to check if these properties have values - they are non-nullable
         if (value_checker_1.doesHaveValue(testCaseStartedId) && value_checker_1.doesHaveValue(testStepId)) {
             const { stepAttachments } = this.testCaseAttemptDataMap[testCaseStartedId];
             if (value_checker_1.doesNotHaveValue(stepAttachments[testStepId])) {
                 stepAttachments[testStepId] = [];
             }
-            stepAttachments[testStepId].push({ body, mediaType });
+            stepAttachments[testStepId].push(attachment);
         }
     }
     storeTestStepResult({ testCaseStartedId, testStepId, testStepResult, }) {
-        this.testCaseAttemptDataMap[testCaseStartedId].stepResults[testStepId] = testStepResult;
+        this.testCaseAttemptDataMap[testCaseStartedId].stepResults[testStepId] =
+            testStepResult;
     }
     storeTestCaseResult({ testCaseStartedId }) {
         const stepResults = lodash_1.values(this.testCaseAttemptDataMap[testCaseStartedId].stepResults);
-        this.testCaseAttemptDataMap[testCaseStartedId].worstTestStepResult = this.query.getWorstTestStepResult(stepResults);
+        this.testCaseAttemptDataMap[testCaseStartedId].worstTestStepResult =
+            messages.getWorstTestStepResult(stepResults);
     }
 }
 exports.default = EventDataCollector;

package/lib/formatter/helpers/event_data_collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"event_data_collector.js","sourceRoot":"","sources":["../../../src/formatter/helpers/event_data_collector.ts"],"names":[],"mappings":"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","sourcesContent":["import _, { Dictionary, values } from 'lodash'\nimport { messages } from '@cucumber/messages'\nimport { doesHaveValue, doesNotHaveValue } from '../../value_checker'\nimport { EventEmitter } from 'events'\nimport { Query } from '@cucumber/query'\n\ninterface ITestCaseAttemptData {\n  attempt: number\n  testCaseId: string\n  stepAttachments: Dictionary<messages.IAttachment[]>\n  stepResults: Dictionary<messages.TestStepFinished.ITestStepResult>\n  worstTestStepResult: messages.TestStepFinished.ITestStepResult\n}\n\nexport interface ITestCaseAttempt {\n  attempt: number\n  gherkinDocument: messages.IGherkinDocument\n  pickle: messages.IPickle\n  stepAttachments: Dictionary<messages.IAttachment[]>\n  stepResults: Dictionary<messages.TestStepFinished.ITestStepResult>\n  testCase: messages.ITestCase\n  worstTestStepResult: messages.TestStepFinished.ITestStepResult\n}\n\nexport default class EventDataCollector {\n  private gherkinDocumentMap: Dictionary<messages.IGherkinDocument> = {}\n  private pickleMap: Dictionary<messages.IPickle> = {}\n  private testCaseMap: Dictionary<messages.ITestCase> = {}\n  private testCaseAttemptDataMap: Dictionary<ITestCaseAttemptData> = {}\n  readonly undefinedParameterTypes: messages.IUndefinedParameterType[] = []\n  readonly query = new Query()\n\n  constructor(eventBroadcaster: EventEmitter) {\n    eventBroadcaster.on('envelope', this.parseEnvelope.bind(this))\n  }\n\n  getGherkinDocument(uri: string): messages.IGherkinDocument {\n    return this.gherkinDocumentMap[uri]\n  }\n\n  getPickle(pickleId: string): messages.IPickle {\n    return this.pickleMap[pickleId]\n  }\n\n  getTestCaseAttempts(): ITestCaseAttempt[] {\n    return _.keys(this.testCaseAttemptDataMap).map((testCaseStartedId) => {\n      return this.getTestCaseAttempt(testCaseStartedId)\n    })\n  }\n\n  getTestCaseAttempt(testCaseStartedId: string): ITestCaseAttempt {\n    const testCaseAttemptData = this.testCaseAttemptDataMap[testCaseStartedId]\n    const testCase = this.testCaseMap[testCaseAttemptData.testCaseId]\n    const pickle = this.pickleMap[testCase.pickleId]\n    return {\n      gherkinDocument: this.gherkinDocumentMap[pickle.uri],\n      pickle,\n      testCase,\n      attempt: testCaseAttemptData.attempt,\n      stepAttachments: testCaseAttemptData.stepAttachments,\n      stepResults: testCaseAttemptData.stepResults,\n      worstTestStepResult: testCaseAttemptData.worstTestStepResult,\n    }\n  }\n\n  parseEnvelope(envelope: messages.Envelope): void {\n    this.query.update(envelope)\n    if (doesHaveValue(envelope.gherkinDocument)) {\n      this.gherkinDocumentMap[envelope.gherkinDocument.uri] =\n        envelope.gherkinDocument\n    } else if (doesHaveValue(envelope.pickle)) {\n      this.pickleMap[envelope.pickle.id] = envelope.pickle\n    } else if (doesHaveValue(envelope.undefinedParameterType)) {\n      this.undefinedParameterTypes.push(envelope.undefinedParameterType)\n    } else if (doesHaveValue(envelope.testCase)) {\n      this.testCaseMap[envelope.testCase.id] = envelope.testCase\n    } else if (doesHaveValue(envelope.testCaseStarted)) {\n      this.initTestCaseAttempt(envelope.testCaseStarted)\n    } else if (doesHaveValue(envelope.attachment)) {\n      this.storeAttachment(envelope.attachment)\n    } else if (doesHaveValue(envelope.testStepFinished)) {\n      this.storeTestStepResult(envelope.testStepFinished)\n    } else if (doesHaveValue(envelope.testCaseFinished)) {\n      this.storeTestCaseResult(envelope.testCaseFinished)\n    }\n  }\n\n  initTestCaseAttempt(testCaseStarted: messages.ITestCaseStarted): void {\n    this.testCaseAttemptDataMap[testCaseStarted.id] = {\n      attempt: testCaseStarted.attempt,\n      testCaseId: testCaseStarted.testCaseId,\n      stepAttachments: {},\n      stepResults: {},\n      worstTestStepResult: {},\n    }\n  }\n\n  storeAttachment({\n    testCaseStartedId,\n    testStepId,\n    body,\n    mediaType,\n  }: messages.IAttachment): void {\n    if (doesHaveValue(testCaseStartedId) && doesHaveValue(testStepId)) {\n      const { stepAttachments } = this.testCaseAttemptDataMap[testCaseStartedId]\n      if (doesNotHaveValue(stepAttachments[testStepId])) {\n        stepAttachments[testStepId] = []\n      }\n      stepAttachments[testStepId].push({ body, mediaType })\n    }\n  }\n\n  storeTestStepResult({\n    testCaseStartedId,\n    testStepId,\n    testStepResult,\n  }: messages.ITestStepFinished): void {\n    this.testCaseAttemptDataMap[testCaseStartedId].stepResults[\n      testStepId\n    ] = testStepResult\n  }\n\n  storeTestCaseResult({ testCaseStartedId }: messages.ITestCaseFinished): void {\n    const stepResults = values(\n      this.testCaseAttemptDataMap[testCaseStartedId].stepResults\n    )\n    this.testCaseAttemptDataMap[\n      testCaseStartedId\n    ].worstTestStepResult = this.query.getWorstTestStepResult(stepResults)\n  }\n}\n"]}
+{"version":3,"file":"event_data_collector.js","sourceRoot":"","sources":["../../../src/formatter/helpers/event_data_collector.ts"],"names":[],"mappings":"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","sourcesContent":["import _, { values } from 'lodash'\nimport * as messages from '@cucumber/messages'\nimport { doesHaveValue, doesNotHaveValue } from '../../value_checker'\nimport { EventEmitter } from 'events'\n\ninterface ITestCaseAttemptData {\n  attempt: number\n  testCaseId: string\n  stepAttachments: Record<string, messages.Attachment[]>\n  stepResults: Record<string, messages.TestStepResult>\n  worstTestStepResult: messages.TestStepResult\n}\n\nexport interface ITestCaseAttempt {\n  attempt: number\n  gherkinDocument: messages.GherkinDocument\n  pickle: messages.Pickle\n  stepAttachments: Record<string, messages.Attachment[]>\n  stepResults: Record<string, messages.TestStepResult>\n  testCase: messages.TestCase\n  worstTestStepResult: messages.TestStepResult\n}\n\nexport default class EventDataCollector {\n  private gherkinDocumentMap: Record<string, messages.GherkinDocument> = {}\n  private pickleMap: Record<string, messages.Pickle> = {}\n  private testCaseMap: Record<string, messages.TestCase> = {}\n  private testCaseAttemptDataMap: Record<string, ITestCaseAttemptData> = {}\n  readonly undefinedParameterTypes: messages.UndefinedParameterType[] = []\n\n  constructor(eventBroadcaster: EventEmitter) {\n    eventBroadcaster.on('envelope', this.parseEnvelope.bind(this))\n  }\n\n  getGherkinDocument(uri: string): messages.GherkinDocument {\n    return this.gherkinDocumentMap[uri]\n  }\n\n  getPickle(pickleId: string): messages.Pickle {\n    return this.pickleMap[pickleId]\n  }\n\n  getTestCaseAttempts(): ITestCaseAttempt[] {\n    return _.keys(this.testCaseAttemptDataMap).map((testCaseStartedId) => {\n      return this.getTestCaseAttempt(testCaseStartedId)\n    })\n  }\n\n  getTestCaseAttempt(testCaseStartedId: string): ITestCaseAttempt {\n    const testCaseAttemptData = this.testCaseAttemptDataMap[testCaseStartedId]\n    const testCase = this.testCaseMap[testCaseAttemptData.testCaseId]\n    const pickle = this.pickleMap[testCase.pickleId]\n    return {\n      gherkinDocument: this.gherkinDocumentMap[pickle.uri],\n      pickle,\n      testCase,\n      attempt: testCaseAttemptData.attempt,\n      stepAttachments: testCaseAttemptData.stepAttachments,\n      stepResults: testCaseAttemptData.stepResults,\n      worstTestStepResult: testCaseAttemptData.worstTestStepResult,\n    }\n  }\n\n  parseEnvelope(envelope: messages.Envelope): void {\n    if (doesHaveValue(envelope.gherkinDocument)) {\n      this.gherkinDocumentMap[envelope.gherkinDocument.uri] =\n        envelope.gherkinDocument\n    } else if (doesHaveValue(envelope.pickle)) {\n      this.pickleMap[envelope.pickle.id] = envelope.pickle\n    } else if (doesHaveValue(envelope.undefinedParameterType)) {\n      this.undefinedParameterTypes.push(envelope.undefinedParameterType)\n    } else if (doesHaveValue(envelope.testCase)) {\n      this.testCaseMap[envelope.testCase.id] = envelope.testCase\n    } else if (doesHaveValue(envelope.testCaseStarted)) {\n      this.initTestCaseAttempt(envelope.testCaseStarted)\n    } else if (doesHaveValue(envelope.attachment)) {\n      this.storeAttachment(envelope.attachment)\n    } else if (doesHaveValue(envelope.testStepFinished)) {\n      this.storeTestStepResult(envelope.testStepFinished)\n    } else if (doesHaveValue(envelope.testCaseFinished)) {\n      this.storeTestCaseResult(envelope.testCaseFinished)\n    }\n  }\n\n  private initTestCaseAttempt(testCaseStarted: messages.TestCaseStarted): void {\n    this.testCaseAttemptDataMap[testCaseStarted.id] = {\n      attempt: testCaseStarted.attempt,\n      testCaseId: testCaseStarted.testCaseId,\n      stepAttachments: {},\n      stepResults: {},\n      worstTestStepResult: {\n        willBeRetried: false,\n        duration: { seconds: 0, nanos: 0 },\n        status: messages.TestStepResultStatus.UNKNOWN,\n      },\n    }\n  }\n\n  storeAttachment(attachment: messages.Attachment): void {\n    const { testCaseStartedId, testStepId } = attachment\n    // TODO: we shouldn't have to check if these properties have values - they are non-nullable\n    if (doesHaveValue(testCaseStartedId) && doesHaveValue(testStepId)) {\n      const { stepAttachments } = this.testCaseAttemptDataMap[testCaseStartedId]\n      if (doesNotHaveValue(stepAttachments[testStepId])) {\n        stepAttachments[testStepId] = []\n      }\n      stepAttachments[testStepId].push(attachment)\n    }\n  }\n\n  storeTestStepResult({\n    testCaseStartedId,\n    testStepId,\n    testStepResult,\n  }: messages.TestStepFinished): void {\n    this.testCaseAttemptDataMap[testCaseStartedId].stepResults[testStepId] =\n      testStepResult\n  }\n\n  storeTestCaseResult({ testCaseStartedId }: messages.TestCaseFinished): void {\n    const stepResults = values(\n      this.testCaseAttemptDataMap[testCaseStartedId].stepResults\n    )\n    this.testCaseAttemptDataMap[testCaseStartedId].worstTestStepResult =\n      messages.getWorstTestStepResult(stepResults)\n  }\n}\n"]}

package/lib/formatter/helpers/gherkin_document_parser.d.ts

@@ -1,6 +1,5 @@
-import { Dictionary } from 'lodash';
-import { messages } from '@cucumber/messages';
-export declare function getGherkinStepMap(gherkinDocument: messages.IGherkinDocument): Dictionary<messages.GherkinDocument.Feature.IStep>;
-export declare function getGherkinScenarioMap(gherkinDocument: messages.IGherkinDocument): Dictionary<messages.GherkinDocument.Feature.IScenario>;
-export declare function getGherkinExampleRuleMap(gherkinDocument: messages.IGherkinDocument): Dictionary<messages.GherkinDocument.Feature.FeatureChild.IRule>;
-export declare function getGherkinScenarioLocationMap(gherkinDocument: messages.IGherkinDocument): Dictionary<messages.ILocation>;
+import * as messages from '@cucumber/messages';
+export declare function getGherkinStepMap(gherkinDocument: messages.GherkinDocument): Record<string, messages.Step>;
+export declare function getGherkinScenarioMap(gherkinDocument: messages.GherkinDocument): Record<string, messages.Scenario>;
+export declare function getGherkinExampleRuleMap(gherkinDocument: messages.GherkinDocument): Record<string, messages.Rule>;
+export declare function getGherkinScenarioLocationMap(gherkinDocument: messages.GherkinDocument): Record<string, messages.Location>;

package/lib/formatter/helpers/gherkin_document_parser.js

@@ -39,10 +39,7 @@ function getGherkinScenarioMap(gherkinDocument) {
         .flatten()
         .filter('scenario')
         .map('scenario')
-        .map((scenario) => [
-        scenario.id,
-        scenario,
-    ])
+        .map((scenario) => [scenario.id, scenario])
         .fromPairs()
         .value();
 }

package/lib/formatter/helpers/gherkin_document_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"gherkin_document_parser.js","sourceRoot":"","sources":["../../../src/formatter/helpers/gherkin_document_parser.ts"],"names":[],"mappings":"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","sourcesContent":["import _, { Dictionary } from 'lodash'\nimport { messages } from '@cucumber/messages'\nimport { doesHaveValue } from '../../value_checker'\n\nexport function getGherkinStepMap(\n  gherkinDocument: messages.IGherkinDocument\n): Dictionary<messages.GherkinDocument.Feature.IStep> {\n  return _.chain(gherkinDocument.feature.children)\n    .map(extractStepContainers)\n    .flatten()\n    .map('steps')\n    .flatten()\n    .map((step: messages.GherkinDocument.Feature.IStep) => [step.id, step])\n    .fromPairs()\n    .value()\n}\n\nfunction extractStepContainers(\n  child: messages.GherkinDocument.Feature.IFeatureChild\n): Array<\n  | messages.GherkinDocument.Feature.IScenario\n  | messages.GherkinDocument.Feature.IBackground\n> {\n  if (doesHaveValue(child.background)) {\n    return [child.background]\n  } else if (doesHaveValue(child.rule)) {\n    return child.rule.children.map((ruleChild) =>\n      doesHaveValue(ruleChild.background)\n        ? ruleChild.background\n        : ruleChild.scenario\n    )\n  }\n  return [child.scenario]\n}\n\nexport function getGherkinScenarioMap(\n  gherkinDocument: messages.IGherkinDocument\n): Dictionary<messages.GherkinDocument.Feature.IScenario> {\n  return _.chain(gherkinDocument.feature.children)\n    .map((child: messages.GherkinDocument.Feature.IFeatureChild) => {\n      if (doesHaveValue(child.rule)) {\n        return child.rule.children\n      }\n      return [child]\n    })\n    .flatten()\n    .filter('scenario')\n    .map('scenario')\n    .map((scenario: messages.GherkinDocument.Feature.IScenario) => [\n      scenario.id,\n      scenario,\n    ])\n    .fromPairs()\n    .value()\n}\n\nexport function getGherkinExampleRuleMap(\n  gherkinDocument: messages.IGherkinDocument\n): Dictionary<messages.GherkinDocument.Feature.FeatureChild.IRule> {\n  return _.chain(gherkinDocument.feature.children)\n    .filter('rule')\n    .map('rule')\n    .map((rule) => {\n      return rule.children\n        .filter((child) => doesHaveValue(child.scenario))\n        .map((child) => [child.scenario.id, rule])\n    })\n    .flatten()\n    .fromPairs()\n    .value()\n}\n\nexport function getGherkinScenarioLocationMap(\n  gherkinDocument: messages.IGherkinDocument\n): Dictionary<messages.ILocation> {\n  const locationMap: Dictionary<messages.ILocation> = {}\n  const scenarioMap: Dictionary<messages.GherkinDocument.Feature.IScenario> = getGherkinScenarioMap(\n    gherkinDocument\n  )\n  _.entries<messages.GherkinDocument.Feature.IScenario>(scenarioMap).forEach(\n    ([id, scenario]) => {\n      locationMap[id] = scenario.location\n      if (doesHaveValue(scenario.examples)) {\n        _.chain(scenario.examples)\n          .map('tableBody')\n          .flatten()\n          .forEach((tableRow) => {\n            locationMap[tableRow.id] = tableRow.location\n          })\n          .value()\n      }\n    }\n  )\n  return locationMap\n}\n"]}
+{"version":3,"file":"gherkin_document_parser.js","sourceRoot":"","sources":["../../../src/formatter/helpers/gherkin_document_parser.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash'\nimport * as messages from '@cucumber/messages'\nimport { doesHaveValue } from '../../value_checker'\n\nexport function getGherkinStepMap(\n  gherkinDocument: messages.GherkinDocument\n): Record<string, messages.Step> {\n  return _.chain(gherkinDocument.feature.children)\n    .map(extractStepContainers)\n    .flatten()\n    .map('steps')\n    .flatten()\n    .map((step: messages.Step) => [step.id, step])\n    .fromPairs()\n    .value()\n}\n\nfunction extractStepContainers(\n  child: messages.FeatureChild\n): Array<messages.Scenario | messages.Background> {\n  if (doesHaveValue(child.background)) {\n    return [child.background]\n  } else if (doesHaveValue(child.rule)) {\n    return child.rule.children.map((ruleChild) =>\n      doesHaveValue(ruleChild.background)\n        ? ruleChild.background\n        : ruleChild.scenario\n    )\n  }\n  return [child.scenario]\n}\n\nexport function getGherkinScenarioMap(\n  gherkinDocument: messages.GherkinDocument\n): Record<string, messages.Scenario> {\n  return _.chain(gherkinDocument.feature.children)\n    .map((child: messages.FeatureChild) => {\n      if (doesHaveValue(child.rule)) {\n        return child.rule.children\n      }\n      return [child]\n    })\n    .flatten()\n    .filter('scenario')\n    .map('scenario')\n    .map((scenario: messages.Scenario) => [scenario.id, scenario])\n    .fromPairs()\n    .value()\n}\n\nexport function getGherkinExampleRuleMap(\n  gherkinDocument: messages.GherkinDocument\n): Record<string, messages.Rule> {\n  return _.chain(gherkinDocument.feature.children)\n    .filter('rule')\n    .map('rule')\n    .map((rule) => {\n      return rule.children\n        .filter((child) => doesHaveValue(child.scenario))\n        .map((child) => [child.scenario.id, rule])\n    })\n    .flatten()\n    .fromPairs()\n    .value()\n}\n\nexport function getGherkinScenarioLocationMap(\n  gherkinDocument: messages.GherkinDocument\n): Record<string, messages.Location> {\n  const locationMap: Record<string, messages.Location> = {}\n  const scenarioMap: Record<string, messages.Scenario> =\n    getGherkinScenarioMap(gherkinDocument)\n  _.entries<messages.Scenario>(scenarioMap).forEach(([id, scenario]) => {\n    locationMap[id] = scenario.location\n    if (doesHaveValue(scenario.examples)) {\n      _.chain(scenario.examples)\n        .map('tableBody')\n        .flatten()\n        .forEach((tableRow) => {\n          locationMap[tableRow.id] = tableRow.location\n        })\n        .value()\n    }\n  })\n  return locationMap\n}\n"]}

package/lib/formatter/helpers/issue_helpers.d.ts

@@ -1,11 +1,11 @@
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { IColorFns } from '../get_color_fns';
 import StepDefinitionSnippetBuilder from '../step_definition_snippet_builder';
 import { ISupportCodeLibrary } from '../../support_code_library_builder/types';
 import { ITestCaseAttempt } from './event_data_collector';
-export declare function isFailure(result: messages.TestStepFinished.ITestStepResult): boolean;
-export declare function isWarning(result: messages.TestStepFinished.ITestStepResult): boolean;
-export declare function isIssue(result: messages.TestStepFinished.ITestStepResult): boolean;
+export declare function isFailure(result: messages.TestStepResult): boolean;
+export declare function isWarning(result: messages.TestStepResult): boolean;
+export declare function isIssue(result: messages.TestStepResult): boolean;
 export interface IFormatIssueRequest {
     colorFns: IColorFns;
     cwd: string;
@@ -15,5 +15,5 @@ export interface IFormatIssueRequest {
     supportCodeLibrary: ISupportCodeLibrary;
 }
 export declare function formatIssue({ colorFns, cwd, number, snippetBuilder, testCaseAttempt, supportCodeLibrary, }: IFormatIssueRequest): string;
-export declare function formatUndefinedParameterTypes(undefinedParameterTypes: messages.IUndefinedParameterType[]): string;
-export declare function formatUndefinedParameterType(parameterType: messages.IUndefinedParameterType): string;
+export declare function formatUndefinedParameterTypes(undefinedParameterTypes: messages.UndefinedParameterType[]): string;
+export declare function formatUndefinedParameterType(parameterType: messages.UndefinedParameterType): string;

package/lib/formatter/helpers/issue_helpers.js

@@ -5,17 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatUndefinedParameterType = exports.formatUndefinedParameterTypes = exports.formatIssue = exports.isIssue = exports.isWarning = exports.isFailure = void 0;
 const indent_string_1 = __importDefault(require("indent-string"));
-const status_1 = __importDefault(require("../../status"));
 const test_case_attempt_formatter_1 = require("./test_case_attempt_formatter");
 function isFailure(result) {
-    return (result.status === status_1.default.AMBIGUOUS ||
-        result.status === status_1.default.UNDEFINED ||
-        (result.status === status_1.default.FAILED && !result.willBeRetried));
+    return (result.status === 'AMBIGUOUS' ||
+        result.status === 'UNDEFINED' ||
+        (result.status === 'FAILED' && !result.willBeRetried));
 }
 exports.isFailure = isFailure;
 function isWarning(result) {
-    return (result.status === status_1.default.PENDING ||
-        (result.status === status_1.default.FAILED && result.willBeRetried));
+    return (result.status === 'PENDING' ||
+        (result.status === 'FAILED' && result.willBeRetried));
 }
 exports.isWarning = isWarning;
 function isIssue(result) {