@cucumber/cucumber 7.2.1 → 8.0.0-rc.1

package/lib/formatter/helpers/usage_helpers/index.js

@@ -1,26 +1,28 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsage = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const pickle_parser_1 = require("../pickle_parser");
-const path_1 = __importDefault(require("path"));
 const gherkin_document_parser_1 = require("../gherkin_document_parser");
-const time_1 = require("../../../time");
-const messages_1 = require("@cucumber/messages");
+const messages = __importStar(require("@cucumber/messages"));
 const value_checker_1 = require("../../../value_checker");
 function buildEmptyMapping(stepDefinitions) {
     const mapping = {};
@@ -36,13 +38,18 @@ function buildEmptyMapping(stepDefinitions) {
     });
     return mapping;
 }
+const unexecutedStatuses = [
+    messages.TestStepResultStatus.AMBIGUOUS,
+    messages.TestStepResultStatus.SKIPPED,
+    messages.TestStepResultStatus.UNDEFINED,
+];
 function buildMapping({ cwd, stepDefinitions, eventDataCollector, }) {
     const mapping = buildEmptyMapping(stepDefinitions);
-    lodash_1.default.each(eventDataCollector.getTestCaseAttempts(), (testCaseAttempt) => {
+    eventDataCollector.getTestCaseAttempts().forEach((testCaseAttempt) => {
         const pickleStepMap = pickle_parser_1.getPickleStepMap(testCaseAttempt.pickle);
         const gherkinStepMap = gherkin_document_parser_1.getGherkinStepMap(testCaseAttempt.gherkinDocument);
         testCaseAttempt.testCase.testSteps.forEach((testStep) => {
-            if (testStep.pickleStepId !== '' &&
+            if (value_checker_1.doesHaveValue(testStep.pickleStepId) &&
                 testStep.stepDefinitionIds.length === 1) {
                 const stepDefinitionId = testStep.stepDefinitionIds[0];
                 const pickleStep = pickleStepMap[testStep.pickleStepId];
@@ -50,15 +57,10 @@ function buildMapping({ cwd, stepDefinitions, eventDataCollector, }) {
                 const match = {
                     line: gherkinStep.location.line,
                     text: pickleStep.text,
-                    uri: path_1.default.relative(cwd, testCaseAttempt.pickle.uri),
+                    uri: testCaseAttempt.pickle.uri,
                 };
                 const { duration, status } = testCaseAttempt.stepResults[testStep.id];
-                if (![
-                    messages_1.messages.TestStepFinished.TestStepResult.Status.AMBIGUOUS,
-                    messages_1.messages.TestStepFinished.TestStepResult.Status.SKIPPED,
-                    messages_1.messages.TestStepFinished.TestStepResult.Status.UNDEFINED,
-                ].includes(status) &&
-                    value_checker_1.doesHaveValue(duration)) {
+                if (!unexecutedStatuses.includes(status) && value_checker_1.doesHaveValue(duration)) {
                     match.duration = duration;
                 }
                 if (value_checker_1.doesHaveValue(mapping[stepDefinitionId])) {
@@ -69,32 +71,33 @@ function buildMapping({ cwd, stepDefinitions, eventDataCollector, }) {
     });
     return mapping;
 }
-function invertDuration(duration) {
-    if (value_checker_1.doesHaveValue(duration)) {
-        return -1 * time_1.durationToMilliseconds(duration);
+function normalizeDuration(duration) {
+    if (duration == null) {
+        return Number.MIN_SAFE_INTEGER;
     }
-    return 1;
+    return messages.TimeConversion.durationToMilliseconds(duration);
 }
 function buildResult(mapping) {
-    return lodash_1.default.chain(mapping)
-        .map((_a) => {
-        var { matches } = _a, rest = __rest(_a, ["matches"]);
-        const sortedMatches = lodash_1.default.sortBy(matches, [
-            (match) => invertDuration(match.duration),
-            'text',
-        ]);
-        const result = Object.assign({ matches: sortedMatches }, rest);
-        const durations = lodash_1.default.chain(matches)
-            .map((m) => m.duration)
-            .compact()
-            .value();
+    return Object.keys(mapping)
+        .map((stepDefinitionId) => {
+        const { matches, ...rest } = mapping[stepDefinitionId];
+        const sortedMatches = matches.sort((a, b) => {
+            if (a.duration === b.duration) {
+                return a.text < b.text ? -1 : 1;
+            }
+            return normalizeDuration(b.duration) - normalizeDuration(a.duration);
+        });
+        const result = { matches: sortedMatches, ...rest };
+        const durations = matches
+            .filter((m) => m.duration != null)
+            .map((m) => m.duration);
         if (durations.length > 0) {
-            result.meanDuration = time_1.millisecondsToDuration(lodash_1.default.meanBy(durations, (d) => time_1.durationToMilliseconds(d)));
+            const totalMilliseconds = durations.reduce((acc, x) => acc + messages.TimeConversion.durationToMilliseconds(x), 0);
+            result.meanDuration = messages.TimeConversion.millisecondsToDuration(totalMilliseconds / durations.length);
         }
         return result;
     })
-        .sortBy((usage) => invertDuration(usage.meanDuration))
-        .value();
+        .sort((a, b) => normalizeDuration(b.meanDuration) - normalizeDuration(a.meanDuration));
 }
 function getUsage({ cwd, stepDefinitions, eventDataCollector, }) {
     const mapping = buildMapping({ cwd, stepDefinitions, eventDataCollector });

package/lib/formatter/helpers/usage_helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/formatter/helpers/usage_helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAsC;AACtC,oDAAmD;AACnD,gDAAuB;AACvB,wEAA8D;AAC9D,wCAA8E;AAC9E,iDAA6C;AAE7C,0DAAsD;AA0BtD,SAAS,iBAAiB,CACxB,eAAiC;IAEjC,MAAM,OAAO,GAAuB,EAAE,CAAA;IACtC,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;QACzC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG;YAC3B,IAAI,EAAE,cAAc,CAAC,aAAa,CAAC,QAAQ,EAAE;YAC7C,IAAI,EAAE,cAAc,CAAC,IAAI;YACzB,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,MAAM;YACzC,WAAW,EAAE,cAAc,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI;YACvD,OAAO,EAAE,EAAE;YACX,GAAG,EAAE,cAAc,CAAC,GAAG;SACxB,CAAA;IACH,CAAC,CAAC,CAAA;IACF,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,YAAY,CAAC,EACpB,GAAG,EACH,eAAe,EACf,kBAAkB,GACD;IACjB,MAAM,OAAO,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAA;IAClD,gBAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,EAAE,CAAC,eAAe,EAAE,EAAE;QACnE,MAAM,aAAa,GAAG,gCAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QAC9D,MAAM,cAAc,GAAG,2CAAiB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;QACzE,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACtD,IACE,QAAQ,CAAC,YAAY,KAAK,EAAE;gBAC5B,QAAQ,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EACvC;gBACA,MAAM,gBAAgB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBACtD,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;gBACvD,MAAM,WAAW,GAAG,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC5D,MAAM,KAAK,GAAgB;oBACzB,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;oBAC/B,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,GAAG,EAAE,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC;iBACpD,CAAA;gBACD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;gBACrE,IACE,CAAC;oBACC,mBAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS;oBACzD,mBAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO;oBACvD,mBAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS;iBAC1D,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAClB,6BAAa,CAAC,QAAQ,CAAC,EACvB;oBACA,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAA;iBAC1B;gBACD,IAAI,6BAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,EAAE;oBAC5C,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;iBAC9C;aACF;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,QAA4B;IAClD,IAAI,6BAAa,CAAC,QAAQ,CAAC,EAAE;QAC3B,OAAO,CAAC,CAAC,GAAG,6BAAsB,CAAC,QAAQ,CAAC,CAAA;KAC7C;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAED,SAAS,WAAW,CAAC,OAA2B;IAC9C,OAAO,gBAAC,CAAC,KAAK,CAAC,OAAO,CAAC;SACpB,GAAG,CAAC,CAAC,EAA4B,EAAE,EAAE;YAAhC,EAAE,OAAO,OAAmB,EAAd,IAAI,cAAlB,WAAoB,CAAF;QACtB,MAAM,aAAa,GAAG,gBAAC,CAAC,MAAM,CAAC,OAAO,EAAE;YACtC,CAAC,KAAkB,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC;YACtD,MAAM;SACP,CAAC,CAAA;QACF,MAAM,MAAM,mBAAK,OAAO,EAAE,aAAa,IAAK,IAAI,CAAE,CAAA;QAClD,MAAM,SAAS,GAAyB,gBAAC,CAAC,KAAK,CAAC,OAAO,CAAC;aACrD,GAAG,CAAC,CAAC,CAAc,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aACnC,OAAO,EAAE;aACT,KAAK,EAAE,CAAA;QACV,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,MAAM,CAAC,YAAY,GAAG,6BAAsB,CAC1C,gBAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAqB,EAAE,EAAE,CAC5C,6BAAsB,CAAC,CAAC,CAAC,CAC1B,CACF,CAAA;SACF;QACD,OAAO,MAAM,CAAA;IACf,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC7D,KAAK,EAAE,CAAA;AACZ,CAAC;AAED,SAAgB,QAAQ,CAAC,EACvB,GAAG,EACH,eAAe,EACf,kBAAkB,GACD;IACjB,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,kBAAkB,EAAE,CAAC,CAAA;IAC1E,OAAO,WAAW,CAAC,OAAO,CAAC,CAAA;AAC7B,CAAC;AAPD,4BAOC","sourcesContent":["import _, { Dictionary } from 'lodash'\nimport { getPickleStepMap } from '../pickle_parser'\nimport path from 'path'\nimport { getGherkinStepMap } from '../gherkin_document_parser'\nimport { durationToMilliseconds, millisecondsToDuration } from '../../../time'\nimport { messages } from '@cucumber/messages'\nimport StepDefinition from '../../../models/step_definition'\nimport { doesHaveValue } from '../../../value_checker'\nimport EventDataCollector from '../event_data_collector'\n\nexport interface IUsageMatch {\n  duration?: messages.IDuration\n  line: number\n  text: string\n  uri: string\n}\n\nexport interface IUsage {\n  code: string\n  line: number\n  matches: IUsageMatch[]\n  meanDuration?: messages.IDuration\n  pattern: string\n  patternType: string\n  uri: string\n}\n\nexport interface IGetUsageRequest {\n  cwd: string\n  eventDataCollector: EventDataCollector\n  stepDefinitions: StepDefinition[]\n}\n\nfunction buildEmptyMapping(\n  stepDefinitions: StepDefinition[]\n): Dictionary<IUsage> {\n  const mapping: Dictionary<IUsage> = {}\n  stepDefinitions.forEach((stepDefinition) => {\n    mapping[stepDefinition.id] = {\n      code: stepDefinition.unwrappedCode.toString(),\n      line: stepDefinition.line,\n      pattern: stepDefinition.expression.source,\n      patternType: stepDefinition.expression.constructor.name,\n      matches: [],\n      uri: stepDefinition.uri,\n    }\n  })\n  return mapping\n}\n\nfunction buildMapping({\n  cwd,\n  stepDefinitions,\n  eventDataCollector,\n}: IGetUsageRequest): Dictionary<IUsage> {\n  const mapping = buildEmptyMapping(stepDefinitions)\n  _.each(eventDataCollector.getTestCaseAttempts(), (testCaseAttempt) => {\n    const pickleStepMap = getPickleStepMap(testCaseAttempt.pickle)\n    const gherkinStepMap = getGherkinStepMap(testCaseAttempt.gherkinDocument)\n    testCaseAttempt.testCase.testSteps.forEach((testStep) => {\n      if (\n        testStep.pickleStepId !== '' &&\n        testStep.stepDefinitionIds.length === 1\n      ) {\n        const stepDefinitionId = testStep.stepDefinitionIds[0]\n        const pickleStep = pickleStepMap[testStep.pickleStepId]\n        const gherkinStep = gherkinStepMap[pickleStep.astNodeIds[0]]\n        const match: IUsageMatch = {\n          line: gherkinStep.location.line,\n          text: pickleStep.text,\n          uri: path.relative(cwd, testCaseAttempt.pickle.uri),\n        }\n        const { duration, status } = testCaseAttempt.stepResults[testStep.id]\n        if (\n          ![\n            messages.TestStepFinished.TestStepResult.Status.AMBIGUOUS,\n            messages.TestStepFinished.TestStepResult.Status.SKIPPED,\n            messages.TestStepFinished.TestStepResult.Status.UNDEFINED,\n          ].includes(status) &&\n          doesHaveValue(duration)\n        ) {\n          match.duration = duration\n        }\n        if (doesHaveValue(mapping[stepDefinitionId])) {\n          mapping[stepDefinitionId].matches.push(match)\n        }\n      }\n    })\n  })\n  return mapping\n}\n\nfunction invertDuration(duration: messages.IDuration): number {\n  if (doesHaveValue(duration)) {\n    return -1 * durationToMilliseconds(duration)\n  }\n  return 1\n}\n\nfunction buildResult(mapping: Dictionary<IUsage>): IUsage[] {\n  return _.chain(mapping)\n    .map(({ matches, ...rest }: IUsage) => {\n      const sortedMatches = _.sortBy(matches, [\n        (match: IUsageMatch) => invertDuration(match.duration),\n        'text',\n      ])\n      const result = { matches: sortedMatches, ...rest }\n      const durations: messages.IDuration[] = _.chain(matches)\n        .map((m: IUsageMatch) => m.duration)\n        .compact()\n        .value()\n      if (durations.length > 0) {\n        result.meanDuration = millisecondsToDuration(\n          _.meanBy(durations, (d: messages.IDuration) =>\n            durationToMilliseconds(d)\n          )\n        )\n      }\n      return result\n    })\n    .sortBy((usage: IUsage) => invertDuration(usage.meanDuration))\n    .value()\n}\n\nexport function getUsage({\n  cwd,\n  stepDefinitions,\n  eventDataCollector,\n}: IGetUsageRequest): IUsage[] {\n  const mapping = buildMapping({ cwd, stepDefinitions, eventDataCollector })\n  return buildResult(mapping)\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/formatter/helpers/usage_helpers/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPickleStepMap } from '../pickle_parser'\nimport { getGherkinStepMap } from '../gherkin_document_parser'\nimport * as messages from '@cucumber/messages'\nimport StepDefinition from '../../../models/step_definition'\nimport { doesHaveValue } from '../../../value_checker'\nimport EventDataCollector from '../event_data_collector'\n\nexport interface IUsageMatch {\n  duration?: messages.Duration\n  line: number\n  text: string\n  uri: string\n}\n\nexport interface IUsage {\n  code: string\n  line: number\n  matches: IUsageMatch[]\n  meanDuration?: messages.Duration\n  pattern: string\n  patternType: string\n  uri: string\n}\n\nexport interface IGetUsageRequest {\n  cwd: string\n  eventDataCollector: EventDataCollector\n  stepDefinitions: StepDefinition[]\n}\n\nfunction buildEmptyMapping(\n  stepDefinitions: StepDefinition[]\n): Record<string, IUsage> {\n  const mapping: Record<string, IUsage> = {}\n  stepDefinitions.forEach((stepDefinition) => {\n    mapping[stepDefinition.id] = {\n      code: stepDefinition.unwrappedCode.toString(),\n      line: stepDefinition.line,\n      pattern: stepDefinition.expression.source,\n      patternType: stepDefinition.expression.constructor.name,\n      matches: [],\n      uri: stepDefinition.uri,\n    }\n  })\n  return mapping\n}\n\nconst unexecutedStatuses: readonly messages.TestStepResultStatus[] = [\n  messages.TestStepResultStatus.AMBIGUOUS,\n  messages.TestStepResultStatus.SKIPPED,\n  messages.TestStepResultStatus.UNDEFINED,\n]\n\nfunction buildMapping({\n  cwd,\n  stepDefinitions,\n  eventDataCollector,\n}: IGetUsageRequest): Record<string, IUsage> {\n  const mapping = buildEmptyMapping(stepDefinitions)\n  eventDataCollector.getTestCaseAttempts().forEach((testCaseAttempt) => {\n    const pickleStepMap = getPickleStepMap(testCaseAttempt.pickle)\n    const gherkinStepMap = getGherkinStepMap(testCaseAttempt.gherkinDocument)\n    testCaseAttempt.testCase.testSteps.forEach((testStep) => {\n      if (\n        doesHaveValue(testStep.pickleStepId) &&\n        testStep.stepDefinitionIds.length === 1\n      ) {\n        const stepDefinitionId = testStep.stepDefinitionIds[0]\n        const pickleStep = pickleStepMap[testStep.pickleStepId]\n        const gherkinStep = gherkinStepMap[pickleStep.astNodeIds[0]]\n        const match: IUsageMatch = {\n          line: gherkinStep.location.line,\n          text: pickleStep.text,\n          uri: testCaseAttempt.pickle.uri,\n        }\n        const { duration, status } = testCaseAttempt.stepResults[testStep.id]\n        if (!unexecutedStatuses.includes(status) && doesHaveValue(duration)) {\n          match.duration = duration\n        }\n        if (doesHaveValue(mapping[stepDefinitionId])) {\n          mapping[stepDefinitionId].matches.push(match)\n        }\n      }\n    })\n  })\n  return mapping\n}\n\nfunction normalizeDuration(duration?: messages.Duration): number {\n  if (duration == null) {\n    return Number.MIN_SAFE_INTEGER\n  }\n  return messages.TimeConversion.durationToMilliseconds(duration)\n}\n\nfunction buildResult(mapping: Record<string, IUsage>): IUsage[] {\n  return Object.keys(mapping)\n    .map((stepDefinitionId) => {\n      const { matches, ...rest } = mapping[stepDefinitionId]\n      const sortedMatches = matches.sort((a: IUsageMatch, b: IUsageMatch) => {\n        if (a.duration === b.duration) {\n          return a.text < b.text ? -1 : 1\n        }\n        return normalizeDuration(b.duration) - normalizeDuration(a.duration)\n      })\n      const result = { matches: sortedMatches, ...rest }\n      const durations: messages.Duration[] = matches\n        .filter((m) => m.duration != null)\n        .map((m) => m.duration)\n      if (durations.length > 0) {\n        const totalMilliseconds = durations.reduce(\n          (acc, x) => acc + messages.TimeConversion.durationToMilliseconds(x),\n          0\n        )\n        result.meanDuration = messages.TimeConversion.millisecondsToDuration(\n          totalMilliseconds / durations.length\n        )\n      }\n      return result\n    })\n    .sort(\n      (a: IUsage, b: IUsage) =>\n        normalizeDuration(b.meanDuration) - normalizeDuration(a.meanDuration)\n    )\n}\n\nexport function getUsage({\n  cwd,\n  stepDefinitions,\n  eventDataCollector,\n}: IGetUsageRequest): IUsage[] {\n  const mapping = buildMapping({ cwd, stepDefinitions, eventDataCollector })\n  return buildResult(mapping)\n}\n"]}

package/lib/formatter/html_formatter.d.ts

@@ -1,6 +1,7 @@
 import Formatter, { IFormatterOptions } from '.';
 export default class HtmlFormatter extends Formatter {
     private readonly _finished;
+    static readonly documentation: string;
     constructor(options: IFormatterOptions);
     finished(): Promise<void>;
 }

package/lib/formatter/html_formatter.js

@@ -13,7 +13,7 @@ class HtmlFormatter extends _1.default {
     constructor(options) {
         super(options);
         const cucumberHtmlStream = new html_formatter_1.default(resolve_pkg_1.default('@cucumber/html-formatter', { cwd: __dirname }) +
-            '/dist/cucumber-react.css', resolve_pkg_1.default('@cucumber/html-formatter', { cwd: __dirname }) +
+            '/dist/main.css', resolve_pkg_1.default('@cucumber/html-formatter', { cwd: __dirname }) +
             '/dist/main.js');
         options.eventBroadcaster.on('envelope', (envelope) => {
             cucumberHtmlStream.write(envelope);
@@ -30,4 +30,5 @@ class HtmlFormatter extends _1.default {
     }
 }
 exports.default = HtmlFormatter;
+HtmlFormatter.documentation = 'Outputs HTML report';
 //# sourceMappingURL=html_formatter.js.map

package/lib/formatter/html_formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"html_formatter.js","sourceRoot":"","sources":["../../src/formatter/html_formatter.ts"],"names":[],"mappings":";;;;;AAAA,yCAAgD;AAEhD,8DAAoC;AACpC,8EAAyD;AACzD,oDAAgD;AAChD,mCAAiC;AACjC,+BAAgC;AAEhC,MAAqB,aAAc,SAAQ,UAAS;IAGlD,YAAY,OAA0B;QACpC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,MAAM,kBAAkB,GAAG,IAAI,wBAAkB,CAC/C,qBAAU,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;YACxD,0BAA0B,EAC5B,qBAAU,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;YACxD,eAAe,CAClB,CAAA;QACD,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAA2B,EAAE,EAAE;YACtE,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAClC,IAAI,6BAAa,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;gBAC3C,kBAAkB,CAAC,GAAG,EAAE,CAAA;aACzB;QACH,CAAC,CAAC,CAAA;QACF,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;QACzD,IAAI,CAAC,SAAS,GAAG,gBAAS,CAAC,iBAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,SAAS,CAAA;QACpB,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAA;IACxB,CAAC;CACF;AAzBD,gCAyBC","sourcesContent":["import Formatter, { IFormatterOptions } from '.'\nimport { messages } from '@cucumber/messages'\nimport resolvePkg from 'resolve-pkg'\nimport CucumberHtmlStream from '@cucumber/html-formatter'\nimport { doesHaveValue } from '../value_checker'\nimport { finished } from 'stream'\nimport { promisify } from 'util'\n\nexport default class HtmlFormatter extends Formatter {\n  private readonly _finished: Promise<void>\n\n  constructor(options: IFormatterOptions) {\n    super(options)\n    const cucumberHtmlStream = new CucumberHtmlStream(\n      resolvePkg('@cucumber/html-formatter', { cwd: __dirname }) +\n        '/dist/cucumber-react.css',\n      resolvePkg('@cucumber/html-formatter', { cwd: __dirname }) +\n        '/dist/main.js'\n    )\n    options.eventBroadcaster.on('envelope', (envelope: messages.Envelope) => {\n      cucumberHtmlStream.write(envelope)\n      if (doesHaveValue(envelope.testRunFinished)) {\n        cucumberHtmlStream.end()\n      }\n    })\n    cucumberHtmlStream.on('data', (chunk) => this.log(chunk))\n    this._finished = promisify(finished)(cucumberHtmlStream)\n  }\n\n  async finished(): Promise<void> {\n    await this._finished\n    await super.finished()\n  }\n}\n"]}
+{"version":3,"file":"html_formatter.js","sourceRoot":"","sources":["../../src/formatter/html_formatter.ts"],"names":[],"mappings":";;;;;AAAA,yCAAgD;AAEhD,8DAAoC;AACpC,8EAAyD;AACzD,oDAAgD;AAChD,mCAAiC;AACjC,+BAAgC;AAEhC,MAAqB,aAAc,SAAQ,UAAS;IAIlD,YAAY,OAA0B;QACpC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,MAAM,kBAAkB,GAAG,IAAI,wBAAkB,CAC/C,qBAAU,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;YACxD,gBAAgB,EAClB,qBAAU,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;YACxD,eAAe,CAClB,CAAA;QACD,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAA2B,EAAE,EAAE;YACtE,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAClC,IAAI,6BAAa,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;gBAC3C,kBAAkB,CAAC,GAAG,EAAE,CAAA;aACzB;QACH,CAAC,CAAC,CAAA;QACF,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;QACzD,IAAI,CAAC,SAAS,GAAG,gBAAS,CAAC,iBAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,SAAS,CAAA;QACpB,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAA;IACxB,CAAC;;AAzBH,gCA0BC;AAxBwB,2BAAa,GAAW,qBAAqB,CAAA","sourcesContent":["import Formatter, { IFormatterOptions } from '.'\nimport * as messages from '@cucumber/messages'\nimport resolvePkg from 'resolve-pkg'\nimport CucumberHtmlStream from '@cucumber/html-formatter'\nimport { doesHaveValue } from '../value_checker'\nimport { finished } from 'stream'\nimport { promisify } from 'util'\n\nexport default class HtmlFormatter extends Formatter {\n  private readonly _finished: Promise<void>\n  public static readonly documentation: string = 'Outputs HTML report'\n\n  constructor(options: IFormatterOptions) {\n    super(options)\n    const cucumberHtmlStream = new CucumberHtmlStream(\n      resolvePkg('@cucumber/html-formatter', { cwd: __dirname }) +\n        '/dist/main.css',\n      resolvePkg('@cucumber/html-formatter', { cwd: __dirname }) +\n        '/dist/main.js'\n    )\n    options.eventBroadcaster.on('envelope', (envelope: messages.Envelope) => {\n      cucumberHtmlStream.write(envelope)\n      if (doesHaveValue(envelope.testRunFinished)) {\n        cucumberHtmlStream.end()\n      }\n    })\n    cucumberHtmlStream.on('data', (chunk) => this.log(chunk))\n    this._finished = promisify(finished)(cucumberHtmlStream)\n  }\n\n  async finished(): Promise<void> {\n    await this._finished\n    await super.finished()\n  }\n}\n"]}

package/lib/formatter/http_stream.js

@@ -86,7 +86,7 @@ class HttpStream extends stream_1.Transform {
         if (upload) {
             additionalHttpHeaders['Content-Length'] = fs_1.default.statSync(this.tempFilePath).size;
         }
-        const allHeaders = Object.assign(Object.assign({}, headers), additionalHttpHeaders);
+        const allHeaders = { ...headers, ...additionalHttpHeaders };
         const req = httpx.request(url, {
             method,
             headers: allHeaders,

package/lib/formatter/http_stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"http_stream.js","sourceRoot":"","sources":["../../src/formatter/http_stream.ts"],"names":[],"mappings":";;;;;AAAA,mCAAsD;AACtD,8CAAqB;AACrB,4CAAmB;AACnB,gDAAuB;AACvB,kDAAyB;AACzB,oDAAgD;AAIhD;;;;;;;;;GASG;AACH,MAAqB,UAAW,SAAQ,kBAAS;IAI/C,YACmB,GAAW,EACX,MAAkB,EAClB,OAAiC;QAElD,KAAK,CAAC;YACJ,kBAAkB,EAAE,IAAI;SACzB,CAAC,CAAA;QANe,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAY;QAClB,YAAO,GAAP,OAAO,CAA0B;IAKpD,CAAC;IAED,MAAM,CACJ,KAAU,EACV,QAAwB,EACxB,QAAsC;QAEtC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC/B,aAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;gBACzB,IAAI,6BAAa,CAAC,GAAG,CAAC;oBAAE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAA;gBAC5C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;gBACxB,IAAI,CAAC,QAAQ,GAAG,YAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;gBAClD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAChD,CAAC,CAAC,CAAA;SACH;aAAM;YACL,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;SAC/C;IACH,CAAC;IAED,MAAM,CAAC,QAAwC;QAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE;YACrB,IAAI,CAAC,eAAe,CAClB,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,OAAO,EACZ,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;gBACb,IAAI,6BAAa,CAAC,IAAI,CAAC;oBAAE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAC9C,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE;oBAC/B,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;oBACxD,IACE,IAAI,CAAC,UAAU,KAAK,GAAG;wBACvB,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,EACnC;wBACA,IAAI,CAAC,eAAe,CAClB,IAAI,CAAC,OAAO,CAAC,QAAQ,EACrB,KAAK,EACL,EAAE,EACF,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;4BACb,IAAI,6BAAa,CAAC,IAAI,CAAC;gCAAE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAA;4BAC9C,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;4BACxD,QAAQ,EAAE,CAAA;wBACZ,CAAC,CACF,CAAA;qBACF;yBAAM;wBACL,QAAQ,EAAE,CAAA;qBACX;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC,CACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,gBAAgB,CAAC,GAAyB,EAAE,IAAgB;QAClE,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC1B,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;QACF,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;YACjC,IAAI,EAAE,CAAA;QACR,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,sBAAsB,CAC5B,GAAyB,EACzB,GAAW,EACX,MAAc;QAEd,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG;YACvB,IAAI,CAAC,IAAI,CACP,OAAO,EACP,IAAI,KAAK,CACP,0BAA0B,GAAG,CAAC,UAAU,SAAS,MAAM,IAAI,GAAG,EAAE,CACjE,CACF,CAAA;IACL,CAAC;IAEO,eAAe,CACrB,GAAW,EACX,MAAkB,EAClB,OAAiC,EACjC,QAAkE;QAElE,MAAM,KAAK,GAAG,6BAAa,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,CAAC,CAAC,cAAI,CAAA;QAChE,MAAM,qBAAqB,GAA6B,EAAE,CAAA;QAE1D,MAAM,MAAM,GAAG,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM,CAAA;QACpD,IAAI,MAAM,EAAE;YACV,qBAAqB,CAAC,gBAAgB,CAAC,GAAG,YAAE,CAAC,QAAQ,CACnD,IAAI,CAAC,YAAY,CAClB,CAAC,IAAI,CAAA;SACP;QAED,MAAM,UAAU,mCAAQ,OAAO,GAAK,qBAAqB,CAAE,CAAA;QAC3D,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;YAC7B,MAAM;YACN,OAAO,EAAE,UAAU;SACpB,CAAC,CAAA;QACF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QACjD,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YACjD,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QACrB,CAAC,CAAC,CAAA;QAEF,IAAI,MAAM,EAAE;YACV,iBAAQ,CAAC,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC5D,IAAI,6BAAa,CAAC,GAAG,CAAC,EAAE;oBACtB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;iBACxB;YACH,CAAC,CAAC,CAAA;SACH;aAAM;YACL,GAAG,CAAC,GAAG,EAAE,CAAA;SACV;IACH,CAAC;CACF;AA9HD,6BA8HC","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"]}
+{"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.d.ts

@@ -33,6 +33,7 @@ export default class Formatter {
     protected stream: WritableStream;
     protected supportCodeLibrary: ISupportCodeLibrary;
     private readonly cleanup;
+    static readonly documentation: string;
     constructor(options: IFormatterOptions);
     finished(): Promise<void>;
 }

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","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"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formatter/index.ts"],"names":[],"mappings":";;AAgCA,MAAqB,SAAS;IAW5B,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;AAzBD,4BAyBC","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  static readonly documentation: string\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,44 @@ 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 {
+    static readonly documentation: string;
     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,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 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();
@@ -29,7 +44,9 @@ class JsonFormatter extends _1.default {
     }
     formatDataTable(dataTable) {
         return {
-            rows: dataTable.rows.map((row) => ({ cells: lodash_1.default.map(row.cells, 'value') })),
+            rows: dataTable.rows.map((row) => ({
+                cells: row.cells.map((x) => x.value),
+            })),
         };
     }
     formatDocString(docString, gherkinStep) {
@@ -51,16 +68,19 @@ class JsonFormatter extends _1.default {
     }
     onTestRunFinished() {
         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);
+        this.eventDataCollector
+            .getTestCaseAttempts()
+            .forEach((testCaseAttempt) => {
+            if (!testCaseAttempt.willBeRetried) {
+                const uri = testCaseAttempt.pickle.uri;
                 if (value_checker_1.doesNotHaveValue(groupedTestCaseAttempts[uri])) {
                     groupedTestCaseAttempts[uri] = [];
                 }
                 groupedTestCaseAttempts[uri].push(testCaseAttempt);
             }
         });
-        const features = lodash_1.default.map(groupedTestCaseAttempts, (group, uri) => {
+        const features = Object.keys(groupedTestCaseAttempts).map((uri) => {
+            const group = groupedTestCaseAttempts[uri];
             const { gherkinDocument } = group[0];
             const gherkinStepMap = getGherkinStepMap(gherkinDocument);
             const gherkinScenarioMap = getGherkinScenarioMap(gherkinDocument);
@@ -71,7 +91,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 +159,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,19 +170,24 @@ 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) {
+        if ((testStepAttachments === null || testStepAttachments === void 0 ? void 0 : testStepAttachments.length) > 0) {
             data.embeddings = testStepAttachments.map((attachment) => ({
                 data: attachment.body,
                 mime_type: attachment.mediaType,
@@ -171,24 +196,31 @@ class JsonFormatter extends _1.default {
         return data;
     }
     getFeatureTags(feature) {
-        return lodash_1.default.map(feature.tags, (tagData) => ({
+        return feature.tags.map((tagData) => ({
             name: tagData.name,
             line: tagData.location.line,
         }));
     }
     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;
+JsonFormatter.documentation = 'Prints the feature as JSON. The JSON format is in maintenance mode. Please consider using the message formatter with the standalone json-formatter (https://github.com/cucumber/cucumber/tree/master/json-formatter).';
 //# sourceMappingURL=json_formatter.js.map