@cucumber/cucumber 7.2.0 → 7.3.2

package/lib/runtime/stopwatch.d.ts

@@ -1,11 +1,11 @@
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { Duration } from 'durations';
 export interface ITestRunStopwatch {
     from: (duration: Duration) => ITestRunStopwatch;
     start: () => ITestRunStopwatch;
     stop: () => ITestRunStopwatch;
     duration: () => Duration;
-    timestamp: () => messages.ITimestamp;
+    timestamp: () => messages.Timestamp;
 }
 export declare class RealTestRunStopwatch implements ITestRunStopwatch {
     private readonly stopwatch;
@@ -14,7 +14,7 @@ export declare class RealTestRunStopwatch implements ITestRunStopwatch {
     start(): ITestRunStopwatch;
     stop(): ITestRunStopwatch;
     duration(): Duration;
-    timestamp(): messages.ITimestamp;
+    timestamp(): messages.Timestamp;
 }
 export declare class PredictableTestRunStopwatch implements ITestRunStopwatch {
     private count;
@@ -23,6 +23,6 @@ export declare class PredictableTestRunStopwatch implements ITestRunStopwatch {
     start(): ITestRunStopwatch;
     stop(): ITestRunStopwatch;
     duration(): Duration;
-    timestamp(): messages.ITimestamp;
+    timestamp(): messages.Timestamp;
     private convertToTimestamp;
 }

package/lib/runtime/stopwatch.js

@@ -1,7 +1,26 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PredictableTestRunStopwatch = exports.RealTestRunStopwatch = void 0;
-const messages_1 = require("@cucumber/messages");
+const messages = __importStar(require("@cucumber/messages"));
 const durations_1 = require("durations");
 class RealTestRunStopwatch {
     constructor() {
@@ -28,7 +47,7 @@ class RealTestRunStopwatch {
         return current;
     }
     timestamp() {
-        return messages_1.TimeConversion.millisecondsSinceEpochToTimestamp(Date.now());
+        return messages.TimeConversion.millisecondsSinceEpochToTimestamp(Date.now());
     }
 }
 exports.RealTestRunStopwatch = RealTestRunStopwatch;

package/lib/runtime/stopwatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"stopwatch.js","sourceRoot":"","sources":["../../src/runtime/stopwatch.ts"],"names":[],"mappings":";;;AAAA,iDAA6D;AAC7D,yCAAoE;AAUpE,MAAa,oBAAoB;IAAjC;QACmB,cAAS,GAAc,qBAAS,EAAE,CAAA;QAC3C,SAAI,GAAa,IAAI,CAAA;IA4B/B,CAAC;IA1BC,IAAI,CAAC,QAAkB;QACrB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI;QACF,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAA;QACzC,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;YACtB,OAAO,oBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;SACrD;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,SAAS;QACP,OAAO,yBAAc,CAAC,iCAAiC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IACrE,CAAC;CACF;AA9BD,oDA8BC;AAED,MAAa,2BAA2B;IAAxC;QACU,UAAK,GAAG,CAAC,CAAA;QACT,SAAI,GAAa,IAAI,CAAA;IAsC/B,CAAC;IApCC,IAAI,CAAC,QAAkB;QACrB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ;QACN,MAAM,OAAO,GAAG,oBAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,CAAA;QAC9C,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;YACtB,OAAO,oBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;SACrD;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,SAAS;QACP,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9D,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,kFAAkF;IAC1E,kBAAkB,CAAC,QAAkB;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,UAAU,CAAC,CAAA;QACrE,OAAO;YACL,OAAO;YACP,KAAK;SACN,CAAA;IACH,CAAC;CACF;AAxCD,kEAwCC","sourcesContent":["import { messages, TimeConversion } from '@cucumber/messages'\nimport { stopwatch, Stopwatch, duration, Duration } from 'durations'\n\nexport interface ITestRunStopwatch {\n  from: (duration: Duration) => ITestRunStopwatch\n  start: () => ITestRunStopwatch\n  stop: () => ITestRunStopwatch\n  duration: () => Duration\n  timestamp: () => messages.ITimestamp\n}\n\nexport class RealTestRunStopwatch implements ITestRunStopwatch {\n  private readonly stopwatch: Stopwatch = stopwatch()\n  private base: Duration = null\n\n  from(duration: Duration): ITestRunStopwatch {\n    this.base = duration\n    return this\n  }\n\n  start(): ITestRunStopwatch {\n    this.stopwatch.start()\n    return this\n  }\n\n  stop(): ITestRunStopwatch {\n    this.stopwatch.stop()\n    return this\n  }\n\n  duration(): Duration {\n    const current = this.stopwatch.duration()\n    if (this.base !== null) {\n      return duration(this.base.nanos() + current.nanos())\n    }\n    return current\n  }\n\n  timestamp(): messages.ITimestamp {\n    return TimeConversion.millisecondsSinceEpochToTimestamp(Date.now())\n  }\n}\n\nexport class PredictableTestRunStopwatch implements ITestRunStopwatch {\n  private count = 0\n  private base: Duration = null\n\n  from(duration: Duration): ITestRunStopwatch {\n    this.base = duration\n    return this\n  }\n\n  start(): ITestRunStopwatch {\n    return this\n  }\n\n  stop(): ITestRunStopwatch {\n    return this\n  }\n\n  duration(): Duration {\n    const current = duration(this.count * 1000000)\n    if (this.base !== null) {\n      return duration(this.base.nanos() + current.nanos())\n    }\n    return current\n  }\n\n  timestamp(): messages.ITimestamp {\n    const fakeTimestamp = this.convertToTimestamp(this.duration())\n    this.count++\n    return fakeTimestamp\n  }\n\n  // TODO: Remove. It's impossible to convert timestamps to durations and vice-versa\n  private convertToTimestamp(duration: Duration): messages.ITimestamp {\n    const seconds = Math.floor(duration.seconds())\n    const nanos = Math.floor((duration.seconds() - seconds) * 1000000000)\n    return {\n      seconds,\n      nanos,\n    }\n  }\n}\n"]}
+{"version":3,"file":"stopwatch.js","sourceRoot":"","sources":["../../src/runtime/stopwatch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,yCAAoE;AAUpE,MAAa,oBAAoB;IAAjC;QACmB,cAAS,GAAc,qBAAS,EAAE,CAAA;QAC3C,SAAI,GAAa,IAAI,CAAA;IA4B/B,CAAC;IA1BC,IAAI,CAAC,QAAkB;QACrB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI;QACF,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAA;QACzC,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;YACtB,OAAO,oBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;SACrD;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,SAAS;QACP,OAAO,QAAQ,CAAC,cAAc,CAAC,iCAAiC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IAC9E,CAAC;CACF;AA9BD,oDA8BC;AAED,MAAa,2BAA2B;IAAxC;QACU,UAAK,GAAG,CAAC,CAAA;QACT,SAAI,GAAa,IAAI,CAAA;IAsC/B,CAAC;IApCC,IAAI,CAAC,QAAkB;QACrB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ;QACN,MAAM,OAAO,GAAG,oBAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,CAAA;QAC9C,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;YACtB,OAAO,oBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;SACrD;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,SAAS;QACP,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9D,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,kFAAkF;IAC1E,kBAAkB,CAAC,QAAkB;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,UAAU,CAAC,CAAA;QACrE,OAAO;YACL,OAAO;YACP,KAAK;SACN,CAAA;IACH,CAAC;CACF;AAxCD,kEAwCC","sourcesContent":["import * as messages from '@cucumber/messages'\nimport { stopwatch, Stopwatch, duration, Duration } from 'durations'\n\nexport interface ITestRunStopwatch {\n  from: (duration: Duration) => ITestRunStopwatch\n  start: () => ITestRunStopwatch\n  stop: () => ITestRunStopwatch\n  duration: () => Duration\n  timestamp: () => messages.Timestamp\n}\n\nexport class RealTestRunStopwatch implements ITestRunStopwatch {\n  private readonly stopwatch: Stopwatch = stopwatch()\n  private base: Duration = null\n\n  from(duration: Duration): ITestRunStopwatch {\n    this.base = duration\n    return this\n  }\n\n  start(): ITestRunStopwatch {\n    this.stopwatch.start()\n    return this\n  }\n\n  stop(): ITestRunStopwatch {\n    this.stopwatch.stop()\n    return this\n  }\n\n  duration(): Duration {\n    const current = this.stopwatch.duration()\n    if (this.base !== null) {\n      return duration(this.base.nanos() + current.nanos())\n    }\n    return current\n  }\n\n  timestamp(): messages.Timestamp {\n    return messages.TimeConversion.millisecondsSinceEpochToTimestamp(Date.now())\n  }\n}\n\nexport class PredictableTestRunStopwatch implements ITestRunStopwatch {\n  private count = 0\n  private base: Duration = null\n\n  from(duration: Duration): ITestRunStopwatch {\n    this.base = duration\n    return this\n  }\n\n  start(): ITestRunStopwatch {\n    return this\n  }\n\n  stop(): ITestRunStopwatch {\n    return this\n  }\n\n  duration(): Duration {\n    const current = duration(this.count * 1000000)\n    if (this.base !== null) {\n      return duration(this.base.nanos() + current.nanos())\n    }\n    return current\n  }\n\n  timestamp(): messages.Timestamp {\n    const fakeTimestamp = this.convertToTimestamp(this.duration())\n    this.count++\n    return fakeTimestamp\n  }\n\n  // TODO: Remove. It's impossible to convert timestamps to durations and vice-versa\n  private convertToTimestamp(duration: Duration): messages.Timestamp {\n    const seconds = Math.floor(duration.seconds())\n    const nanos = Math.floor((duration.seconds() - seconds) * 1000000000)\n    return {\n      seconds,\n      nanos,\n    }\n  }\n}\n"]}

package/lib/runtime/{pickle_runner.d.ts → test_case_runner.d.ts}

@@ -1,33 +1,25 @@
 /// <reference types="node" />
-import { IdGenerator, messages } from '@cucumber/messages';
+import { IdGenerator } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { EventEmitter } from 'events';
 import { ISupportCodeLibrary, ITestCaseHookParameter } from '../support_code_library_builder/types';
 import TestCaseHookDefinition from '../models/test_case_hook_definition';
 import TestStepHookDefinition from '../models/test_step_hook_definition';
-import StepDefinition from '../models/step_definition';
 import { IDefinition } from '../models/definition';
 import { ITestRunStopwatch } from './stopwatch';
-interface ITestStep {
-    id: string;
-    isBeforeHook?: boolean;
-    isHook: boolean;
-    hookDefinition?: TestCaseHookDefinition;
-    stepHookDefinition?: TestStepHookDefinition;
-    pickleStep?: messages.Pickle.IPickleStep;
-    stepDefinitions?: StepDefinition[];
-}
-export interface INewPickleRunnerOptions {
+export interface INewTestCaseRunnerOptions {
     eventBroadcaster: EventEmitter;
     stopwatch: ITestRunStopwatch;
-    gherkinDocument: messages.IGherkinDocument;
+    gherkinDocument: messages.GherkinDocument;
     newId: IdGenerator.NewId;
-    pickle: messages.IPickle;
+    pickle: messages.Pickle;
+    testCase: messages.TestCase;
     retries: number;
     skip: boolean;
     supportCodeLibrary: ISupportCodeLibrary;
     worldParameters: any;
 }
-export default class PickleRunner {
+export default class TestCaseRunner {
     private readonly attachmentManager;
     private currentTestCaseStartedId;
     private currentTestStepId;
@@ -36,32 +28,24 @@ export default class PickleRunner {
     private readonly gherkinDocument;
     private readonly newId;
     private readonly pickle;
+    private readonly testCase;
     private readonly maxAttempts;
     private readonly skip;
     private readonly supportCodeLibrary;
-    private readonly testCaseId;
-    private readonly testSteps;
     private testStepResults;
     private world;
     private readonly worldParameters;
-    constructor({ eventBroadcaster, stopwatch, gherkinDocument, newId, pickle, retries, skip, supportCodeLibrary, worldParameters, }: INewPickleRunnerOptions);
+    constructor({ eventBroadcaster, stopwatch, gherkinDocument, newId, pickle, testCase, retries, skip, supportCodeLibrary, worldParameters, }: INewTestCaseRunnerOptions);
     resetTestProgressData(): void;
-    buildTestSteps(): ITestStep[];
-    emitTestCase(): void;
-    private mapArgumentGroup;
-    getAfterHookDefinitions(): TestCaseHookDefinition[];
-    getBeforeHookDefinitions(): TestCaseHookDefinition[];
     getBeforeStepHookDefinitions(): TestStepHookDefinition[];
     getAfterStepHookDefinitions(): TestStepHookDefinition[];
-    getStepDefinitions(pickleStep: messages.Pickle.IPickleStep): StepDefinition[];
-    getWorstStepResult(): messages.TestStepFinished.ITestStepResult;
-    invokeStep(step: messages.Pickle.IPickleStep, stepDefinition: IDefinition, hookParameter?: any): Promise<messages.TestStepFinished.ITestStepResult>;
+    getWorstStepResult(): messages.TestStepResult;
+    invokeStep(step: messages.PickleStep, stepDefinition: IDefinition, hookParameter?: any): Promise<messages.TestStepResult>;
     isSkippingSteps(): boolean;
     shouldSkipHook(isBeforeHook: boolean): boolean;
-    aroundTestStep(testStepId: string, attempt: number, runStepFn: () => Promise<messages.TestStepFinished.ITestStepResult>): Promise<void>;
-    run(): Promise<messages.TestStepFinished.TestStepResult.Status>;
-    runHook(hookDefinition: TestCaseHookDefinition, hookParameter: ITestCaseHookParameter, isBeforeHook: boolean): Promise<messages.TestStepFinished.ITestStepResult>;
-    runStepHooks(stepHooks: TestStepHookDefinition[], stepResult?: messages.TestStepFinished.ITestStepResult): Promise<messages.TestStepFinished.ITestStepResult[]>;
-    runStep(testStep: ITestStep): Promise<messages.TestStepFinished.ITestStepResult>;
+    aroundTestStep(testStepId: string, attempt: number, runStepFn: () => Promise<messages.TestStepResult>): Promise<void>;
+    run(): Promise<messages.TestStepResultStatus>;
+    runHook(hookDefinition: TestCaseHookDefinition, hookParameter: ITestCaseHookParameter, isBeforeHook: boolean): Promise<messages.TestStepResult>;
+    runStepHooks(stepHooks: TestStepHookDefinition[], stepResult?: messages.TestStepResult): Promise<messages.TestStepResult[]>;
+    runStep(pickleStep: messages.PickleStep, testStep: messages.TestStep): Promise<messages.TestStepResult>;
 }
-export {};

package/lib/runtime/{pickle_runner.js → test_case_runner.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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,17 +27,15 @@ const helpers_1 = require("./helpers");
 const attachment_manager_1 = __importDefault(require("./attachment_manager"));
 const step_runner_1 = __importDefault(require("./step_runner"));
 const messages_1 = require("@cucumber/messages");
-const time_1 = require("../time");
+const messages = __importStar(require("@cucumber/messages"));
 const value_checker_1 = require("../value_checker");
-const query_1 = require("@cucumber/query");
-const { Status } = messages_1.messages.TestStepFinished.TestStepResult;
-class PickleRunner {
-    constructor({ eventBroadcaster, stopwatch, gherkinDocument, newId, pickle, retries = 0, skip, supportCodeLibrary, worldParameters, }) {
+class TestCaseRunner {
+    constructor({ eventBroadcaster, stopwatch, gherkinDocument, newId, pickle, testCase, retries = 0, skip, supportCodeLibrary, worldParameters, }) {
         this.attachmentManager = new attachment_manager_1.default(({ data, media }) => {
             if (value_checker_1.doesNotHaveValue(this.currentTestStepId)) {
                 throw new Error('Cannot attach when a step/hook is not running. Ensure your step/hook waits for the attach to finish.');
             }
-            this.eventBroadcaster.emit('envelope', messages_1.messages.Envelope.fromObject({
+            const attachment = {
                 attachment: {
                     body: data,
                     contentEncoding: media.encoding,
@@ -26,7 +43,8 @@ class PickleRunner {
                     testCaseStartedId: this.currentTestCaseStartedId,
                     testStepId: this.currentTestStepId,
                 },
-            }));
+            };
+            this.eventBroadcaster.emit('envelope', attachment);
         });
         this.eventBroadcaster = eventBroadcaster;
         this.stopwatch = stopwatch;
@@ -34,11 +52,10 @@ class PickleRunner {
         this.maxAttempts = 1 + (skip ? 0 : retries);
         this.newId = newId;
         this.pickle = pickle;
+        this.testCase = testCase;
         this.skip = skip;
         this.supportCodeLibrary = supportCodeLibrary;
         this.worldParameters = worldParameters;
-        this.testCaseId = this.newId();
-        this.testSteps = this.buildTestSteps();
         this.resetTestProgressData();
     }
     resetTestProgressData() {
@@ -49,84 +66,6 @@ class PickleRunner {
         });
         this.testStepResults = [];
     }
-    buildTestSteps() {
-        const testSteps = [];
-        this.getBeforeHookDefinitions().forEach((hookDefinition) => {
-            testSteps.push({
-                id: this.newId(),
-                hookDefinition,
-                isHook: true,
-                isBeforeHook: true,
-            });
-        });
-        this.pickle.steps.forEach((pickleStep) => {
-            const stepDefinitions = this.getStepDefinitions(pickleStep);
-            testSteps.push({
-                id: this.newId(),
-                pickleStep,
-                stepDefinitions,
-                isHook: false,
-            });
-        });
-        this.getAfterHookDefinitions().forEach((hookDefinition) => {
-            testSteps.push({
-                id: this.newId(),
-                hookDefinition,
-                isHook: true,
-            });
-        });
-        return testSteps;
-    }
-    emitTestCase() {
-        const testCase = {
-            pickleId: this.pickle.id,
-            id: this.testCaseId,
-            testSteps: this.testSteps.map((testStep) => {
-                if (testStep.isHook) {
-                    return {
-                        id: testStep.id,
-                        hookId: testStep.hookDefinition.id,
-                    };
-                }
-                else {
-                    return {
-                        id: testStep.id,
-                        pickleStepId: testStep.pickleStep.id,
-                        stepDefinitionIds: testStep.stepDefinitions.map((x) => x.id),
-                        stepMatchArgumentsLists: testStep.stepDefinitions.map((x) => {
-                            const result = x.expression.match(testStep.pickleStep.text);
-                            return {
-                                stepMatchArguments: result.map((arg) => {
-                                    return {
-                                        group: this.mapArgumentGroup(arg.group),
-                                        parameterTypeName: arg.parameterType.name,
-                                    };
-                                }),
-                            };
-                        }),
-                    };
-                }
-            }),
-        };
-        this.eventBroadcaster.emit('envelope', messages_1.messages.Envelope.fromObject({ testCase }));
-    }
-    mapArgumentGroup(group) {
-        return {
-            start: group.start,
-            value: group.value,
-            children: value_checker_1.doesHaveValue(group.children)
-                ? group.children.map((child) => this.mapArgumentGroup(child))
-                : undefined,
-        };
-    }
-    getAfterHookDefinitions() {
-        return lodash_1.clone(this.supportCodeLibrary.afterTestCaseHookDefinitions)
-            .reverse()
-            .filter((hookDefinition) => hookDefinition.appliesToTestCase(this.pickle));
-    }
-    getBeforeHookDefinitions() {
-        return this.supportCodeLibrary.beforeTestCaseHookDefinitions.filter((hookDefinition) => hookDefinition.appliesToTestCase(this.pickle));
-    }
     getBeforeStepHookDefinitions() {
         return this.supportCodeLibrary.beforeTestStepHookDefinitions.filter((hookDefinition) => hookDefinition.appliesToTestCase(this.pickle));
     }
@@ -135,16 +74,17 @@ class PickleRunner {
             .reverse()
             .filter((hookDefinition) => hookDefinition.appliesToTestCase(this.pickle));
     }
-    getStepDefinitions(pickleStep) {
-        return this.supportCodeLibrary.stepDefinitions.filter((stepDefinition) => stepDefinition.matchesStepName(pickleStep.text));
-    }
     getWorstStepResult() {
         if (this.testStepResults.length === 0) {
-            return messages_1.messages.TestStepFinished.TestStepResult.fromObject({
-                status: this.skip ? Status.SKIPPED : Status.PASSED,
-            });
+            return {
+                status: this.skip
+                    ? messages.TestStepResultStatus.SKIPPED
+                    : messages.TestStepResultStatus.PASSED,
+                willBeRetried: false,
+                duration: messages.TimeConversion.millisecondsToDuration(0),
+            };
         }
-        return new query_1.Query().getWorstTestStepResult(this.testStepResults);
+        return messages_1.getWorstTestStepResult(this.testStepResults);
     }
     async invokeStep(step, stepDefinition, hookParameter) {
         return await step_runner_1.default.run({
@@ -156,24 +96,25 @@ class PickleRunner {
         });
     }
     isSkippingSteps() {
-        return this.getWorstStepResult().status !== Status.PASSED;
+        return (this.getWorstStepResult().status !== messages.TestStepResultStatus.PASSED);
     }
     shouldSkipHook(isBeforeHook) {
         return this.skip || (this.isSkippingSteps() && isBeforeHook);
     }
     async aroundTestStep(testStepId, attempt, runStepFn) {
-        this.eventBroadcaster.emit('envelope', messages_1.messages.Envelope.fromObject({
+        const testStepStarted = {
             testStepStarted: {
                 testCaseStartedId: this.currentTestCaseStartedId,
                 testStepId,
                 timestamp: this.stopwatch.timestamp(),
             },
-        }));
+        };
+        this.eventBroadcaster.emit('envelope', testStepStarted);
         this.currentTestStepId = testStepId;
         const testStepResult = await runStepFn();
         this.currentTestStepId = null;
         this.testStepResults.push(testStepResult);
-        if (testStepResult.status === Status.FAILED &&
+        if (testStepResult.status === messages.TestStepResultStatus.FAILED &&
             attempt + 1 < this.maxAttempts) {
             /*
             TODO dont rely on `testStepResult.willBeRetried`, it will be moved or removed
@@ -181,51 +122,58 @@ class PickleRunner {
              */
             testStepResult.willBeRetried = true;
         }
-        this.eventBroadcaster.emit('envelope', messages_1.messages.Envelope.fromObject({
+        const testStepFinished = {
             testStepFinished: {
                 testCaseStartedId: this.currentTestCaseStartedId,
                 testStepId,
                 testStepResult,
                 timestamp: this.stopwatch.timestamp(),
             },
-        }));
+        };
+        this.eventBroadcaster.emit('envelope', testStepFinished);
     }
     async run() {
-        this.emitTestCase();
         for (let attempt = 0; attempt < this.maxAttempts; attempt++) {
             this.currentTestCaseStartedId = this.newId();
-            this.eventBroadcaster.emit('envelope', messages_1.messages.Envelope.fromObject({
+            const testCaseStarted = {
                 testCaseStarted: {
                     attempt,
-                    testCaseId: this.testCaseId,
+                    testCaseId: this.testCase.id,
                     id: this.currentTestCaseStartedId,
                     timestamp: this.stopwatch.timestamp(),
                 },
-            }));
-            for (const testStep of this.testSteps) {
+            };
+            this.eventBroadcaster.emit('envelope', testCaseStarted);
+            // used to determine whether a hook is a Before or After
+            let didWeRunStepsYet = false;
+            for (const testStep of this.testCase.testSteps) {
                 await this.aroundTestStep(testStep.id, attempt, async () => {
-                    if (testStep.isHook) {
+                    if (value_checker_1.doesHaveValue(testStep.hookId)) {
                         const hookParameter = {
                             gherkinDocument: this.gherkinDocument,
                             pickle: this.pickle,
                             testCaseStartedId: this.currentTestCaseStartedId,
                         };
-                        if (!testStep.isBeforeHook) {
+                        if (didWeRunStepsYet) {
                             hookParameter.result = this.getWorstStepResult();
                         }
-                        return await this.runHook(testStep.hookDefinition, hookParameter, testStep.isBeforeHook);
+                        return await this.runHook(findHookDefinition(testStep.hookId, this.supportCodeLibrary), hookParameter, !didWeRunStepsYet);
                     }
                     else {
-                        return await this.runStep(testStep);
+                        const pickleStep = this.pickle.steps.find((pickleStep) => pickleStep.id === testStep.pickleStepId);
+                        const testStepResult = await this.runStep(pickleStep, testStep);
+                        didWeRunStepsYet = true;
+                        return testStepResult;
                     }
                 });
             }
-            this.eventBroadcaster.emit('envelope', messages_1.messages.Envelope.fromObject({
+            const testCaseFinished = {
                 testCaseFinished: {
                     testCaseStartedId: this.currentTestCaseStartedId,
                     timestamp: this.stopwatch.timestamp(),
                 },
-            }));
+            };
+            this.eventBroadcaster.emit('envelope', testCaseFinished);
             if (!this.getWorstStepResult().willBeRetried) {
                 break;
             }
@@ -235,9 +183,11 @@ class PickleRunner {
     }
     async runHook(hookDefinition, hookParameter, isBeforeHook) {
         if (this.shouldSkipHook(isBeforeHook)) {
-            return messages_1.messages.TestStepFinished.TestStepResult.fromObject({
-                status: Status.SKIPPED,
-            });
+            return {
+                status: messages.TestStepResultStatus.SKIPPED,
+                duration: messages.TimeConversion.millisecondsToDuration(0),
+                willBeRetried: false,
+            };
         }
         return await this.invokeStep(null, hookDefinition, hookParameter);
     }
@@ -255,51 +205,58 @@ class PickleRunner {
         }
         return stepHooksResult;
     }
-    async runStep(testStep) {
-        if (testStep.stepDefinitions.length === 0) {
-            return messages_1.messages.TestStepFinished.TestStepResult.fromObject({
-                status: Status.UNDEFINED,
-                duration: {
-                    seconds: '0',
-                    nanos: 0,
-                },
-            });
+    async runStep(pickleStep, testStep) {
+        const stepDefinitions = testStep.stepDefinitionIds.map((stepDefinitionId) => {
+            return findStepDefinition(stepDefinitionId, this.supportCodeLibrary);
+        });
+        if (stepDefinitions.length === 0) {
+            return {
+                status: messages.TestStepResultStatus.UNDEFINED,
+                duration: messages.TimeConversion.millisecondsToDuration(0),
+                willBeRetried: false,
+            };
         }
-        else if (testStep.stepDefinitions.length > 1) {
-            return messages_1.messages.TestStepFinished.TestStepResult.fromObject({
-                message: helpers_1.getAmbiguousStepException(testStep.stepDefinitions),
-                status: Status.AMBIGUOUS,
-                duration: {
-                    seconds: '0',
-                    nanos: 0,
-                },
-            });
+        else if (stepDefinitions.length > 1) {
+            return {
+                message: helpers_1.getAmbiguousStepException(stepDefinitions),
+                status: messages.TestStepResultStatus.AMBIGUOUS,
+                duration: messages.TimeConversion.millisecondsToDuration(0),
+                willBeRetried: false,
+            };
         }
         else if (this.isSkippingSteps()) {
-            return messages_1.messages.TestStepFinished.TestStepResult.fromObject({
-                status: Status.SKIPPED,
-                duration: {
-                    seconds: '0',
-                    nanos: 0,
-                },
-            });
+            return {
+                status: messages.TestStepResultStatus.SKIPPED,
+                duration: messages.TimeConversion.millisecondsToDuration(0),
+                willBeRetried: false,
+            };
         }
         let stepResult;
-        let stepResults = await this.runStepHooks(this.getBeforeStepHookDefinitions(), stepResult);
-        if (new query_1.Query().getWorstTestStepResult(stepResults).status !== Status.FAILED) {
-            stepResult = await this.invokeStep(testStep.pickleStep, testStep.stepDefinitions[0]);
+        let stepResults = await this.runStepHooks(this.getBeforeStepHookDefinitions());
+        if (messages_1.getWorstTestStepResult(stepResults).status !==
+            messages.TestStepResultStatus.FAILED) {
+            stepResult = await this.invokeStep(pickleStep, stepDefinitions[0]);
             stepResults.push(stepResult);
         }
         const afterStepHookResults = await this.runStepHooks(this.getAfterStepHookDefinitions(), stepResult);
         stepResults = stepResults.concat(afterStepHookResults);
-        const finalStepResult = new query_1.Query().getWorstTestStepResult(stepResults);
-        let finalDuration = time_1.getZeroDuration();
+        const finalStepResult = messages_1.getWorstTestStepResult(stepResults);
+        let finalDuration = messages.TimeConversion.millisecondsToDuration(0);
         for (const result of stepResults) {
-            finalDuration = time_1.addDurations(finalDuration, result.duration);
+            finalDuration = messages.TimeConversion.addDurations(finalDuration, result.duration);
         }
         finalStepResult.duration = finalDuration;
         return finalStepResult;
     }
 }
-exports.default = PickleRunner;
-//# sourceMappingURL=pickle_runner.js.map
+exports.default = TestCaseRunner;
+function findHookDefinition(id, supportCodeLibrary) {
+    return [
+        ...supportCodeLibrary.beforeTestCaseHookDefinitions,
+        ...supportCodeLibrary.afterTestCaseHookDefinitions,
+    ].find((definition) => definition.id === id);
+}
+function findStepDefinition(id, supportCodeLibrary) {
+    return supportCodeLibrary.stepDefinitions.find((definition) => definition.id === id);
+}
+//# sourceMappingURL=test_case_runner.js.map

package/lib/runtime/test_case_runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test_case_runner.js","sourceRoot":"","sources":["../../src/runtime/test_case_runner.ts"],"names":[],"mappings":"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","sourcesContent":["import { clone } from 'lodash'\nimport { getAmbiguousStepException } from './helpers'\nimport AttachmentManager from './attachment_manager'\nimport StepRunner from './step_runner'\nimport { IdGenerator, getWorstTestStepResult } from '@cucumber/messages'\nimport * as messages from '@cucumber/messages'\nimport { EventEmitter } from 'events'\nimport {\n  ISupportCodeLibrary,\n  ITestCaseHookParameter,\n  ITestStepHookParameter,\n} from '../support_code_library_builder/types'\nimport TestCaseHookDefinition from '../models/test_case_hook_definition'\nimport TestStepHookDefinition from '../models/test_step_hook_definition'\nimport { IDefinition } from '../models/definition'\nimport { doesHaveValue, doesNotHaveValue } from '../value_checker'\nimport { ITestRunStopwatch } from './stopwatch'\nimport StepDefinition from '../models/step_definition'\n\nexport interface INewTestCaseRunnerOptions {\n  eventBroadcaster: EventEmitter\n  stopwatch: ITestRunStopwatch\n  gherkinDocument: messages.GherkinDocument\n  newId: IdGenerator.NewId\n  pickle: messages.Pickle\n  testCase: messages.TestCase\n  retries: number\n  skip: boolean\n  supportCodeLibrary: ISupportCodeLibrary\n  worldParameters: any\n}\n\nexport default class TestCaseRunner {\n  private readonly attachmentManager: AttachmentManager\n  private currentTestCaseStartedId: string\n  private currentTestStepId: string\n  private readonly eventBroadcaster: EventEmitter\n  private readonly stopwatch: ITestRunStopwatch\n  private readonly gherkinDocument: messages.GherkinDocument\n  private readonly newId: IdGenerator.NewId\n  private readonly pickle: messages.Pickle\n  private readonly testCase: messages.TestCase\n  private readonly maxAttempts: number\n  private readonly skip: boolean\n  private readonly supportCodeLibrary: ISupportCodeLibrary\n  private testStepResults: messages.TestStepResult[]\n  private world: any\n  private readonly worldParameters: any\n\n  constructor({\n    eventBroadcaster,\n    stopwatch,\n    gherkinDocument,\n    newId,\n    pickle,\n    testCase,\n    retries = 0,\n    skip,\n    supportCodeLibrary,\n    worldParameters,\n  }: INewTestCaseRunnerOptions) {\n    this.attachmentManager = new AttachmentManager(({ data, media }) => {\n      if (doesNotHaveValue(this.currentTestStepId)) {\n        throw new Error(\n          'Cannot attach when a step/hook is not running. Ensure your step/hook waits for the attach to finish.'\n        )\n      }\n      const attachment: messages.Envelope = {\n        attachment: {\n          body: data,\n          contentEncoding: media.encoding,\n          mediaType: media.contentType,\n          testCaseStartedId: this.currentTestCaseStartedId,\n          testStepId: this.currentTestStepId,\n        },\n      }\n      this.eventBroadcaster.emit('envelope', attachment)\n    })\n    this.eventBroadcaster = eventBroadcaster\n    this.stopwatch = stopwatch\n    this.gherkinDocument = gherkinDocument\n    this.maxAttempts = 1 + (skip ? 0 : retries)\n    this.newId = newId\n    this.pickle = pickle\n    this.testCase = testCase\n    this.skip = skip\n    this.supportCodeLibrary = supportCodeLibrary\n    this.worldParameters = worldParameters\n    this.resetTestProgressData()\n  }\n\n  resetTestProgressData(): void {\n    this.world = new this.supportCodeLibrary.World({\n      attach: this.attachmentManager.create.bind(this.attachmentManager),\n      log: this.attachmentManager.log.bind(this.attachmentManager),\n      parameters: this.worldParameters,\n    })\n    this.testStepResults = []\n  }\n\n  getBeforeStepHookDefinitions(): TestStepHookDefinition[] {\n    return this.supportCodeLibrary.beforeTestStepHookDefinitions.filter(\n      (hookDefinition) => hookDefinition.appliesToTestCase(this.pickle)\n    )\n  }\n\n  getAfterStepHookDefinitions(): TestStepHookDefinition[] {\n    return clone(this.supportCodeLibrary.afterTestStepHookDefinitions)\n      .reverse()\n      .filter((hookDefinition) => hookDefinition.appliesToTestCase(this.pickle))\n  }\n\n  getWorstStepResult(): messages.TestStepResult {\n    if (this.testStepResults.length === 0) {\n      return {\n        status: this.skip\n          ? messages.TestStepResultStatus.SKIPPED\n          : messages.TestStepResultStatus.PASSED,\n        willBeRetried: false,\n        duration: messages.TimeConversion.millisecondsToDuration(0),\n      }\n    }\n    return getWorstTestStepResult(this.testStepResults)\n  }\n\n  async invokeStep(\n    step: messages.PickleStep,\n    stepDefinition: IDefinition,\n    hookParameter?: any\n  ): Promise<messages.TestStepResult> {\n    return await StepRunner.run({\n      defaultTimeout: this.supportCodeLibrary.defaultTimeout,\n      hookParameter,\n      step,\n      stepDefinition,\n      world: this.world,\n    })\n  }\n\n  isSkippingSteps(): boolean {\n    return (\n      this.getWorstStepResult().status !== messages.TestStepResultStatus.PASSED\n    )\n  }\n\n  shouldSkipHook(isBeforeHook: boolean): boolean {\n    return this.skip || (this.isSkippingSteps() && isBeforeHook)\n  }\n\n  async aroundTestStep(\n    testStepId: string,\n    attempt: number,\n    runStepFn: () => Promise<messages.TestStepResult>\n  ): Promise<void> {\n    const testStepStarted: messages.Envelope = {\n      testStepStarted: {\n        testCaseStartedId: this.currentTestCaseStartedId,\n        testStepId,\n        timestamp: this.stopwatch.timestamp(),\n      },\n    }\n    this.eventBroadcaster.emit('envelope', testStepStarted)\n    this.currentTestStepId = testStepId\n    const testStepResult = await runStepFn()\n    this.currentTestStepId = null\n    this.testStepResults.push(testStepResult)\n    if (\n      testStepResult.status === messages.TestStepResultStatus.FAILED &&\n      attempt + 1 < this.maxAttempts\n    ) {\n      /*\n      TODO dont rely on `testStepResult.willBeRetried`, it will be moved or removed\n      see https://github.com/cucumber/cucumber/issues/902\n       */\n      testStepResult.willBeRetried = true\n    }\n    const testStepFinished: messages.Envelope = {\n      testStepFinished: {\n        testCaseStartedId: this.currentTestCaseStartedId,\n        testStepId,\n        testStepResult,\n        timestamp: this.stopwatch.timestamp(),\n      },\n    }\n    this.eventBroadcaster.emit('envelope', testStepFinished)\n  }\n\n  async run(): Promise<messages.TestStepResultStatus> {\n    for (let attempt = 0; attempt < this.maxAttempts; attempt++) {\n      this.currentTestCaseStartedId = this.newId()\n      const testCaseStarted: messages.Envelope = {\n        testCaseStarted: {\n          attempt,\n          testCaseId: this.testCase.id,\n          id: this.currentTestCaseStartedId,\n          timestamp: this.stopwatch.timestamp(),\n        },\n      }\n      this.eventBroadcaster.emit('envelope', testCaseStarted)\n      // used to determine whether a hook is a Before or After\n      let didWeRunStepsYet = false\n      for (const testStep of this.testCase.testSteps) {\n        await this.aroundTestStep(testStep.id, attempt, async () => {\n          if (doesHaveValue(testStep.hookId)) {\n            const hookParameter: ITestCaseHookParameter = {\n              gherkinDocument: this.gherkinDocument,\n              pickle: this.pickle,\n              testCaseStartedId: this.currentTestCaseStartedId,\n            }\n            if (didWeRunStepsYet) {\n              hookParameter.result = this.getWorstStepResult()\n            }\n            return await this.runHook(\n              findHookDefinition(testStep.hookId, this.supportCodeLibrary),\n              hookParameter,\n              !didWeRunStepsYet\n            )\n          } else {\n            const pickleStep = this.pickle.steps.find(\n              (pickleStep) => pickleStep.id === testStep.pickleStepId\n            )\n            const testStepResult = await this.runStep(pickleStep, testStep)\n            didWeRunStepsYet = true\n            return testStepResult\n          }\n        })\n      }\n      const testCaseFinished: messages.Envelope = {\n        testCaseFinished: {\n          testCaseStartedId: this.currentTestCaseStartedId,\n          timestamp: this.stopwatch.timestamp(),\n        },\n      }\n      this.eventBroadcaster.emit('envelope', testCaseFinished)\n      if (!this.getWorstStepResult().willBeRetried) {\n        break\n      }\n      this.resetTestProgressData()\n    }\n    return this.getWorstStepResult().status\n  }\n\n  async runHook(\n    hookDefinition: TestCaseHookDefinition,\n    hookParameter: ITestCaseHookParameter,\n    isBeforeHook: boolean\n  ): Promise<messages.TestStepResult> {\n    if (this.shouldSkipHook(isBeforeHook)) {\n      return {\n        status: messages.TestStepResultStatus.SKIPPED,\n        duration: messages.TimeConversion.millisecondsToDuration(0),\n        willBeRetried: false,\n      }\n    }\n    return await this.invokeStep(null, hookDefinition, hookParameter)\n  }\n\n  async runStepHooks(\n    stepHooks: TestStepHookDefinition[],\n    stepResult?: messages.TestStepResult\n  ): Promise<messages.TestStepResult[]> {\n    const stepHooksResult = []\n    const hookParameter: ITestStepHookParameter = {\n      gherkinDocument: this.gherkinDocument,\n      pickle: this.pickle,\n      testCaseStartedId: this.currentTestCaseStartedId,\n      testStepId: this.currentTestStepId,\n      result: stepResult,\n    }\n    for (const stepHookDefinition of stepHooks) {\n      stepHooksResult.push(\n        await this.invokeStep(null, stepHookDefinition, hookParameter)\n      )\n    }\n    return stepHooksResult\n  }\n\n  async runStep(\n    pickleStep: messages.PickleStep,\n    testStep: messages.TestStep\n  ): Promise<messages.TestStepResult> {\n    const stepDefinitions = testStep.stepDefinitionIds.map(\n      (stepDefinitionId) => {\n        return findStepDefinition(stepDefinitionId, this.supportCodeLibrary)\n      }\n    )\n    if (stepDefinitions.length === 0) {\n      return {\n        status: messages.TestStepResultStatus.UNDEFINED,\n        duration: messages.TimeConversion.millisecondsToDuration(0),\n        willBeRetried: false,\n      }\n    } else if (stepDefinitions.length > 1) {\n      return {\n        message: getAmbiguousStepException(stepDefinitions),\n        status: messages.TestStepResultStatus.AMBIGUOUS,\n        duration: messages.TimeConversion.millisecondsToDuration(0),\n        willBeRetried: false,\n      }\n    } else if (this.isSkippingSteps()) {\n      return {\n        status: messages.TestStepResultStatus.SKIPPED,\n        duration: messages.TimeConversion.millisecondsToDuration(0),\n        willBeRetried: false,\n      }\n    }\n\n    let stepResult\n    let stepResults = await this.runStepHooks(\n      this.getBeforeStepHookDefinitions()\n    )\n    if (\n      getWorstTestStepResult(stepResults).status !==\n      messages.TestStepResultStatus.FAILED\n    ) {\n      stepResult = await this.invokeStep(pickleStep, stepDefinitions[0])\n      stepResults.push(stepResult)\n    }\n    const afterStepHookResults = await this.runStepHooks(\n      this.getAfterStepHookDefinitions(),\n      stepResult\n    )\n    stepResults = stepResults.concat(afterStepHookResults)\n\n    const finalStepResult = getWorstTestStepResult(stepResults)\n    let finalDuration = messages.TimeConversion.millisecondsToDuration(0)\n    for (const result of stepResults) {\n      finalDuration = messages.TimeConversion.addDurations(\n        finalDuration,\n        result.duration\n      )\n    }\n    finalStepResult.duration = finalDuration\n    return finalStepResult\n  }\n}\n\nfunction findHookDefinition(\n  id: string,\n  supportCodeLibrary: ISupportCodeLibrary\n): TestCaseHookDefinition {\n  return [\n    ...supportCodeLibrary.beforeTestCaseHookDefinitions,\n    ...supportCodeLibrary.afterTestCaseHookDefinitions,\n  ].find((definition) => definition.id === id)\n}\n\nfunction findStepDefinition(\n  id: string,\n  supportCodeLibrary: ISupportCodeLibrary\n): StepDefinition {\n  return supportCodeLibrary.stepDefinitions.find(\n    (definition) => definition.id === id\n  )\n}\n"]}

package/lib/step_arguments.d.ts

@@ -1,6 +1,6 @@
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 export interface IPickleStepArgumentFunctionMap<T> {
-    dataTable: (arg: messages.PickleStepArgument.IPickleTable) => T;
-    docString: (arg: messages.PickleStepArgument.IPickleDocString) => T;
+    dataTable: (arg: messages.PickleTable) => T;
+    docString: (arg: messages.PickleDocString) => T;
 }
-export declare function parseStepArgument<T>(arg: messages.IPickleStepArgument, mapping: IPickleStepArgumentFunctionMap<T>): T;
+export declare function parseStepArgument<T>(arg: messages.PickleStepArgument, mapping: IPickleStepArgumentFunctionMap<T>): T;

package/lib/step_arguments.js.map

@@ -1 +1 @@
-{"version":3,"file":"step_arguments.js","sourceRoot":"","sources":["../src/step_arguments.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEvB,mDAA+C;AAO/C,SAAgB,iBAAiB,CAC/B,GAAiC,EACjC,OAA0C;IAE1C,IAAI,6BAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QAChC,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;KACxC;SAAM,IAAI,6BAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QACvC,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;KACxC;IACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AAChE,CAAC;AAVD,8CAUC","sourcesContent":["import util from 'util'\nimport { messages } from '@cucumber/messages'\nimport { doesHaveValue } from './value_checker'\n\nexport interface IPickleStepArgumentFunctionMap<T> {\n  dataTable: (arg: messages.PickleStepArgument.IPickleTable) => T\n  docString: (arg: messages.PickleStepArgument.IPickleDocString) => T\n}\n\nexport function parseStepArgument<T>(\n  arg: messages.IPickleStepArgument,\n  mapping: IPickleStepArgumentFunctionMap<T>\n): T {\n  if (doesHaveValue(arg.dataTable)) {\n    return mapping.dataTable(arg.dataTable)\n  } else if (doesHaveValue(arg.docString)) {\n    return mapping.docString(arg.docString)\n  }\n  throw new Error(`Unknown step argument: ${util.inspect(arg)}`)\n}\n"]}
+{"version":3,"file":"step_arguments.js","sourceRoot":"","sources":["../src/step_arguments.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEvB,mDAA+C;AAO/C,SAAgB,iBAAiB,CAC/B,GAAgC,EAChC,OAA0C;IAE1C,IAAI,6BAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QAChC,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;KACxC;SAAM,IAAI,6BAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QACvC,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;KACxC;IACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AAChE,CAAC;AAVD,8CAUC","sourcesContent":["import util from 'util'\nimport * as messages from '@cucumber/messages'\nimport { doesHaveValue } from './value_checker'\n\nexport interface IPickleStepArgumentFunctionMap<T> {\n  dataTable: (arg: messages.PickleTable) => T\n  docString: (arg: messages.PickleDocString) => T\n}\n\nexport function parseStepArgument<T>(\n  arg: messages.PickleStepArgument,\n  mapping: IPickleStepArgumentFunctionMap<T>\n): T {\n  if (doesHaveValue(arg.dataTable)) {\n    return mapping.dataTable(arg.dataTable)\n  } else if (doesHaveValue(arg.docString)) {\n    return mapping.docString(arg.docString)\n  }\n  throw new Error(`Unknown step argument: ${util.inspect(arg)}`)\n}\n"]}