@cucumber/cucumber 7.1.0 → 7.3.1

package/lib/formatter/helpers/test_case_attempt_formatter.js

@@ -1,32 +1,51 @@
 "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 });
 exports.formatTestCaseAttempt = void 0;
 const indent_string_1 = __importDefault(require("indent-string"));
-const status_1 = __importDefault(require("../../status"));
+const messages = __importStar(require("@cucumber/messages"));
 const figures_1 = __importDefault(require("figures"));
 const location_helpers_1 = require("./location_helpers");
 const test_case_attempt_parser_1 = require("./test_case_attempt_parser");
 const step_argument_formatter_1 = require("./step_argument_formatter");
 const value_checker_1 = require("../../value_checker");
-const CHARACTERS = {
-    [status_1.default.AMBIGUOUS]: figures_1.default.cross,
-    [status_1.default.FAILED]: figures_1.default.cross,
-    [status_1.default.PASSED]: figures_1.default.tick,
-    [status_1.default.PENDING]: '?',
-    [status_1.default.SKIPPED]: '-',
-    [status_1.default.UNDEFINED]: '?',
-};
+const CHARACTERS = new Map([
+    [messages.TestStepResultStatus.AMBIGUOUS, figures_1.default.cross],
+    [messages.TestStepResultStatus.FAILED, figures_1.default.cross],
+    [messages.TestStepResultStatus.PASSED, figures_1.default.tick],
+    [messages.TestStepResultStatus.PENDING, '?'],
+    [messages.TestStepResultStatus.SKIPPED, '-'],
+    [messages.TestStepResultStatus.UNDEFINED, '?'],
+]);
 function getStepMessage(testStep) {
     switch (testStep.result.status) {
-        case status_1.default.AMBIGUOUS:
-        case status_1.default.FAILED:
+        case messages.TestStepResultStatus.AMBIGUOUS:
+        case messages.TestStepResultStatus.FAILED:
             return testStep.result.message;
-        case status_1.default.UNDEFINED:
+        case messages.TestStepResultStatus.UNDEFINED:
             return `${'Undefined. Implement with the following snippet:' + '\n\n'}${indent_string_1.default(testStep.snippet, 2)}\n`;
-        case status_1.default.PENDING:
+        case messages.TestStepResultStatus.PENDING:
             return 'Pending';
     }
     return '';
@@ -35,7 +54,7 @@ function formatStep({ colorFns, testStep }) {
     const { result: { status }, actionLocation, attachments, } = testStep;
     const colorFn = colorFns.forStatus(status);
     const identifier = testStep.keyword + value_checker_1.valueOrDefault(testStep.text, '');
-    let text = colorFn(`${CHARACTERS[status]} ${identifier}`);
+    let text = colorFn(`${CHARACTERS.get(status)} ${identifier}`);
     if (value_checker_1.doesHaveValue(actionLocation)) {
         text += ` # ${colorFns.location(location_helpers_1.formatLocation(actionLocation))}`;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"test_case_attempt_formatter.js","sourceRoot":"","sources":["../../../src/formatter/helpers/test_case_attempt_formatter.ts"],"names":[],"mappings":"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","sourcesContent":["import indentString from 'indent-string'\nimport Status from '../../status'\nimport figures from 'figures'\nimport { formatLocation } from './location_helpers'\nimport {\n  IParsedTestStep,\n  parseTestCaseAttempt,\n} from './test_case_attempt_parser'\nimport { formatStepArgument } from './step_argument_formatter'\nimport { IColorFns } from '../get_color_fns'\nimport { doesHaveValue, valueOrDefault } from '../../value_checker'\nimport { ITestCaseAttempt } from './event_data_collector'\nimport StepDefinitionSnippetBuilder from '../step_definition_snippet_builder'\nimport { ISupportCodeLibrary } from '../../support_code_library_builder/types'\n\nconst CHARACTERS: { [status: number]: string } = {\n  [Status.AMBIGUOUS]: figures.cross,\n  [Status.FAILED]: figures.cross,\n  [Status.PASSED]: figures.tick,\n  [Status.PENDING]: '?',\n  [Status.SKIPPED]: '-',\n  [Status.UNDEFINED]: '?',\n}\n\nfunction getStepMessage(testStep: IParsedTestStep): string {\n  switch (testStep.result.status) {\n    case Status.AMBIGUOUS:\n    case Status.FAILED:\n      return testStep.result.message\n    case Status.UNDEFINED:\n      return `${\n        'Undefined. Implement with the following snippet:' + '\\n\\n'\n      }${indentString(testStep.snippet, 2)}\\n`\n    case Status.PENDING:\n      return 'Pending'\n  }\n  return ''\n}\n\ninterface IFormatStepRequest {\n  colorFns: IColorFns\n  testStep: IParsedTestStep\n}\n\nfunction formatStep({ colorFns, testStep }: IFormatStepRequest): string {\n  const {\n    result: { status },\n    actionLocation,\n    attachments,\n  } = testStep\n  const colorFn = colorFns.forStatus(status)\n  const identifier = testStep.keyword + valueOrDefault(testStep.text, '')\n  let text = colorFn(`${CHARACTERS[status]} ${identifier}`)\n  if (doesHaveValue(actionLocation)) {\n    text += ` # ${colorFns.location(formatLocation(actionLocation))}`\n  }\n  text += '\\n'\n  if (doesHaveValue(testStep.argument)) {\n    const argumentsText = formatStepArgument(testStep.argument)\n    text += indentString(`${colorFn(argumentsText)}\\n`, 4)\n  }\n  attachments.forEach(({ body, mediaType }) => {\n    const message = mediaType === 'text/plain' ? `: ${body}` : ''\n    text += indentString(`Attachment (${mediaType})${message}\\n`, 4)\n  })\n  const message = getStepMessage(testStep)\n  if (message !== '') {\n    text += `${indentString(colorFn(message), 4)}\\n`\n  }\n  return text\n}\n\nexport interface IFormatTestCaseAttemptRequest {\n  colorFns: IColorFns\n  cwd: string\n  testCaseAttempt: ITestCaseAttempt\n  snippetBuilder: StepDefinitionSnippetBuilder\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nexport function formatTestCaseAttempt({\n  colorFns,\n  cwd,\n  snippetBuilder,\n  supportCodeLibrary,\n  testCaseAttempt,\n}: IFormatTestCaseAttemptRequest): string {\n  const parsed = parseTestCaseAttempt({\n    cwd,\n    snippetBuilder,\n    testCaseAttempt,\n    supportCodeLibrary,\n  })\n  let text = `Scenario: ${parsed.testCase.name}`\n  text += getAttemptText(\n    parsed.testCase.attempt,\n    parsed.testCase.worstTestStepResult.willBeRetried\n  )\n  text += ` # ${colorFns.location(\n    formatLocation(parsed.testCase.sourceLocation)\n  )}\\n`\n  parsed.testSteps.forEach((testStep) => {\n    text += formatStep({ colorFns, testStep })\n  })\n  return `${text}\\n`\n}\n\nfunction getAttemptText(attempt: number, willBeRetried: boolean): string {\n  if (attempt > 0 || willBeRetried) {\n    const numberStr = (attempt + 1).toString()\n    const retriedStr = willBeRetried ? ', retried' : ''\n    return ` (attempt ${numberStr}${retriedStr})`\n  }\n  return ''\n}\n"]}
+{"version":3,"file":"test_case_attempt_formatter.js","sourceRoot":"","sources":["../../../src/formatter/helpers/test_case_attempt_formatter.ts"],"names":[],"mappings":"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","sourcesContent":["import indentString from 'indent-string'\nimport * as messages from '@cucumber/messages'\nimport figures from 'figures'\nimport { formatLocation } from './location_helpers'\nimport {\n  IParsedTestStep,\n  parseTestCaseAttempt,\n} from './test_case_attempt_parser'\nimport { formatStepArgument } from './step_argument_formatter'\nimport { IColorFns } from '../get_color_fns'\nimport { doesHaveValue, valueOrDefault } from '../../value_checker'\nimport { ITestCaseAttempt } from './event_data_collector'\nimport StepDefinitionSnippetBuilder from '../step_definition_snippet_builder'\nimport { ISupportCodeLibrary } from '../../support_code_library_builder/types'\n\nconst CHARACTERS: Map<messages.TestStepResultStatus, string> = new Map([\n  [messages.TestStepResultStatus.AMBIGUOUS, figures.cross],\n  [messages.TestStepResultStatus.FAILED, figures.cross],\n  [messages.TestStepResultStatus.PASSED, figures.tick],\n  [messages.TestStepResultStatus.PENDING, '?'],\n  [messages.TestStepResultStatus.SKIPPED, '-'],\n  [messages.TestStepResultStatus.UNDEFINED, '?'],\n])\n\nfunction getStepMessage(testStep: IParsedTestStep): string {\n  switch (testStep.result.status) {\n    case messages.TestStepResultStatus.AMBIGUOUS:\n    case messages.TestStepResultStatus.FAILED:\n      return testStep.result.message\n    case messages.TestStepResultStatus.UNDEFINED:\n      return `${\n        'Undefined. Implement with the following snippet:' + '\\n\\n'\n      }${indentString(testStep.snippet, 2)}\\n`\n    case messages.TestStepResultStatus.PENDING:\n      return 'Pending'\n  }\n  return ''\n}\n\ninterface IFormatStepRequest {\n  colorFns: IColorFns\n  testStep: IParsedTestStep\n}\n\nfunction formatStep({ colorFns, testStep }: IFormatStepRequest): string {\n  const {\n    result: { status },\n    actionLocation,\n    attachments,\n  } = testStep\n  const colorFn = colorFns.forStatus(status)\n  const identifier = testStep.keyword + valueOrDefault(testStep.text, '')\n  let text = colorFn(`${CHARACTERS.get(status)} ${identifier}`)\n  if (doesHaveValue(actionLocation)) {\n    text += ` # ${colorFns.location(formatLocation(actionLocation))}`\n  }\n  text += '\\n'\n  if (doesHaveValue(testStep.argument)) {\n    const argumentsText = formatStepArgument(testStep.argument)\n    text += indentString(`${colorFn(argumentsText)}\\n`, 4)\n  }\n  attachments.forEach(({ body, mediaType }) => {\n    const message = mediaType === 'text/plain' ? `: ${body}` : ''\n    text += indentString(`Attachment (${mediaType})${message}\\n`, 4)\n  })\n  const message = getStepMessage(testStep)\n  if (message !== '') {\n    text += `${indentString(colorFn(message), 4)}\\n`\n  }\n  return text\n}\n\nexport interface IFormatTestCaseAttemptRequest {\n  colorFns: IColorFns\n  cwd: string\n  testCaseAttempt: ITestCaseAttempt\n  snippetBuilder: StepDefinitionSnippetBuilder\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nexport function formatTestCaseAttempt({\n  colorFns,\n  cwd,\n  snippetBuilder,\n  supportCodeLibrary,\n  testCaseAttempt,\n}: IFormatTestCaseAttemptRequest): string {\n  const parsed = parseTestCaseAttempt({\n    cwd,\n    snippetBuilder,\n    testCaseAttempt,\n    supportCodeLibrary,\n  })\n  let text = `Scenario: ${parsed.testCase.name}`\n  text += getAttemptText(\n    parsed.testCase.attempt,\n    parsed.testCase.worstTestStepResult.willBeRetried\n  )\n  text += ` # ${colorFns.location(\n    formatLocation(parsed.testCase.sourceLocation)\n  )}\\n`\n  parsed.testSteps.forEach((testStep) => {\n    text += formatStep({ colorFns, testStep })\n  })\n  return `${text}\\n`\n}\n\nfunction getAttemptText(attempt: number, willBeRetried: boolean): string {\n  if (attempt > 0 || willBeRetried) {\n    const numberStr = (attempt + 1).toString()\n    const retriedStr = willBeRetried ? ', retried' : ''\n    return ` (attempt ${numberStr}${retriedStr})`\n  }\n  return ''\n}\n"]}

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

@@ -1,14 +1,14 @@
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { ITestCaseAttempt } from './event_data_collector';
 import StepDefinitionSnippetBuilder from '../step_definition_snippet_builder';
 import { ISupportCodeLibrary } from '../../support_code_library_builder/types';
 import { ILineAndUri } from '../../types';
 export interface IParsedTestStep {
     actionLocation?: ILineAndUri;
-    argument?: messages.IPickleStepArgument;
-    attachments: messages.IAttachment[];
+    argument?: messages.PickleStepArgument;
+    attachments: messages.Attachment[];
     keyword: string;
-    result: messages.TestStepFinished.ITestStepResult;
+    result: messages.TestStepResult;
     snippet?: string;
     sourceLocation?: ILineAndUri;
     text?: string;
@@ -17,7 +17,7 @@ export interface IParsedTestCase {
     attempt: number;
     name: string;
     sourceLocation?: ILineAndUri;
-    worstTestStepResult: messages.TestStepFinished.ITestStepResult;
+    worstTestStepResult: messages.TestStepResult;
 }
 export interface IParsedTestCaseAttempt {
     testCase: IParsedTestCase;

package/lib/formatter/helpers/test_case_attempt_parser.js

@@ -1,27 +1,45 @@
 "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 });
 exports.parseTestCaseAttempt = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const status_1 = __importDefault(require("../../status"));
 const keyword_type_1 = require("./keyword_type");
 const gherkin_document_parser_1 = require("./gherkin_document_parser");
 const pickle_parser_1 = require("./pickle_parser");
-const path_1 = __importDefault(require("path"));
+const messages = __importStar(require("@cucumber/messages"));
 const value_checker_1 = require("../../value_checker");
 function parseStep({ isBeforeHook, gherkinStepMap, keyword, keywordType, pickleStep, pickleUri, snippetBuilder, supportCodeLibrary, testStep, testStepResult, testStepAttachments, }) {
     const out = {
         attachments: testStepAttachments,
-        keyword: testStep.pickleStepId !== ''
+        keyword: value_checker_1.doesHaveValue(testStep.pickleStepId)
             ? keyword
             : isBeforeHook
                 ? 'Before'
                 : 'After',
         result: testStepResult,
     };
-    if (testStep.hookId !== '') {
+    if (value_checker_1.doesHaveValue(testStep.hookId)) {
         let hookDefinition;
         if (isBeforeHook) {
             hookDefinition = supportCodeLibrary.beforeTestCaseHookDefinitions.find((x) => x.id === testStep.hookId);
@@ -42,7 +60,7 @@ function parseStep({ isBeforeHook, gherkinStepMap, keyword, keywordType, pickleS
             line: stepDefinition.line,
         };
     }
-    if (testStep.pickleStepId !== '') {
+    if (value_checker_1.doesHaveValue(testStep.pickleStepId)) {
         out.sourceLocation = {
             uri: pickleUri,
             line: gherkinStepMap[pickleStep.astNodeIds[0]].location.line,
@@ -52,7 +70,7 @@ function parseStep({ isBeforeHook, gherkinStepMap, keyword, keywordType, pickleS
             out.argument = pickleStep.argument;
         }
     }
-    if (testStepResult.status === status_1.default.UNDEFINED) {
+    if (testStepResult.status === messages.TestStepResultStatus.UNDEFINED) {
         out.snippet = snippetBuilder.build({ keywordType, pickleStep });
     }
     return out;
@@ -64,7 +82,7 @@ function parseTestCaseAttempt({ cwd, testCaseAttempt, snippetBuilder, supportCod
     const gherkinStepMap = gherkin_document_parser_1.getGherkinStepMap(gherkinDocument);
     const gherkinScenarioLocationMap = gherkin_document_parser_1.getGherkinScenarioLocationMap(gherkinDocument);
     const pickleStepMap = pickle_parser_1.getPickleStepMap(pickle);
-    const relativePickleUri = path_1.default.relative(cwd, pickle.uri);
+    const relativePickleUri = pickle.uri;
     const parsedTestCase = {
         attempt: testCaseAttempt.attempt,
         name: pickle.name,
@@ -79,9 +97,9 @@ function parseTestCaseAttempt({ cwd, testCaseAttempt, snippetBuilder, supportCod
     let previousKeywordType = keyword_type_1.KeywordType.Precondition;
     lodash_1.default.each(testCase.testSteps, (testStep) => {
         const testStepResult = testCaseAttempt.stepResults[testStep.id];
-        isBeforeHook = isBeforeHook && testStep.hookId !== '';
+        isBeforeHook = isBeforeHook && value_checker_1.doesHaveValue(testStep.hookId);
         let keyword, keywordType, pickleStep;
-        if (testStep.pickleStepId !== '') {
+        if (value_checker_1.doesHaveValue(testStep.pickleStepId)) {
             pickleStep = pickleStepMap[testStep.pickleStepId];
             keyword = pickle_parser_1.getStepKeyword({ pickleStep, gherkinStepMap });
             keywordType = keyword_type_1.getStepKeywordType({

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

@@ -1 +1 @@
-{"version":3,"file":"test_case_attempt_parser.js","sourceRoot":"","sources":["../../../src/formatter/helpers/test_case_attempt_parser.ts"],"names":[],"mappings":"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","sourcesContent":["import _, { Dictionary } from 'lodash'\nimport Status from '../../status'\nimport { getStepKeywordType, KeywordType } from './keyword_type'\nimport {\n  getGherkinScenarioLocationMap,\n  getGherkinStepMap,\n} from './gherkin_document_parser'\nimport { getPickleStepMap, getStepKeyword } from './pickle_parser'\nimport path from 'path'\nimport { messages } from '@cucumber/messages'\nimport { ITestCaseAttempt } from './event_data_collector'\nimport StepDefinitionSnippetBuilder from '../step_definition_snippet_builder'\nimport { ISupportCodeLibrary } from '../../support_code_library_builder/types'\nimport { doesHaveValue, valueOrDefault } from '../../value_checker'\nimport TestCaseHookDefinition from '../../models/test_case_hook_definition'\nimport { ILineAndUri } from '../../types'\n\nexport interface IParsedTestStep {\n  actionLocation?: ILineAndUri\n  argument?: messages.IPickleStepArgument\n  attachments: messages.IAttachment[]\n  keyword: string\n  result: messages.TestStepFinished.ITestStepResult\n  snippet?: string\n  sourceLocation?: ILineAndUri\n  text?: string\n}\n\nexport interface IParsedTestCase {\n  attempt: number\n  name: string\n  sourceLocation?: ILineAndUri\n  worstTestStepResult: messages.TestStepFinished.ITestStepResult\n}\n\nexport interface IParsedTestCaseAttempt {\n  testCase: IParsedTestCase\n  testSteps: IParsedTestStep[]\n}\n\ninterface IParseStepRequest {\n  isBeforeHook: boolean\n  gherkinStepMap: Dictionary<messages.GherkinDocument.Feature.IStep>\n  keyword: string\n  keywordType: KeywordType\n  pickleStep: messages.Pickle.IPickleStep\n  pickleUri: string\n  snippetBuilder: StepDefinitionSnippetBuilder\n  supportCodeLibrary: ISupportCodeLibrary\n  testStep: messages.TestCase.ITestStep\n  testStepResult: messages.TestStepFinished.ITestStepResult\n  testStepAttachments: messages.IAttachment[]\n}\n\nfunction parseStep({\n  isBeforeHook,\n  gherkinStepMap,\n  keyword,\n  keywordType,\n  pickleStep,\n  pickleUri,\n  snippetBuilder,\n  supportCodeLibrary,\n  testStep,\n  testStepResult,\n  testStepAttachments,\n}: IParseStepRequest): IParsedTestStep {\n  const out: IParsedTestStep = {\n    attachments: testStepAttachments,\n    keyword:\n      testStep.pickleStepId !== ''\n        ? keyword\n        : isBeforeHook\n        ? 'Before'\n        : 'After',\n    result: testStepResult,\n  }\n  if (testStep.hookId !== '') {\n    let hookDefinition: TestCaseHookDefinition\n    if (isBeforeHook) {\n      hookDefinition = supportCodeLibrary.beforeTestCaseHookDefinitions.find(\n        (x) => x.id === testStep.hookId\n      )\n    } else {\n      hookDefinition = supportCodeLibrary.afterTestCaseHookDefinitions.find(\n        (x) => x.id === testStep.hookId\n      )\n    }\n    out.actionLocation = {\n      uri: hookDefinition.uri,\n      line: hookDefinition.line,\n    }\n  }\n  if (\n    doesHaveValue(testStep.stepDefinitionIds) &&\n    testStep.stepDefinitionIds.length === 1\n  ) {\n    const stepDefinition = supportCodeLibrary.stepDefinitions.find(\n      (x) => x.id === testStep.stepDefinitionIds[0]\n    )\n    out.actionLocation = {\n      uri: stepDefinition.uri,\n      line: stepDefinition.line,\n    }\n  }\n  if (testStep.pickleStepId !== '') {\n    out.sourceLocation = {\n      uri: pickleUri,\n      line: gherkinStepMap[pickleStep.astNodeIds[0]].location.line,\n    }\n    out.text = pickleStep.text\n    if (doesHaveValue(pickleStep.argument)) {\n      out.argument = pickleStep.argument\n    }\n  }\n  if (testStepResult.status === Status.UNDEFINED) {\n    out.snippet = snippetBuilder.build({ keywordType, pickleStep })\n  }\n  return out\n}\n\nexport interface IParseTestCaseAttemptRequest {\n  cwd: string\n  testCaseAttempt: ITestCaseAttempt\n  snippetBuilder: StepDefinitionSnippetBuilder\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\n// Converts a testCaseAttempt into a json object with all data needed for\n// displaying it in a pretty format\nexport function parseTestCaseAttempt({\n  cwd,\n  testCaseAttempt,\n  snippetBuilder,\n  supportCodeLibrary,\n}: IParseTestCaseAttemptRequest): IParsedTestCaseAttempt {\n  const { testCase, pickle, gherkinDocument } = testCaseAttempt\n  const gherkinStepMap = getGherkinStepMap(gherkinDocument)\n  const gherkinScenarioLocationMap = getGherkinScenarioLocationMap(\n    gherkinDocument\n  )\n  const pickleStepMap = getPickleStepMap(pickle)\n  const relativePickleUri = path.relative(cwd, pickle.uri)\n  const parsedTestCase: IParsedTestCase = {\n    attempt: testCaseAttempt.attempt,\n    name: pickle.name,\n    sourceLocation: {\n      uri: relativePickleUri,\n      line: gherkinScenarioLocationMap[_.last(pickle.astNodeIds)].line,\n    },\n    worstTestStepResult: testCaseAttempt.worstTestStepResult,\n  }\n  const parsedTestSteps: IParsedTestStep[] = []\n  let isBeforeHook = true\n  let previousKeywordType = KeywordType.Precondition\n  _.each(testCase.testSteps, (testStep) => {\n    const testStepResult = testCaseAttempt.stepResults[testStep.id]\n    isBeforeHook = isBeforeHook && testStep.hookId !== ''\n    let keyword, keywordType, pickleStep\n    if (testStep.pickleStepId !== '') {\n      pickleStep = pickleStepMap[testStep.pickleStepId]\n      keyword = getStepKeyword({ pickleStep, gherkinStepMap })\n      keywordType = getStepKeywordType({\n        keyword,\n        language: gherkinDocument.feature.language,\n        previousKeywordType,\n      })\n    }\n    const parsedStep = parseStep({\n      isBeforeHook,\n      gherkinStepMap,\n      keyword,\n      keywordType,\n      pickleStep,\n      pickleUri: relativePickleUri,\n      snippetBuilder,\n      supportCodeLibrary,\n      testStep,\n      testStepResult,\n      testStepAttachments: valueOrDefault(\n        testCaseAttempt.stepAttachments[testStep.id],\n        []\n      ),\n    })\n    parsedTestSteps.push(parsedStep)\n    previousKeywordType = keywordType\n  })\n  return {\n    testCase: parsedTestCase,\n    testSteps: parsedTestSteps,\n  }\n}\n"]}
+{"version":3,"file":"test_case_attempt_parser.js","sourceRoot":"","sources":["../../../src/formatter/helpers/test_case_attempt_parser.ts"],"names":[],"mappings":"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","sourcesContent":["import _ from 'lodash'\nimport { getStepKeywordType, KeywordType } from './keyword_type'\nimport {\n  getGherkinScenarioLocationMap,\n  getGherkinStepMap,\n} from './gherkin_document_parser'\nimport { getPickleStepMap, getStepKeyword } from './pickle_parser'\nimport * as messages from '@cucumber/messages'\nimport { ITestCaseAttempt } from './event_data_collector'\nimport StepDefinitionSnippetBuilder from '../step_definition_snippet_builder'\nimport { ISupportCodeLibrary } from '../../support_code_library_builder/types'\nimport { doesHaveValue, valueOrDefault } from '../../value_checker'\nimport TestCaseHookDefinition from '../../models/test_case_hook_definition'\nimport { ILineAndUri } from '../../types'\n\nexport interface IParsedTestStep {\n  actionLocation?: ILineAndUri\n  argument?: messages.PickleStepArgument\n  attachments: messages.Attachment[]\n  keyword: string\n  result: messages.TestStepResult\n  snippet?: string\n  sourceLocation?: ILineAndUri\n  text?: string\n}\n\nexport interface IParsedTestCase {\n  attempt: number\n  name: string\n  sourceLocation?: ILineAndUri\n  worstTestStepResult: messages.TestStepResult\n}\n\nexport interface IParsedTestCaseAttempt {\n  testCase: IParsedTestCase\n  testSteps: IParsedTestStep[]\n}\n\ninterface IParseStepRequest {\n  isBeforeHook: boolean\n  gherkinStepMap: Record<string, messages.Step>\n  keyword: string\n  keywordType: KeywordType\n  pickleStep: messages.PickleStep\n  pickleUri: string\n  snippetBuilder: StepDefinitionSnippetBuilder\n  supportCodeLibrary: ISupportCodeLibrary\n  testStep: messages.TestStep\n  testStepResult: messages.TestStepResult\n  testStepAttachments: messages.Attachment[]\n}\n\nfunction parseStep({\n  isBeforeHook,\n  gherkinStepMap,\n  keyword,\n  keywordType,\n  pickleStep,\n  pickleUri,\n  snippetBuilder,\n  supportCodeLibrary,\n  testStep,\n  testStepResult,\n  testStepAttachments,\n}: IParseStepRequest): IParsedTestStep {\n  const out: IParsedTestStep = {\n    attachments: testStepAttachments,\n    keyword: doesHaveValue(testStep.pickleStepId)\n      ? keyword\n      : isBeforeHook\n      ? 'Before'\n      : 'After',\n    result: testStepResult,\n  }\n  if (doesHaveValue(testStep.hookId)) {\n    let hookDefinition: TestCaseHookDefinition\n    if (isBeforeHook) {\n      hookDefinition = supportCodeLibrary.beforeTestCaseHookDefinitions.find(\n        (x) => x.id === testStep.hookId\n      )\n    } else {\n      hookDefinition = supportCodeLibrary.afterTestCaseHookDefinitions.find(\n        (x) => x.id === testStep.hookId\n      )\n    }\n    out.actionLocation = {\n      uri: hookDefinition.uri,\n      line: hookDefinition.line,\n    }\n  }\n  if (\n    doesHaveValue(testStep.stepDefinitionIds) &&\n    testStep.stepDefinitionIds.length === 1\n  ) {\n    const stepDefinition = supportCodeLibrary.stepDefinitions.find(\n      (x) => x.id === testStep.stepDefinitionIds[0]\n    )\n    out.actionLocation = {\n      uri: stepDefinition.uri,\n      line: stepDefinition.line,\n    }\n  }\n  if (doesHaveValue(testStep.pickleStepId)) {\n    out.sourceLocation = {\n      uri: pickleUri,\n      line: gherkinStepMap[pickleStep.astNodeIds[0]].location.line,\n    }\n    out.text = pickleStep.text\n    if (doesHaveValue(pickleStep.argument)) {\n      out.argument = pickleStep.argument\n    }\n  }\n  if (testStepResult.status === messages.TestStepResultStatus.UNDEFINED) {\n    out.snippet = snippetBuilder.build({ keywordType, pickleStep })\n  }\n  return out\n}\n\nexport interface IParseTestCaseAttemptRequest {\n  cwd: string\n  testCaseAttempt: ITestCaseAttempt\n  snippetBuilder: StepDefinitionSnippetBuilder\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\n// Converts a testCaseAttempt into a json object with all data needed for\n// displaying it in a pretty format\nexport function parseTestCaseAttempt({\n  cwd,\n  testCaseAttempt,\n  snippetBuilder,\n  supportCodeLibrary,\n}: IParseTestCaseAttemptRequest): IParsedTestCaseAttempt {\n  const { testCase, pickle, gherkinDocument } = testCaseAttempt\n  const gherkinStepMap = getGherkinStepMap(gherkinDocument)\n  const gherkinScenarioLocationMap =\n    getGherkinScenarioLocationMap(gherkinDocument)\n  const pickleStepMap = getPickleStepMap(pickle)\n  const relativePickleUri = pickle.uri\n  const parsedTestCase: IParsedTestCase = {\n    attempt: testCaseAttempt.attempt,\n    name: pickle.name,\n    sourceLocation: {\n      uri: relativePickleUri,\n      line: gherkinScenarioLocationMap[_.last(pickle.astNodeIds)].line,\n    },\n    worstTestStepResult: testCaseAttempt.worstTestStepResult,\n  }\n  const parsedTestSteps: IParsedTestStep[] = []\n  let isBeforeHook = true\n  let previousKeywordType = KeywordType.Precondition\n  _.each(testCase.testSteps, (testStep) => {\n    const testStepResult = testCaseAttempt.stepResults[testStep.id]\n    isBeforeHook = isBeforeHook && doesHaveValue(testStep.hookId)\n    let keyword, keywordType, pickleStep\n    if (doesHaveValue(testStep.pickleStepId)) {\n      pickleStep = pickleStepMap[testStep.pickleStepId]\n      keyword = getStepKeyword({ pickleStep, gherkinStepMap })\n      keywordType = getStepKeywordType({\n        keyword,\n        language: gherkinDocument.feature.language,\n        previousKeywordType,\n      })\n    }\n    const parsedStep = parseStep({\n      isBeforeHook,\n      gherkinStepMap,\n      keyword,\n      keywordType,\n      pickleStep,\n      pickleUri: relativePickleUri,\n      snippetBuilder,\n      supportCodeLibrary,\n      testStep,\n      testStepResult,\n      testStepAttachments: valueOrDefault(\n        testCaseAttempt.stepAttachments[testStep.id],\n        []\n      ),\n    })\n    parsedTestSteps.push(parsedStep)\n    previousKeywordType = keywordType\n  })\n  return {\n    testCase: parsedTestCase,\n    testSteps: parsedTestSteps,\n  }\n}\n"]}

package/lib/formatter/helpers/usage_helpers/index.d.ts

@@ -1,8 +1,8 @@
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import StepDefinition from '../../../models/step_definition';
 import EventDataCollector from '../event_data_collector';
 export interface IUsageMatch {
-    duration?: messages.IDuration;
+    duration?: messages.Duration;
     line: number;
     text: string;
     uri: string;
@@ -11,7 +11,7 @@ export interface IUsage {
     code: string;
     line: number;
     matches: IUsageMatch[];
-    meanDuration?: messages.IDuration;
+    meanDuration?: messages.Duration;
     pattern: string;
     patternType: string;
     uri: string;

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

@@ -1,4 +1,23 @@
 "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 __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)
@@ -17,10 +36,8 @@ 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 +53,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) => {
         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 +72,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])) {
@@ -71,7 +88,7 @@ function buildMapping({ cwd, stepDefinitions, eventDataCollector, }) {
 }
 function invertDuration(duration) {
     if (value_checker_1.doesHaveValue(duration)) {
-        return -1 * time_1.durationToMilliseconds(duration);
+        return -1 * messages.TimeConversion.durationToMilliseconds(duration);
     }
     return 1;
 }
@@ -89,7 +106,7 @@ function buildResult(mapping) {
             .compact()
             .value();
         if (durations.length > 0) {
-            result.meanDuration = time_1.millisecondsToDuration(lodash_1.default.meanBy(durations, (d) => time_1.durationToMilliseconds(d)));
+            result.meanDuration = messages.TimeConversion.millisecondsToDuration(lodash_1.default.meanBy(durations, (d) => messages.TimeConversion.durationToMilliseconds(d)));
         }
         return result;
     })

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":"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","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 _ from 'lodash'\nimport { 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  _.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        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 invertDuration(duration: messages.Duration): number {\n  if (doesHaveValue(duration)) {\n    return -1 * messages.TimeConversion.durationToMilliseconds(duration)\n  }\n  return 1\n}\n\nfunction buildResult(mapping: Record<string, 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.Duration[] = _.chain(matches)\n        .map((m: IUsageMatch) => m.duration)\n        .compact()\n        .value()\n      if (durations.length > 0) {\n        result.meanDuration = messages.TimeConversion.millisecondsToDuration(\n          _.meanBy(durations, (d: messages.Duration) =>\n            messages.TimeConversion.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"]}

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);

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;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,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;CACF;AAzBD,gCAyBC","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\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/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 {};