@cucumber/cucumber 7.0.0 → 7.3.0

package/lib/formatter/http_stream.js

@@ -19,14 +19,14 @@ const value_checker_1 = require("../value_checker");
  *
  * 3xx redirects are not currently followed.
  */
-class HttpStream extends stream_1.Writable {
-    constructor(url, method, headers, reportLocation) {
-        super();
+class HttpStream extends stream_1.Transform {
+    constructor(url, method, headers) {
+        super({
+            readableObjectMode: true,
+        });
         this.url = url;
         this.method = method;
         this.headers = headers;
-        this.reportLocation = reportLocation;
-        this.responseBodyFromGet = null;
     }
     _write(chunk, encoding, callback) {
         if (this.tempFile === undefined) {
@@ -44,63 +44,67 @@ class HttpStream extends stream_1.Writable {
     }
     _final(callback) {
         this.tempFile.end(() => {
-            this.sendRequest(this.url, this.method, (err) => {
-                if (value_checker_1.doesHaveValue(err))
-                    return callback(err);
-                this.reportLocation(this.responseBodyFromGet);
-                callback(null);
+            this.sendHttpRequest(this.url, this.method, this.headers, (err1, res1) => {
+                if (value_checker_1.doesHaveValue(err1))
+                    return callback(err1);
+                this.pushResponseBody(res1, () => {
+                    this.emitErrorUnlessHttp2xx(res1, this.url, this.method);
+                    if (res1.statusCode === 202 &&
+                        res1.headers.location !== undefined) {
+                        this.sendHttpRequest(res1.headers.location, 'PUT', {}, (err2, res2) => {
+                            if (value_checker_1.doesHaveValue(err2))
+                                return callback(err2);
+                            this.emitErrorUnlessHttp2xx(res2, this.url, this.method);
+                            callback();
+                        });
+                    }
+                    else {
+                        callback();
+                    }
+                });
             });
         });
     }
-    sendRequest(url, method, callback) {
+    pushResponseBody(res, done) {
+        let body = Buffer.alloc(0);
+        res.on('data', (chunk) => {
+            body = Buffer.concat([body, chunk]);
+        });
+        res.on('end', () => {
+            this.push(body.toString('utf-8'));
+            done();
+        });
+    }
+    emitErrorUnlessHttp2xx(res, url, method) {
+        if (res.statusCode >= 300)
+            this.emit('error', new Error(`Unexpected http status ${res.statusCode} from ${method} ${url}`));
+    }
+    sendHttpRequest(url, method, headers, callback) {
         const httpx = value_checker_1.doesHaveValue(url.match(/^https:/)) ? https_1.default : http_1.default;
-        if (method === 'GET') {
-            httpx.get(url, { headers: this.headers }, (res) => {
-                if (res.statusCode >= 400) {
-                    return callback(new Error(`${method} ${url} returned status ${res.statusCode}`));
-                }
-                if (res.statusCode !== 202 || res.headers.location === undefined) {
-                    callback(null, url);
-                }
-                else {
-                    let body = Buffer.alloc(0);
-                    res.on('data', (chunk) => {
-                        body = Buffer.concat([body, chunk]);
-                    });
-                    res.on('end', () => {
-                        this.responseBodyFromGet = body.toString('utf-8');
-                        this.sendRequest(res.headers.location, 'PUT', callback);
-                    });
+        const additionalHttpHeaders = {};
+        const upload = method === 'PUT' || method === 'POST';
+        if (upload) {
+            additionalHttpHeaders['Content-Length'] = fs_1.default.statSync(this.tempFilePath).size;
+        }
+        const allHeaders = Object.assign(Object.assign({}, headers), additionalHttpHeaders);
+        const req = httpx.request(url, {
+            method,
+            headers: allHeaders,
+        });
+        req.on('error', (err) => this.emit('error', err));
+        req.on('response', (res) => {
+            res.on('error', (err) => this.emit('error', err));
+            callback(null, res);
+        });
+        if (upload) {
+            stream_1.pipeline(fs_1.default.createReadStream(this.tempFilePath), req, (err) => {
+                if (value_checker_1.doesHaveValue(err)) {
+                    this.emit('error', err);
                 }
             });
         }
         else {
-            const contentLength = fs_1.default.statSync(this.tempFilePath).size;
-            const req = httpx.request(url, {
-                method,
-                headers: {
-                    'Content-Length': contentLength,
-                },
-            });
-            req.on('response', (res) => {
-                if (res.statusCode >= 400) {
-                    let body = Buffer.alloc(0);
-                    res.on('data', (chunk) => {
-                        body = Buffer.concat([body, chunk]);
-                    });
-                    res.on('end', () => {
-                        callback(new Error(`${method} ${url} returned status ${res.statusCode}:\n${body.toString('utf-8')}`));
-                    });
-                    res.on('error', callback);
-                }
-                else {
-                    callback(null, url);
-                }
-            });
-            stream_1.pipeline(fs_1.default.createReadStream(this.tempFilePath), req, (err) => {
-                if (value_checker_1.doesHaveValue(err))
-                    callback(err);
-            });
+            req.end();
         }
     }
 }

package/lib/formatter/http_stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"http_stream.js","sourceRoot":"","sources":["../../src/formatter/http_stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"http_stream.js","sourceRoot":"","sources":["../../src/formatter/http_stream.ts"],"names":[],"mappings":"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","sourcesContent":["import { pipeline, Transform, Writable } from 'stream'\nimport tmp from 'tmp'\nimport fs from 'fs'\nimport http from 'http'\nimport https from 'https'\nimport { doesHaveValue } from '../value_checker'\n\ntype HttpMethod = 'GET' | 'POST' | 'PUT'\n\n/**\n * This Writable writes data to a HTTP/HTTPS URL.\n *\n * It has special handling for https://reports.cucumber.io/\n * which uses an API where the first request is a `GET`,\n * and if the response is 202 with a Location header, issues\n * a PUT request to that URL.\n *\n * 3xx redirects are not currently followed.\n */\nexport default class HttpStream extends Transform {\n  private tempFilePath: string\n  private tempFile: Writable\n\n  constructor(\n    private readonly url: string,\n    private readonly method: HttpMethod,\n    private readonly headers: http.OutgoingHttpHeaders\n  ) {\n    super({\n      readableObjectMode: true,\n    })\n  }\n\n  _write(\n    chunk: any,\n    encoding: BufferEncoding,\n    callback: (err?: Error | null) => void\n  ): void {\n    if (this.tempFile === undefined) {\n      tmp.file((err, name, fd) => {\n        if (doesHaveValue(err)) return callback(err)\n        this.tempFilePath = name\n        this.tempFile = fs.createWriteStream(name, { fd })\n        this.tempFile.write(chunk, encoding, callback)\n      })\n    } else {\n      this.tempFile.write(chunk, encoding, callback)\n    }\n  }\n\n  _final(callback: (error?: Error | null) => void): void {\n    this.tempFile.end(() => {\n      this.sendHttpRequest(\n        this.url,\n        this.method,\n        this.headers,\n        (err1, res1) => {\n          if (doesHaveValue(err1)) return callback(err1)\n          this.pushResponseBody(res1, () => {\n            this.emitErrorUnlessHttp2xx(res1, this.url, this.method)\n            if (\n              res1.statusCode === 202 &&\n              res1.headers.location !== undefined\n            ) {\n              this.sendHttpRequest(\n                res1.headers.location,\n                'PUT',\n                {},\n                (err2, res2) => {\n                  if (doesHaveValue(err2)) return callback(err2)\n                  this.emitErrorUnlessHttp2xx(res2, this.url, this.method)\n                  callback()\n                }\n              )\n            } else {\n              callback()\n            }\n          })\n        }\n      )\n    })\n  }\n\n  private pushResponseBody(res: http.IncomingMessage, done: () => void): void {\n    let body = Buffer.alloc(0)\n    res.on('data', (chunk) => {\n      body = Buffer.concat([body, chunk])\n    })\n    res.on('end', () => {\n      this.push(body.toString('utf-8'))\n      done()\n    })\n  }\n\n  private emitErrorUnlessHttp2xx(\n    res: http.IncomingMessage,\n    url: string,\n    method: string\n  ): void {\n    if (res.statusCode >= 300)\n      this.emit(\n        'error',\n        new Error(\n          `Unexpected http status ${res.statusCode} from ${method} ${url}`\n        )\n      )\n  }\n\n  private sendHttpRequest(\n    url: string,\n    method: HttpMethod,\n    headers: http.OutgoingHttpHeaders,\n    callback: (err?: Error | null, res?: http.IncomingMessage) => void\n  ): void {\n    const httpx = doesHaveValue(url.match(/^https:/)) ? https : http\n    const additionalHttpHeaders: http.OutgoingHttpHeaders = {}\n\n    const upload = method === 'PUT' || method === 'POST'\n    if (upload) {\n      additionalHttpHeaders['Content-Length'] = fs.statSync(\n        this.tempFilePath\n      ).size\n    }\n\n    const allHeaders = { ...headers, ...additionalHttpHeaders }\n    const req = httpx.request(url, {\n      method,\n      headers: allHeaders,\n    })\n    req.on('error', (err) => this.emit('error', err))\n    req.on('response', (res) => {\n      res.on('error', (err) => this.emit('error', err))\n      callback(null, res)\n    })\n\n    if (upload) {\n      pipeline(fs.createReadStream(this.tempFilePath), req, (err) => {\n        if (doesHaveValue(err)) {\n          this.emit('error', err)\n        }\n      })\n    } else {\n      req.end()\n    }\n  }\n}\n"]}

package/lib/formatter/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formatter/index.ts"],"names":[],"mappings":";;AAgCA,MAAqB,SAAS;IAU5B,YAAY,OAA0B;QACpC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;QAChC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACtB,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;QACpD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACtB,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;QAC5C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;QACpD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;CACF;AAxBD,4BAwBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formatter/index.ts"],"names":[],"mappings":";;AAgCA,MAAqB,SAAS;IAU5B,YAAY,OAA0B;QACpC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;QAChC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACtB,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;QACpD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACtB,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;QAC5C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;QACpD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;CACF;AAxBD,4BAwBC","sourcesContent":["import { IColorFns } from './get_color_fns'\nimport { EventDataCollector } from './helpers'\nimport StepDefinitionSnippetBuilder from './step_definition_snippet_builder'\nimport { PassThrough, Writable as WritableStream } from 'stream'\nimport { ISupportCodeLibrary } from '../support_code_library_builder/types'\nimport { WriteStream as FsWriteStream } from 'fs'\nimport { WriteStream as TtyWriteStream } from 'tty'\nimport { EventEmitter } from 'events'\nimport { IParsedArgvFormatOptions } from '../cli/argv_parser'\nimport HttpStream from './http_stream'\n\nexport type IFormatterStream =\n  | FsWriteStream\n  | TtyWriteStream\n  | PassThrough\n  | HttpStream\nexport type IFormatterLogFn = (buffer: string | Uint8Array) => void\nexport type IFormatterCleanupFn = () => Promise<any>\n\nexport interface IFormatterOptions {\n  colorFns: IColorFns\n  cwd: string\n  eventBroadcaster: EventEmitter\n  eventDataCollector: EventDataCollector\n  log: IFormatterLogFn\n  parsedArgvOptions: IParsedArgvFormatOptions\n  snippetBuilder: StepDefinitionSnippetBuilder\n  stream: WritableStream\n  cleanup: IFormatterCleanupFn\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nexport default class Formatter {\n  protected colorFns: IColorFns\n  protected cwd: string\n  protected eventDataCollector: EventDataCollector\n  protected log: IFormatterLogFn\n  protected snippetBuilder: StepDefinitionSnippetBuilder\n  protected stream: WritableStream\n  protected supportCodeLibrary: ISupportCodeLibrary\n  private readonly cleanup: IFormatterCleanupFn\n\n  constructor(options: IFormatterOptions) {\n    this.colorFns = options.colorFns\n    this.cwd = options.cwd\n    this.eventDataCollector = options.eventDataCollector\n    this.log = options.log\n    this.snippetBuilder = options.snippetBuilder\n    this.stream = options.stream\n    this.supportCodeLibrary = options.supportCodeLibrary\n    this.cleanup = options.cleanup\n  }\n\n  async finished(): Promise<void> {\n    await this.cleanup()\n  }\n}\n"]}

package/lib/formatter/json_formatter.d.ts

@@ -1,10 +1,5 @@
-import { Dictionary } from 'lodash';
 import Formatter, { IFormatterOptions } from './';
-import { messages } from '@cucumber/messages';
-import IFeature = messages.GherkinDocument.IFeature;
-import IPickle = messages.IPickle;
-import IScenario = messages.GherkinDocument.Feature.IScenario;
-import IRule = messages.GherkinDocument.Feature.FeatureChild.IRule;
+import * as messages from '@cucumber/messages';
 export interface IJsonFeature {
     description: string;
     elements: IJsonScenario[];
@@ -40,44 +35,43 @@ export interface IJsonTag {
     line: number;
 }
 interface IBuildJsonFeatureOptions {
-    feature: messages.GherkinDocument.IFeature;
+    feature: messages.Feature;
     elements: IJsonScenario[];
     uri: string;
 }
 interface IBuildJsonScenarioOptions {
-    feature: messages.GherkinDocument.IFeature;
-    gherkinScenarioMap: Dictionary<IScenario>;
-    gherkinExampleRuleMap: Dictionary<IRule>;
-    gherkinScenarioLocationMap: Dictionary<messages.ILocation>;
-    pickle: messages.IPickle;
+    feature: messages.Feature;
+    gherkinScenarioMap: Record<string, messages.Scenario>;
+    gherkinExampleRuleMap: Record<string, messages.Rule>;
+    gherkinScenarioLocationMap: Record<string, messages.Location>;
+    pickle: messages.Pickle;
     steps: IJsonStep[];
 }
 interface IBuildJsonStepOptions {
     isBeforeHook: boolean;
-    gherkinStepMap: Dictionary<messages.GherkinDocument.Feature.IStep>;
-    pickleStepMap: Dictionary<messages.Pickle.IPickleStep>;
-    testStep: messages.TestCase.ITestStep;
-    testStepAttachments: messages.IAttachment[];
-    testStepResult: messages.TestStepFinished.ITestStepResult;
+    gherkinStepMap: Record<string, messages.Step>;
+    pickleStepMap: Record<string, messages.PickleStep>;
+    testStep: messages.TestStep;
+    testStepAttachments: messages.Attachment[];
+    testStepResult: messages.TestStepResult;
 }
 export default class JsonFormatter extends Formatter {
     constructor(options: IFormatterOptions);
-    convertNameToId(obj: IFeature | IPickle): string;
-    formatDataTable(dataTable: messages.PickleStepArgument.IPickleTable): any;
-    formatDocString(docString: messages.PickleStepArgument.IPickleDocString, gherkinStep: messages.GherkinDocument.Feature.IStep): any;
-    formatStepArgument(stepArgument: messages.IPickleStepArgument, gherkinStep: messages.GherkinDocument.Feature.IStep): any;
+    convertNameToId(obj: messages.Feature | messages.Pickle): string;
+    formatDataTable(dataTable: messages.PickleTable): any;
+    formatDocString(docString: messages.PickleDocString, gherkinStep: messages.Step): any;
+    formatStepArgument(stepArgument: messages.PickleStepArgument, gherkinStep: messages.Step): any;
     onTestRunFinished(): void;
     getFeatureData({ feature, elements, uri, }: IBuildJsonFeatureOptions): IJsonFeature;
     getScenarioData({ feature, gherkinScenarioLocationMap, gherkinExampleRuleMap, gherkinScenarioMap, pickle, steps, }: IBuildJsonScenarioOptions): IJsonScenario;
     private formatScenarioId;
     getStepData({ isBeforeHook, gherkinStepMap, pickleStepMap, testStep, testStepAttachments, testStepResult, }: IBuildJsonStepOptions): IJsonStep;
-    getFeatureTags(feature: IFeature): IJsonTag[];
+    getFeatureTags(feature: messages.Feature): IJsonTag[];
     getScenarioTags({ feature, pickle, gherkinScenarioMap, }: {
-        feature: IFeature;
-        pickle: IPickle;
-        gherkinScenarioMap: {
-            [id: string]: IScenario;
-        };
+        feature: messages.Feature;
+        pickle: messages.Pickle;
+        gherkinScenarioMap: Record<string, messages.Scenario>;
     }): IJsonTag[];
+    private getScenarioTag;
 }
 export {};

package/lib/formatter/json_formatter.js

@@ -1,23 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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 _1 = __importDefault(require("./"));
-const status_1 = __importDefault(require("../status"));
 const helpers_1 = require("./helpers");
-const time_1 = require("../time");
-const path_1 = __importDefault(require("path"));
+const messages = __importStar(require("@cucumber/messages"));
 const gherkin_document_parser_1 = require("./helpers/gherkin_document_parser");
 const value_checker_1 = require("../value_checker");
 const step_arguments_1 = require("../step_arguments");
 const { getGherkinStepMap, getGherkinScenarioMap } = helpers_1.GherkinDocumentParser;
-const { getScenarioDescription, getPickleStepMap, getStepKeyword, } = helpers_1.PickleParser;
+const { getScenarioDescription, getPickleStepMap, getStepKeyword } = helpers_1.PickleParser;
 class JsonFormatter extends _1.default {
     constructor(options) {
         super(options);
-        console.warn("The built-in JSON formatter is deprecated and will be removed in the next major release. Where you need a structured data representation of your test run, it's best to use the `message` formatter. For legacy tools that depend on the deprecated JSON format, a standalone formatter is available (see https://github.com/cucumber/cucumber/tree/master/json-formatter).");
         options.eventBroadcaster.on('envelope', (envelope) => {
             if (value_checker_1.doesHaveValue(envelope.testRunFinished)) {
                 this.onTestRunFinished();
@@ -53,7 +69,7 @@ class JsonFormatter extends _1.default {
         const groupedTestCaseAttempts = {};
         lodash_1.default.each(this.eventDataCollector.getTestCaseAttempts(), (testCaseAttempt) => {
             if (!testCaseAttempt.worstTestStepResult.willBeRetried) {
-                const uri = path_1.default.relative(this.cwd, testCaseAttempt.pickle.uri);
+                const uri = testCaseAttempt.pickle.uri;
                 if (value_checker_1.doesNotHaveValue(groupedTestCaseAttempts[uri])) {
                     groupedTestCaseAttempts[uri] = [];
                 }
@@ -71,7 +87,7 @@ class JsonFormatter extends _1.default {
                 const pickleStepMap = getPickleStepMap(pickle);
                 let isBeforeHook = true;
                 const steps = testCaseAttempt.testCase.testSteps.map((testStep) => {
-                    isBeforeHook = isBeforeHook && testStep.pickleStepId === '';
+                    isBeforeHook = isBeforeHook && !value_checker_1.doesHaveValue(testStep.pickleStepId);
                     return this.getStepData({
                         isBeforeHook,
                         gherkinStepMap,
@@ -139,7 +155,7 @@ class JsonFormatter extends _1.default {
     }
     getStepData({ isBeforeHook, gherkinStepMap, pickleStepMap, testStep, testStepAttachments, testStepResult, }) {
         const data = {};
-        if (testStep.pickleStepId !== '') {
+        if (value_checker_1.doesHaveValue(testStep.pickleStepId)) {
             const pickleStep = pickleStepMap[testStep.pickleStepId];
             data.arguments = this.formatStepArgument(pickleStep.argument, gherkinStepMap[pickleStep.astNodeIds[0]]);
             data.keyword = getStepKeyword({ pickleStep, gherkinStepMap });
@@ -150,16 +166,21 @@ class JsonFormatter extends _1.default {
             data.keyword = isBeforeHook ? 'Before' : 'After';
             data.hidden = true;
         }
-        if (testStep.stepDefinitionIds.length === 1) {
+        if (value_checker_1.doesHaveValue(testStep.stepDefinitionIds) &&
+            testStep.stepDefinitionIds.length === 1) {
             const stepDefinition = this.supportCodeLibrary.stepDefinitions.find((s) => s.id === testStep.stepDefinitionIds[0]);
             data.match = { location: helpers_1.formatLocation(stepDefinition) };
         }
         const { message, status } = testStepResult;
-        data.result = { status: status_1.default[status].toLowerCase() };
+        data.result = {
+            status: messages.TestStepResultStatus[status].toLowerCase(),
+        };
         if (value_checker_1.doesHaveValue(testStepResult.duration)) {
-            data.result.duration = time_1.durationToNanoseconds(testStepResult.duration);
+            data.result.duration =
+                messages.TimeConversion.durationToMilliseconds(testStepResult.duration) * 1000000;
         }
-        if (status === status_1.default.FAILED && value_checker_1.doesHaveValue(message)) {
+        if (status === messages.TestStepResultStatus.FAILED &&
+            value_checker_1.doesHaveValue(message)) {
             data.result.error_message = message;
         }
         if (lodash_1.default.size(testStepAttachments) > 0) {
@@ -177,17 +198,23 @@ class JsonFormatter extends _1.default {
         }));
     }
     getScenarioTags({ feature, pickle, gherkinScenarioMap, }) {
-        return lodash_1.default.map(pickle.tags, (tagData) => {
-            const featureSource = feature.tags.find((t) => t.id === tagData.astNodeId);
-            const scenarioSource = gherkinScenarioMap[pickle.astNodeIds[0]].tags.find((t) => t.id === tagData.astNodeId);
-            const line = value_checker_1.doesHaveValue(featureSource)
-                ? featureSource.location.line
-                : scenarioSource.location.line;
-            return {
-                name: tagData.name,
-                line,
-            };
-        });
+        const scenario = gherkinScenarioMap[pickle.astNodeIds[0]];
+        return pickle.tags.map((tagData) => this.getScenarioTag(tagData, feature, scenario));
+    }
+    getScenarioTag(tagData, feature, scenario) {
+        var _a;
+        const byAstNodeId = (tag) => tag.id === tagData.astNodeId;
+        const flatten = (acc, val) => acc.concat(val);
+        const tag = feature.tags.find(byAstNodeId) ||
+            scenario.tags.find(byAstNodeId) ||
+            scenario.examples
+                .map((e) => e.tags)
+                .reduce(flatten, [])
+                .find(byAstNodeId);
+        return {
+            name: tagData.name,
+            line: (_a = tag === null || tag === void 0 ? void 0 : tag.location) === null || _a === void 0 ? void 0 : _a.line,
+        };
     }
 }
 exports.default = JsonFormatter;

package/lib/formatter/json_formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"json_formatter.js","sourceRoot":"","sources":["../../src/formatter/json_formatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json_formatter.js","sourceRoot":"","sources":["../../src/formatter/json_formatter.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash'\nimport Formatter, { IFormatterOptions } from './'\nimport { formatLocation, GherkinDocumentParser, PickleParser } from './helpers'\nimport * as messages from '@cucumber/messages'\nimport {\n  getGherkinExampleRuleMap,\n  getGherkinScenarioLocationMap,\n} from './helpers/gherkin_document_parser'\nimport { ITestCaseAttempt } from './helpers/event_data_collector'\nimport { doesHaveValue, doesNotHaveValue } from '../value_checker'\nimport { parseStepArgument } from '../step_arguments'\n\nconst { getGherkinStepMap, getGherkinScenarioMap } = GherkinDocumentParser\n\nconst { getScenarioDescription, getPickleStepMap, getStepKeyword } =\n  PickleParser\n\nexport interface IJsonFeature {\n  description: string\n  elements: IJsonScenario[]\n  id: string\n  keyword: string\n  line: number\n  name: string\n  tags: IJsonTag[]\n  uri: string\n}\n\nexport interface IJsonScenario {\n  description: string\n  id: string\n  keyword: string\n  line: number\n  name: string\n  steps: IJsonStep[]\n  tags: IJsonTag[]\n  type: string\n}\n\nexport interface IJsonStep {\n  arguments?: any // TODO\n  embeddings?: any // TODO\n  hidden?: boolean\n  keyword?: string // TODO, not optional\n  line?: number\n  match?: any // TODO\n  name?: string\n  result?: any // TODO\n}\n\nexport interface IJsonTag {\n  name: string\n  line: number\n}\n\ninterface IBuildJsonFeatureOptions {\n  feature: messages.Feature\n  elements: IJsonScenario[]\n  uri: string\n}\n\ninterface IBuildJsonScenarioOptions {\n  feature: messages.Feature\n  gherkinScenarioMap: Record<string, messages.Scenario>\n  gherkinExampleRuleMap: Record<string, messages.Rule>\n  gherkinScenarioLocationMap: Record<string, messages.Location>\n  pickle: messages.Pickle\n  steps: IJsonStep[]\n}\n\ninterface IBuildJsonStepOptions {\n  isBeforeHook: boolean\n  gherkinStepMap: Record<string, messages.Step>\n  pickleStepMap: Record<string, messages.PickleStep>\n  testStep: messages.TestStep\n  testStepAttachments: messages.Attachment[]\n  testStepResult: messages.TestStepResult\n}\n\ninterface UriToTestCaseAttemptsMap {\n  [uri: string]: ITestCaseAttempt[]\n}\n\nexport default class JsonFormatter extends Formatter {\n  constructor(options: IFormatterOptions) {\n    super(options)\n    options.eventBroadcaster.on('envelope', (envelope: messages.Envelope) => {\n      if (doesHaveValue(envelope.testRunFinished)) {\n        this.onTestRunFinished()\n      }\n    })\n  }\n\n  convertNameToId(obj: messages.Feature | messages.Pickle): string {\n    return obj.name.replace(/ /g, '-').toLowerCase()\n  }\n\n  formatDataTable(dataTable: messages.PickleTable): any {\n    return {\n      rows: dataTable.rows.map((row) => ({ cells: _.map(row.cells, 'value') })),\n    }\n  }\n\n  formatDocString(\n    docString: messages.PickleDocString,\n    gherkinStep: messages.Step\n  ): any {\n    return {\n      content: docString.content,\n      line: gherkinStep.docString.location.line,\n    }\n  }\n\n  formatStepArgument(\n    stepArgument: messages.PickleStepArgument,\n    gherkinStep: messages.Step\n  ): any {\n    if (doesNotHaveValue(stepArgument)) {\n      return []\n    }\n    return [\n      parseStepArgument<any>(stepArgument, {\n        dataTable: (dataTable) => this.formatDataTable(dataTable),\n        docString: (docString) => this.formatDocString(docString, gherkinStep),\n      }),\n    ]\n  }\n\n  onTestRunFinished(): void {\n    const groupedTestCaseAttempts: UriToTestCaseAttemptsMap = {}\n    _.each(\n      this.eventDataCollector.getTestCaseAttempts(),\n      (testCaseAttempt: ITestCaseAttempt) => {\n        if (!testCaseAttempt.worstTestStepResult.willBeRetried) {\n          const uri = testCaseAttempt.pickle.uri\n          if (doesNotHaveValue(groupedTestCaseAttempts[uri])) {\n            groupedTestCaseAttempts[uri] = []\n          }\n          groupedTestCaseAttempts[uri].push(testCaseAttempt)\n        }\n      }\n    )\n    const features = _.map(groupedTestCaseAttempts, (group, uri) => {\n      const { gherkinDocument } = group[0]\n      const gherkinStepMap = getGherkinStepMap(gherkinDocument)\n      const gherkinScenarioMap = getGherkinScenarioMap(gherkinDocument)\n      const gherkinExampleRuleMap = getGherkinExampleRuleMap(gherkinDocument)\n      const gherkinScenarioLocationMap =\n        getGherkinScenarioLocationMap(gherkinDocument)\n      const elements = group.map((testCaseAttempt: ITestCaseAttempt) => {\n        const { pickle } = testCaseAttempt\n        const pickleStepMap = getPickleStepMap(pickle)\n        let isBeforeHook = true\n        const steps = testCaseAttempt.testCase.testSteps.map((testStep) => {\n          isBeforeHook = isBeforeHook && !doesHaveValue(testStep.pickleStepId)\n          return this.getStepData({\n            isBeforeHook,\n            gherkinStepMap,\n            pickleStepMap,\n            testStep,\n            testStepAttachments: testCaseAttempt.stepAttachments[testStep.id],\n            testStepResult: testCaseAttempt.stepResults[testStep.id],\n          })\n        })\n        return this.getScenarioData({\n          feature: gherkinDocument.feature,\n          gherkinScenarioLocationMap,\n          gherkinExampleRuleMap,\n          gherkinScenarioMap,\n          pickle,\n          steps,\n        })\n      })\n      return this.getFeatureData({\n        feature: gherkinDocument.feature,\n        elements,\n        uri,\n      })\n    })\n    this.log(JSON.stringify(features, null, 2))\n  }\n\n  getFeatureData({\n    feature,\n    elements,\n    uri,\n  }: IBuildJsonFeatureOptions): IJsonFeature {\n    return {\n      description: feature.description,\n      elements,\n      id: this.convertNameToId(feature),\n      line: feature.location.line,\n      keyword: feature.keyword,\n      name: feature.name,\n      tags: this.getFeatureTags(feature),\n      uri,\n    }\n  }\n\n  getScenarioData({\n    feature,\n    gherkinScenarioLocationMap,\n    gherkinExampleRuleMap,\n    gherkinScenarioMap,\n    pickle,\n    steps,\n  }: IBuildJsonScenarioOptions): IJsonScenario {\n    const description = getScenarioDescription({\n      pickle,\n      gherkinScenarioMap,\n    })\n    return {\n      description,\n      id: this.formatScenarioId({ feature, pickle, gherkinExampleRuleMap }),\n      keyword: gherkinScenarioMap[pickle.astNodeIds[0]].keyword,\n      line: gherkinScenarioLocationMap[pickle.astNodeIds[0]].line,\n      name: pickle.name,\n      steps,\n      tags: this.getScenarioTags({ feature, pickle, gherkinScenarioMap }),\n      type: 'scenario',\n    }\n  }\n\n  private formatScenarioId({\n    feature,\n    pickle,\n    gherkinExampleRuleMap,\n  }: {\n    feature: messages.Feature\n    pickle: messages.Pickle\n    gherkinExampleRuleMap: Record<string, messages.Rule>\n  }): string {\n    let parts: any[]\n    const rule = gherkinExampleRuleMap[pickle.astNodeIds[0]]\n    if (doesHaveValue(rule)) {\n      parts = [feature, rule, pickle]\n    } else {\n      parts = [feature, pickle]\n    }\n    return parts.map((part) => this.convertNameToId(part)).join(';')\n  }\n\n  getStepData({\n    isBeforeHook,\n    gherkinStepMap,\n    pickleStepMap,\n    testStep,\n    testStepAttachments,\n    testStepResult,\n  }: IBuildJsonStepOptions): IJsonStep {\n    const data: IJsonStep = {}\n    if (doesHaveValue(testStep.pickleStepId)) {\n      const pickleStep = pickleStepMap[testStep.pickleStepId]\n      data.arguments = this.formatStepArgument(\n        pickleStep.argument,\n        gherkinStepMap[pickleStep.astNodeIds[0]]\n      )\n      data.keyword = getStepKeyword({ pickleStep, gherkinStepMap })\n      data.line = gherkinStepMap[pickleStep.astNodeIds[0]].location.line\n      data.name = pickleStep.text\n    } else {\n      data.keyword = isBeforeHook ? 'Before' : 'After'\n      data.hidden = true\n    }\n    if (\n      doesHaveValue(testStep.stepDefinitionIds) &&\n      testStep.stepDefinitionIds.length === 1\n    ) {\n      const stepDefinition = this.supportCodeLibrary.stepDefinitions.find(\n        (s) => s.id === testStep.stepDefinitionIds[0]\n      )\n      data.match = { location: formatLocation(stepDefinition) }\n    }\n    const { message, status } = testStepResult\n    data.result = {\n      status: messages.TestStepResultStatus[status].toLowerCase(),\n    }\n    if (doesHaveValue(testStepResult.duration)) {\n      data.result.duration =\n        messages.TimeConversion.durationToMilliseconds(\n          testStepResult.duration\n        ) * 1000000\n    }\n    if (\n      status === messages.TestStepResultStatus.FAILED &&\n      doesHaveValue(message)\n    ) {\n      data.result.error_message = message\n    }\n    if (_.size(testStepAttachments) > 0) {\n      data.embeddings = testStepAttachments.map((attachment) => ({\n        data: attachment.body,\n        mime_type: attachment.mediaType,\n      }))\n    }\n    return data\n  }\n\n  getFeatureTags(feature: messages.Feature): IJsonTag[] {\n    return _.map(feature.tags, (tagData) => ({\n      name: tagData.name,\n      line: tagData.location.line,\n    }))\n  }\n\n  getScenarioTags({\n    feature,\n    pickle,\n    gherkinScenarioMap,\n  }: {\n    feature: messages.Feature\n    pickle: messages.Pickle\n    gherkinScenarioMap: Record<string, messages.Scenario>\n  }): IJsonTag[] {\n    const scenario = gherkinScenarioMap[pickle.astNodeIds[0]]\n\n    return pickle.tags.map(\n      (tagData: messages.PickleTag): IJsonTag =>\n        this.getScenarioTag(tagData, feature, scenario)\n    )\n  }\n\n  private getScenarioTag(\n    tagData: messages.PickleTag,\n    feature: messages.Feature,\n    scenario: messages.Scenario\n  ): IJsonTag {\n    const byAstNodeId = (tag: messages.Tag): Boolean =>\n      tag.id === tagData.astNodeId\n    const flatten = (\n      acc: messages.Tag[],\n      val: messages.Tag[]\n    ): messages.Tag[] => acc.concat(val)\n\n    const tag =\n      feature.tags.find(byAstNodeId) ||\n      scenario.tags.find(byAstNodeId) ||\n      scenario.examples\n        .map((e) => e.tags)\n        .reduce(flatten, [])\n        .find(byAstNodeId)\n\n    return {\n      name: tagData.name,\n      line: tag?.location?.line,\n    }\n  }\n}\n"]}

package/lib/formatter/message_formatter.js

@@ -7,7 +7,7 @@ const _1 = __importDefault(require("."));
 class MessageFormatter extends _1.default {
     constructor(options) {
         super(options);
-        options.eventBroadcaster.on('envelope', (envelope) => this.log(JSON.stringify(envelope.toJSON()) + '\n'));
+        options.eventBroadcaster.on('envelope', (envelope) => this.log(JSON.stringify(envelope) + '\n'));
     }
 }
 exports.default = MessageFormatter;

package/lib/formatter/message_formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"message_formatter.js","sourceRoot":"","sources":["../../src/formatter/message_formatter.ts"],"names":[],"mappings":";;;;;AAAA,yCAAgD;AAGhD,MAAqB,gBAAiB,SAAQ,UAAS;IACrD,YAAY,OAA0B;QACpC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAA2B,EAAE,EAAE,CACtE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CACnD,CAAA;IACH,CAAC;CACF;AAPD,mCAOC"}
+{"version":3,"file":"message_formatter.js","sourceRoot":"","sources":["../../src/formatter/message_formatter.ts"],"names":[],"mappings":";;;;;AAAA,yCAAgD;AAGhD,MAAqB,gBAAiB,SAAQ,UAAS;IACrD,YAAY,OAA0B;QACpC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAA2B,EAAE,EAAE,CACtE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAC1C,CAAA;IACH,CAAC;CACF;AAPD,mCAOC","sourcesContent":["import Formatter, { IFormatterOptions } from '.'\nimport * as messages from '@cucumber/messages'\n\nexport default class MessageFormatter extends Formatter {\n  constructor(options: IFormatterOptions) {\n    super(options)\n    options.eventBroadcaster.on('envelope', (envelope: messages.Envelope) =>\n      this.log(JSON.stringify(envelope) + '\\n')\n    )\n  }\n}\n"]}

package/lib/formatter/progress_bar_formatter.d.ts

@@ -1,6 +1,6 @@
 import Formatter, { IFormatterOptions } from './';
 import ProgressBar from 'progress';
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 export default class ProgressBarFormatter extends Formatter {
     private numberOfSteps;
     private testRunStarted;
@@ -9,9 +9,9 @@ export default class ProgressBarFormatter extends Formatter {
     constructor(options: IFormatterOptions);
     incrementStepCount(pickleId: string): void;
     initializeProgressBar(): void;
-    logProgress({ testStepId, testCaseStartedId, }: messages.ITestStepFinished): void;
-    logUndefinedParametertype(parameterType: messages.IUndefinedParameterType): void;
-    logErrorIfNeeded(testCaseFinished: messages.ITestCaseFinished): void;
-    logSummary(testRunFinished: messages.ITestRunFinished): void;
-    parseEnvelope(envelope: messages.IEnvelope): void;
+    logProgress({ testStepId, testCaseStartedId, }: messages.TestStepFinished): void;
+    logUndefinedParametertype(parameterType: messages.UndefinedParameterType): void;
+    logErrorIfNeeded(testCaseFinished: messages.TestCaseFinished): void;
+    logSummary(testRunFinished: messages.TestRunFinished): void;
+    parseEnvelope(envelope: messages.Envelope): void;
 }

package/lib/formatter/progress_bar_formatter.js

@@ -36,7 +36,7 @@ class ProgressBarFormatter extends _1.default {
     logProgress({ testStepId, testCaseStartedId, }) {
         const { testCase } = this.eventDataCollector.getTestCaseAttempt(testCaseStartedId);
         const testStep = testCase.testSteps.find((s) => s.id === testStepId);
-        if (testStep.pickleStepId !== '') {
+        if (value_checker_1.doesHaveValue(testStep.pickleStepId)) {
             this.progressBar.tick();
         }
     }
@@ -74,8 +74,8 @@ class ProgressBarFormatter extends _1.default {
         if (value_checker_1.doesHaveValue(envelope.undefinedParameterType)) {
             this.logUndefinedParametertype(envelope.undefinedParameterType);
         }
-        else if (value_checker_1.doesHaveValue(envelope.pickle)) {
-            this.incrementStepCount(envelope.pickle.id);
+        else if (value_checker_1.doesHaveValue(envelope.testCase)) {
+            this.incrementStepCount(envelope.testCase.pickleId);
         }
         else if (value_checker_1.doesHaveValue(envelope.testStepStarted)) {
             this.initializeProgressBar();

package/lib/formatter/progress_bar_formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress_bar_formatter.js","sourceRoot":"","sources":["../../src/formatter/progress_bar_formatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"progress_bar_formatter.js","sourceRoot":"","sources":["../../src/formatter/progress_bar_formatter.ts"],"names":[],"mappings":"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","sourcesContent":["import { formatIssue, formatSummary, isIssue } from './helpers'\nimport Formatter, { IFormatterOptions } from './'\nimport ProgressBar from 'progress'\nimport { WriteStream as TtyWriteStream } from 'tty'\nimport * as messages from '@cucumber/messages'\nimport { doesHaveValue, valueOrDefault } from '../value_checker'\nimport { formatUndefinedParameterType } from './helpers/issue_helpers'\nimport { durationBetweenTimestamps } from '../time'\n\n// Inspired by https://github.com/thekompanee/fuubar and https://github.com/martinciu/fuubar-cucumber\nexport default class ProgressBarFormatter extends Formatter {\n  private numberOfSteps: number\n  private testRunStarted: messages.TestRunStarted\n  private issueCount: number\n  public progressBar: ProgressBar\n\n  constructor(options: IFormatterOptions) {\n    super(options)\n    options.eventBroadcaster.on('envelope', this.parseEnvelope.bind(this))\n    this.numberOfSteps = 0\n    this.issueCount = 0\n  }\n\n  incrementStepCount(pickleId: string): void {\n    const pickle = this.eventDataCollector.getPickle(pickleId)\n    this.numberOfSteps += pickle.steps.length\n  }\n\n  initializeProgressBar(): void {\n    if (doesHaveValue(this.progressBar)) {\n      return\n    }\n    this.progressBar = new ProgressBar(':current/:total steps [:bar] ', {\n      clear: true,\n      incomplete: ' ',\n      stream: this.stream,\n      total: this.numberOfSteps,\n      width: valueOrDefault((this.stream as TtyWriteStream).columns, 80),\n    })\n  }\n\n  logProgress({\n    testStepId,\n    testCaseStartedId,\n  }: messages.TestStepFinished): void {\n    const { testCase } =\n      this.eventDataCollector.getTestCaseAttempt(testCaseStartedId)\n    const testStep = testCase.testSteps.find((s) => s.id === testStepId)\n    if (doesHaveValue(testStep.pickleStepId)) {\n      this.progressBar.tick()\n    }\n  }\n\n  logUndefinedParametertype(\n    parameterType: messages.UndefinedParameterType\n  ): void {\n    this.log(\n      `Undefined parameter type: ${formatUndefinedParameterType(\n        parameterType\n      )}\\n`\n    )\n  }\n\n  logErrorIfNeeded(testCaseFinished: messages.TestCaseFinished): void {\n    const { worstTestStepResult } = this.eventDataCollector.getTestCaseAttempt(\n      testCaseFinished.testCaseStartedId\n    )\n    if (isIssue(worstTestStepResult)) {\n      this.issueCount += 1\n      const testCaseAttempt = this.eventDataCollector.getTestCaseAttempt(\n        testCaseFinished.testCaseStartedId\n      )\n      this.progressBar.interrupt(\n        formatIssue({\n          colorFns: this.colorFns,\n          cwd: this.cwd,\n          number: this.issueCount,\n          snippetBuilder: this.snippetBuilder,\n          supportCodeLibrary: this.supportCodeLibrary,\n          testCaseAttempt,\n        })\n      )\n      if (worstTestStepResult.willBeRetried) {\n        const stepsToRetry = testCaseAttempt.pickle.steps.length\n        this.progressBar.tick(-stepsToRetry)\n      }\n    }\n  }\n\n  logSummary(testRunFinished: messages.TestRunFinished): void {\n    const testRunDuration = durationBetweenTimestamps(\n      this.testRunStarted.timestamp,\n      testRunFinished.timestamp\n    )\n    this.log(\n      formatSummary({\n        colorFns: this.colorFns,\n        testCaseAttempts: this.eventDataCollector.getTestCaseAttempts(),\n        testRunDuration,\n      })\n    )\n  }\n\n  parseEnvelope(envelope: messages.Envelope): void {\n    if (doesHaveValue(envelope.undefinedParameterType)) {\n      this.logUndefinedParametertype(envelope.undefinedParameterType)\n    } else if (doesHaveValue(envelope.testCase)) {\n      this.incrementStepCount(envelope.testCase.pickleId)\n    } else if (doesHaveValue(envelope.testStepStarted)) {\n      this.initializeProgressBar()\n    } else if (doesHaveValue(envelope.testStepFinished)) {\n      this.logProgress(envelope.testStepFinished)\n    } else if (doesHaveValue(envelope.testCaseFinished)) {\n      this.logErrorIfNeeded(envelope.testCaseFinished)\n    } else if (doesHaveValue(envelope.testRunStarted)) {\n      this.testRunStarted = envelope.testRunStarted\n    } else if (doesHaveValue(envelope.testRunFinished)) {\n      this.logSummary(envelope.testRunFinished)\n    }\n  }\n}\n"]}

package/lib/formatter/progress_formatter.d.ts

@@ -1,7 +1,7 @@
 import SummaryFormatter from './summary_formatter';
 import { IFormatterOptions } from './index';
-import { messages } from '@cucumber/messages';
-import ITestStepFinished = messages.ITestStepFinished;
+import * as messages from '@cucumber/messages';
+import ITestStepFinished = messages.TestStepFinished;
 export default class ProgressFormatter extends SummaryFormatter {
     constructor(options: IFormatterOptions);
     logProgress({ testStepResult: { status } }: ITestStepFinished): void;

package/lib/formatter/progress_formatter.js

@@ -1,19 +1,38 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const summary_formatter_1 = __importDefault(require("./summary_formatter"));
-const status_1 = __importDefault(require("../status"));
 const value_checker_1 = require("../value_checker");
-const STATUS_CHARACTER_MAPPING = {
-    [status_1.default.AMBIGUOUS]: 'A',
-    [status_1.default.FAILED]: 'F',
-    [status_1.default.PASSED]: '.',
-    [status_1.default.PENDING]: 'P',
-    [status_1.default.SKIPPED]: '-',
-    [status_1.default.UNDEFINED]: 'U',
-};
+const messages = __importStar(require("@cucumber/messages"));
+const STATUS_CHARACTER_MAPPING = new Map([
+    [messages.TestStepResultStatus.AMBIGUOUS, 'A'],
+    [messages.TestStepResultStatus.FAILED, 'F'],
+    [messages.TestStepResultStatus.PASSED, '.'],
+    [messages.TestStepResultStatus.PENDING, 'P'],
+    [messages.TestStepResultStatus.SKIPPED, '-'],
+    [messages.TestStepResultStatus.UNDEFINED, 'U'],
+]);
 class ProgressFormatter extends summary_formatter_1.default {
     constructor(options) {
         options.eventBroadcaster.on('envelope', (envelope) => {
@@ -27,7 +46,7 @@ class ProgressFormatter extends summary_formatter_1.default {
         super(options);
     }
     logProgress({ testStepResult: { status } }) {
-        const character = this.colorFns.forStatus(status)(STATUS_CHARACTER_MAPPING[status]);
+        const character = this.colorFns.forStatus(status)(STATUS_CHARACTER_MAPPING.get(status));
         this.log(character);
     }
 }