testit-adapter-cucumber 1.1.7 → 2.0.0

package/README.md

@@ -10,13 +10,6 @@ npm install testit-adapter-cucumber
 
 ## Usage
 
-### API client
-
-To use adapter you need to install `testit-api-client`:
-```
-npm install testit-api-client
-```
-
 ### Configuration
 
 | Description                                                                                                                                                                                                                                                                                                                                                                            | Property                   | Environment variable              | CLI argument                  |
@@ -27,21 +20,17 @@ npm install testit-api-client
 | ID of configuration in TMS instance [How to getting configuration ID?](https://github.com/testit-tms/.github/tree/main/configuration#configurationid)                                                                                                                                                                                                                                  | configurationId            | TMS_CONFIGURATION_ID              | tmsConfigurationId            |
 | ID of the created test run in TMS instance                                                                                                                                                                                                                                                                                              | testRunId                  | TMS_TEST_RUN_ID                   | tmsTestRunId                  |
 
-Create `testitFormatter.js` file in the root directory of the project:
-```js
-const { TestItFormatter } = require('testit-adapter-cucumber');
-
-module.exports = class CustomFormatter extends TestItFormatter {
-  constructor(options) {
-    super(options, {
-      url: 'URL',
-      privateToken: 'USER_PRIVATE_TOKEN',
-      projectId: 'PROJECT_ID',
-      configurationId: 'CONFIGURATION_ID',
-      testRunId: 'TEST_RUN_ID',
-    });
-  }
-};
+Create `tms.config.json` file in the root directory of the project:
+```json
+{
+  "url": "Url",
+  "privateToken": "Private_token",
+  "projectId": "Project_id",
+  "configurationId": "Configuration_id",
+  "testRunName": "Test_run_name",
+  "adapterMode": 2,
+  "automaticCreationTestCases": false
+}
 ```
 
 And fill object with your configuration. Formatter sends results to Test IT.
@@ -53,7 +42,7 @@ Add to `cucumber.js` file
 ```js
 module.exports = {
   default:
-    '-f ./testitFormatter.js',
+    '-f testit-adapter-cucumber',
 };
 ```
 
@@ -92,9 +81,9 @@ Cucumber tags can be used to specify information about autotest.
 - `@Title` - Title that is displayed on autotest page
 - `@DisplayName` - Name that is displayed in autotests table
 - `@Description` - Autotest description
-- `@Link` - can be specified either in JSON (`@Link={"url":"http://google.com","hasInfo":true,"description":"GoogleDescription","title":"Google","type":"Defect"}`) or in text (`@Link=http://google.com`)
-- `@Label` - Label that is going to be linked to autotest
-- `@WorkItemId` - Work item's ID to which autotest is going to be linked
+- `@Links` - can be specified either in JSON (`@Link={"url":"http://google.com","hasInfo":true,"description":"GoogleDescription","title":"Google","type":"Defect"}`) or in text (`@Link=http://google.com`)
+- `@Labels` - Label that is going to be linked to autotest
+- `@WorkItemIds` - Work item's ID to which autotest is going to be linked
 - `@NameSpace` - directory in the TMS system
 - `@ClassName` - subdirectory in the TMS system
 
@@ -106,16 +95,16 @@ Feature: Tags
   @DisplayName=GoogiliGoogle
   @Description=Cannot_Write_With_Spaces
   @ExternalId=344
-  @Link=http://google.com
-  @Link=http://vk.com
-  @Label=Maths
-  @Label=School
+  @Links=http://google.com
+  @Links=http://vk.com
+  @Labels=Maths
+  @Labels=School
   Scenario: Scenario with links
     When 2+2
     Then Result is 4
   @Title=LINKS
   @ExternalId=343
-  @Link={"url":"http://google.com","hasInfo":true,"description":"GoogleDescription","title":"Google","type":"Defect"}
+  @Links={"url":"http://google.com","hasInfo":true,"description":"GoogleDescription","title":"Google","type":"Defect"}
   Scenario: Scenario with link obj
     When 2+2
     Then Result is 4

package/dist/formatter.d.ts

@@ -1,19 +1,14 @@
-import { Formatter, IFormatterOptions } from '@cucumber/cucumber';
-import { GherkinDocument, Pickle, TestCase, TestStepFinished, TestRunFinished, TestCaseStarted, TestCaseFinished, TestStepStarted, Meta } from '@cucumber/messages';
-import { ClientConfigWithFile, IClient, LinkPost } from 'testit-api-client';
-import { IStorage } from './types/storage';
-import { IFormatter } from './types/formatter';
-import { AutotestPostWithWorkItemId } from './mappers';
-export declare class TestItFormatter extends Formatter implements IFormatter {
-    client: IClient;
-    storage: IStorage;
-    currentTestCaseId: string | undefined;
-    resolvedAutotests: Array<string | undefined> | undefined;
-    constructor(options: IFormatterOptions, config: Partial<ClientConfigWithFile>);
-    private testRunId;
-    private testRunStarted;
+import { Link } from "testit-js-commons";
+import { Formatter, IFormatterOptions } from "@cucumber/cucumber";
+import { GherkinDocument, Pickle, TestCase, TestStepFinished, TestRunFinished, TestCaseStarted, TestCaseFinished, TestStepStarted } from "@cucumber/messages";
+import { IFormatter } from "./types";
+export default class TestItFormatter extends Formatter implements IFormatter {
+    private readonly client;
+    private readonly strategy;
+    private readonly storage;
+    private currentTestCaseId;
     private attachmentsQueue;
-    onMeta(_meta: Meta): void;
+    constructor(options: IFormatterOptions);
     onGherkinDocument(document: GherkinDocument): void;
     onPickle(pickle: Pickle): void;
     onTestCase(testCase: TestCase): void;
@@ -21,15 +16,8 @@ export declare class TestItFormatter extends Formatter implements IFormatter {
     testStepStarted(testStepStarted: TestStepStarted): void;
     onTestStepFinished(testStepFinished: TestStepFinished): void;
     testCaseFinished(testCaseFinished: TestCaseFinished): void;
-    onTestRunFinished(_testRunFinished: TestRunFinished): void;
-    loadAutotest(autotestPost: AutotestPostWithWorkItemId): Promise<void>;
-    loadPassedAutotest(autotestPost: AutotestPostWithWorkItemId): Promise<void>;
-    createTestRun(): void;
-    createNewAutotest(autotestPost: AutotestPostWithWorkItemId): Promise<void>;
-    updateAutotest(autotestPost: AutotestPostWithWorkItemId): Promise<void>;
-    linkWorkItem(externalId: string, workItemId: string): Promise<void>;
+    onTestRunFinished(_testRunFinished: TestRunFinished): Promise<void>;
     addMessage(message: string): void;
-    addLinks(links: LinkPost[]): void;
+    addLinks(links: Link[]): void;
     addAttachments(attachments: string[]): void;
-    private logError;
 }

package/dist/formatter.js

@@ -1,31 +1,38 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestItFormatter = void 0;
+const testit_js_commons_1 = require("testit-js-commons");
 const cucumber_1 = require("@cucumber/cucumber");
-const testit_api_client_1 = require("testit-api-client");
 const storage_1 = require("./storage");
 const utils_1 = require("./utils");
 class TestItFormatter extends cucumber_1.Formatter {
-    constructor(options, config) {
+    constructor(options) {
         super(options);
-        this.storage = new storage_1.Storage();
         this.attachmentsQueue = [];
-        this.client = new testit_api_client_1.Client(config);
-        options.eventBroadcaster.on('envelope', (envelope) => {
-            if (envelope.meta) {
-                return this.onMeta(envelope.meta);
-            }
+        const config = new testit_js_commons_1.ConfigComposer().compose(options.parsedArgvOptions);
+        this.client = new testit_js_commons_1.Client(config);
+        this.storage = new storage_1.Storage();
+        this.strategy = testit_js_commons_1.StrategyFactory.create(this.client, config);
+        options.eventBroadcaster.on("envelope", (envelope) => __awaiter(this, void 0, void 0, function* () {
             if (envelope.gherkinDocument) {
                 return this.onGherkinDocument(envelope.gherkinDocument);
             }
             if (envelope.pickle) {
-                if (this.resolvedAutotests !== undefined) {
-                    if (this.resolvedAutotests.length > 0) {
-                        const tags = (0, utils_1.parseTags)(envelope.pickle.tags);
-                        for (const externalId of this.resolvedAutotests) {
-                            if (externalId === tags.externalId) {
-                                return this.onPickle(envelope.pickle);
-                            }
+                const testsInRun = yield this.strategy.testsInRun;
+                const resolvedAutotests = testsInRun === null || testsInRun === void 0 ? void 0 : testsInRun.map((test) => { var _a; return (_a = test.autoTest) === null || _a === void 0 ? void 0 : _a.externalId; }).filter((id) => id !== undefined);
+                if (resolvedAutotests !== undefined) {
+                    const tags = (0, utils_1.parseTags)(envelope.pickle.tags);
+                    for (const externalId of resolvedAutotests) {
+                        if (externalId === tags.externalId) {
+                            return this.onPickle(envelope.pickle);
                         }
                     }
                     envelope.pickle = undefined;
@@ -35,9 +42,6 @@ class TestItFormatter extends cucumber_1.Formatter {
                 }
             }
             if (envelope.testCase) {
-                if (this.testRunId === undefined && this.storage.isResolvedTestCase(envelope.testCase)) {
-                    this.createTestRun();
-                }
                 return this.onTestCase(envelope.testCase);
             }
             if (envelope.testCaseStarted) {
@@ -55,21 +59,10 @@ class TestItFormatter extends cucumber_1.Formatter {
             if (envelope.testRunFinished) {
                 return this.onTestRunFinished(envelope.testRunFinished);
             }
-        });
-        options.supportCodeLibrary.World.prototype.addMessage =
-            this.addMessage.bind(this);
-        options.supportCodeLibrary.World.prototype.addLinks =
-            this.addLinks.bind(this);
-        options.supportCodeLibrary.World.prototype.addAttachments =
-            this.addAttachments.bind(this);
-    }
-    onMeta(_meta) {
-        const { testRunId, configurationId } = this.client.getConfig();
-        if (testRunId !== undefined) {
-            this.testRunId = Promise.resolve(testRunId);
-            const responce = this.client.getTestRun(testRunId);
-            this.resolvedAutotests = (0, utils_1.parsedAutotests)(responce.testResults, configurationId);
-        }
+        }));
+        options.supportCodeLibrary.World.prototype.addMessage = this.addMessage.bind(this);
+        options.supportCodeLibrary.World.prototype.addLinks = this.addLinks.bind(this);
+        options.supportCodeLibrary.World.prototype.addAttachments = this.addAttachments.bind(this);
     }
     onGherkinDocument(document) {
         this.storage.saveGherkinDocument(document);
@@ -95,131 +88,48 @@ class TestItFormatter extends cucumber_1.Formatter {
         this.storage.saveTestCaseFinished(testCaseFinished);
     }
     onTestRunFinished(_testRunFinished) {
-        const { configurationId } = this.client.getConfig();
-        const results = this.storage.getTestRunResults(configurationId);
-        if (this.testRunId !== undefined && results.length > 0) {
-            Promise.all([
-                this.testRunId,
-                Promise.all(this.attachmentsQueue),
-            ])
-                .then(async ([id]) => {
-                const autotests = this.storage.getAutotests(this.client.getConfig().projectId);
-                await Promise.all(autotests.map((autotestPost) => {
-                    const result = results.find((result) => result.autotestExternalId === autotestPost.externalId);
-                    if (result !== undefined) {
-                        if (result.outcome !== 'Passed') {
-                            return this.loadAutotest(autotestPost);
-                        }
-                        return this.loadPassedAutotest(autotestPost);
-                    }
-                }));
-                await Promise.all(results.map((result) => {
-                    return this.client.loadTestRunResults(id, [result]);
-                }));
-            })
-                .catch((err) => {
-                var _a;
-                console.error(err);
-                (_a = this.testRunId) === null || _a === void 0 ? void 0 : _a.then((id) => this.client.completeTestRun(id));
-            });
-        }
-    }
-    async loadAutotest(autotestPost) {
-        var _a;
-        try {
-            await this.createNewAutotest(autotestPost);
-        }
-        catch (err) {
-            const axiosError = err;
-            if (((_a = axiosError.response) === null || _a === void 0 ? void 0 : _a.status) === 409) {
-                const [autotest] = await this.client.getAutotest({
-                    projectId: this.client.getConfig().projectId,
-                    externalId: autotestPost.externalId,
-                });
-                await this.updateAutotest(Object.assign(Object.assign({}, autotest), { links: autotestPost.links }));
-            }
-            else {
-                this.logError(axiosError);
-            }
-        }
-    }
-    async loadPassedAutotest(autotestPost) {
-        var _a;
-        try {
-            await this.createNewAutotest(autotestPost);
-        }
-        catch (err) {
-            const axiosError = err;
-            if (((_a = axiosError.response) === null || _a === void 0 ? void 0 : _a.status) === 409) {
-                await this.updateAutotest(autotestPost);
-            }
-            else {
-                this.logError(axiosError);
-            }
-        }
-        if (autotestPost.workItemId !== undefined) {
-            this.linkWorkItem(autotestPost.externalId, autotestPost.workItemId);
-        }
-    }
-    createTestRun() {
-        const { projectId } = this.client.getConfig();
-        this.testRunId = this.client
-            .createTestRun({
-            projectId,
-        })
-            .then((testRun) => testRun.id);
-    }
-    async createNewAutotest(autotestPost) {
-        autotestPost.shouldCreateWorkItem = this.client.getConfig().automaticCreationTestCases;
-        await this.client.createAutotest(autotestPost);
-    }
-    async updateAutotest(autotestPost) {
-        await this.client.updateAutotest(autotestPost).catch(this.logError);
-    }
-    async linkWorkItem(externalId, workItemId) {
-        const [autotest] = await this.client
-            .getAutotest({
-            projectId: this.client.getConfig().projectId,
-            externalId: externalId,
-        })
-            .catch(() => []);
-        if ((autotest === null || autotest === void 0 ? void 0 : autotest.id) !== undefined) {
-            await this.client.linkToWorkItem(autotest.id, {
-                id: workItemId,
-            });
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.strategy.testRunId;
+            yield Promise.all(this.attachmentsQueue);
+            const results = this.storage.getTestRunResults();
+            const autotests = this.storage.getAutotests();
+            yield Promise.all(autotests.map((autotestPost) => {
+                const result = results.find((result) => result.autoTestExternalId === autotestPost.externalId);
+                if (result !== undefined) {
+                    return this.strategy.loadAutotest(autotestPost, result.outcome === "Passed");
+                }
+            }));
+            yield this.strategy.loadTestRun(results);
+            yield this.strategy.teardown();
+        });
     }
     addMessage(message) {
         if (this.currentTestCaseId === undefined) {
-            throw new Error('CurrentTestCaseId is not set');
+            throw new Error("CurrentTestCaseId is not set");
         }
         this.storage.addMessage(this.currentTestCaseId, message);
     }
     addLinks(links) {
         if (this.currentTestCaseId === undefined) {
-            throw new Error('CurrentTestCaseId is not set');
+            throw new Error("CurrentTestCaseId is not set");
         }
         this.storage.addLinks(this.currentTestCaseId, links);
     }
     addAttachments(attachments) {
         if (this.currentTestCaseId === undefined) {
-            throw new Error('CurrentTestCaseId is not set');
+            throw new Error("CurrentTestCaseId is not a set");
         }
         const currentTestCaseId = this.currentTestCaseId;
-        this.attachmentsQueue.push(...attachments.map(async (attachment) => {
-            const { id } = await this.client.loadAttachment(attachment);
-            if (id === undefined) {
-                // NOTE: Why?
-                console.warn('Attachment id is not returned');
-                return;
-            }
-            this.storage.addAttachment(currentTestCaseId, id);
-        }));
-    }
-    logError(err) {
-        var _a, _b;
-        console.error((_a = err.response) === null || _a === void 0 ? void 0 : _a.status, err.config.method, err.config.url, (_b = err.response) === null || _b === void 0 ? void 0 : _b.data);
+        const promise = this.client.attachments
+            .uploadAttachments(attachments)
+            .then((ids) => {
+            this.storage.addAttachments(currentTestCaseId, ids);
+        })
+            .catch((err) => {
+            console.log("Error load attachments: \n", attachments, "\n", err);
+        });
+        this.attachmentsQueue.push(promise);
     }
 }
-exports.TestItFormatter = TestItFormatter;
+exports.default = TestItFormatter;
 //# sourceMappingURL=formatter.js.map

package/dist/formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"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"}

package/dist/mappers.d.ts

@@ -1,14 +1,10 @@
-import { Background, DataTable, Examples, GherkinDocument, Rule, Scenario, Step, TestStepResultStatus } from '@cucumber/messages';
-import { AutotestPost, AutotestStep, OutcomeType } from 'testit-api-client';
-export interface AutotestPostWithWorkItemId extends AutotestPost {
-    workItemId?: string;
-}
-export declare function mapStatus(status: TestStepResultStatus): OutcomeType;
-export declare function mapDate(date: number): string;
-export declare function mapDocument(document: GherkinDocument, projectId: string): AutotestPostWithWorkItemId[];
-export declare function mapBackground(background: Background): AutotestStep;
-export declare function mapRule(rule: Rule, projectId: string, setup: AutotestStep[]): AutotestPostWithWorkItemId[];
-export declare function mapScenario(scenario: Scenario, projectId: string, setup: AutotestStep[]): AutotestPostWithWorkItemId;
-export declare function mapExamples(examples: Examples): AutotestStep;
-export declare function mapStep(step: Step): AutotestStep;
+import { Background, DataTable, Examples, GherkinDocument, Rule, Scenario, Step as CucumberStep } from "@cucumber/messages";
+import { AutotestPost, ShortStep } from "testit-js-commons";
+export declare function mapDate(date: number): Date;
+export declare function mapDocument(document: GherkinDocument): AutotestPost[];
+export declare function mapBackground(background: Background): ShortStep;
+export declare function mapRule(rule: Rule, setup: ShortStep[]): AutotestPost[];
+export declare function mapScenario(scenario: Scenario, setup: ShortStep[]): AutotestPost;
+export declare function mapExamples(examples: Examples): ShortStep;
+export declare function mapStep(step: CucumberStep): ShortStep;
 export declare function mapDataTable(dataTable: DataTable | undefined): string | undefined;

package/dist/mappers.js

@@ -1,47 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapDataTable = exports.mapStep = exports.mapExamples = exports.mapScenario = exports.mapRule = exports.mapBackground = exports.mapDocument = exports.mapDate = exports.mapStatus = void 0;
-const messages_1 = require("@cucumber/messages");
+exports.mapDataTable = exports.mapStep = exports.mapExamples = exports.mapScenario = exports.mapRule = exports.mapBackground = exports.mapDocument = exports.mapDate = void 0;
 const utils_1 = require("./utils");
-function mapStatus(status) {
-    switch (status) {
-        case messages_1.TestStepResultStatus.PASSED:
-            return 'Passed';
-        case messages_1.TestStepResultStatus.FAILED:
-            return 'Failed';
-        case messages_1.TestStepResultStatus.PENDING:
-            return 'Pending';
-        case messages_1.TestStepResultStatus.SKIPPED:
-            return 'Skipped';
-        case messages_1.TestStepResultStatus.UNKNOWN:
-        case messages_1.TestStepResultStatus.UNDEFINED:
-        case messages_1.TestStepResultStatus.AMBIGUOUS:
-            return 'Blocked';
-        default:
-            throw new Error('Unknown status');
-    }
-}
-exports.mapStatus = mapStatus;
+const testit_js_commons_1 = require("testit-js-commons");
 function mapDate(date) {
-    return new Date(date * 1000).toISOString();
+    return new Date(date * 1000);
 }
 exports.mapDate = mapDate;
-function mapDocument(document, projectId) {
+function mapDocument(document) {
     if (document.feature === undefined) {
         return [];
     }
     const setup = document.feature.children
-        .filter((child) => child.background !== undefined)
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        .map((child) => mapBackground(child.background));
+        .map((child) => child.background)
+        .filter((background) => background !== undefined)
+        .map((background) => mapBackground(background));
     const scenarioAutotests = document.feature.children
-        .filter((child) => child.scenario !== undefined)
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        .map((child) => mapScenario(child.scenario, projectId, setup));
+        .map((child) => child.scenario)
+        .filter((scenario) => scenario !== undefined)
+        .map((scenario) => mapScenario(scenario, setup));
     const ruleAutotests = document.feature.children
-        .filter((child) => child.rule !== undefined)
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        .flatMap((child) => mapRule(child.rule, projectId, setup));
+        .map((child) => child.rule)
+        .filter((rule) => rule !== undefined)
+        .flatMap((rule) => mapRule(rule, setup));
     return scenarioAutotests.concat(...ruleAutotests);
 }
 exports.mapDocument = mapDocument;
@@ -53,52 +34,40 @@ function mapBackground(background) {
     };
 }
 exports.mapBackground = mapBackground;
-function mapRule(rule, projectId, setup) {
+function mapRule(rule, setup) {
     const ruleSetup = setup.concat(rule.children
-        .filter((child) => child.background !== undefined)
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        .map((child) => mapBackground(child.background)));
-    return (rule.children
-        .filter((child) => child.scenario !== undefined)
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        .map((child) => mapScenario(child.scenario, projectId, ruleSetup)));
+        .map((child) => child.background)
+        .filter((background) => background !== undefined)
+        .map((background) => mapBackground(background)));
+    return rule.children
+        .map((child) => child.scenario)
+        .filter((scenario) => scenario !== undefined)
+        .map((scenario) => mapScenario(scenario, ruleSetup));
 }
 exports.mapRule = mapRule;
-function mapScenario(scenario, projectId, setup) {
-    var _a, _b;
+function mapScenario(scenario, setup) {
+    var _a, _b, _c, _d, _e;
     const tags = (0, utils_1.parseTags)(scenario.tags);
-    if (tags.externalId === undefined) {
-        return {
-            externalId: '',
-            name: scenario.name,
-            projectId
-        };
-    }
     const exampleSteps = scenario.examples.map(mapExamples);
     return {
         setup: exampleSteps.concat(setup),
-        externalId: tags.externalId,
+        externalId: (_a = tags.externalId) !== null && _a !== void 0 ? _a : testit_js_commons_1.Utils.getHash((_b = tags.name) !== null && _b !== void 0 ? _b : scenario.name),
         links: tags.links,
-        name: (_a = tags.name) !== null && _a !== void 0 ? _a : scenario.name,
+        name: (_c = tags.name) !== null && _c !== void 0 ? _c : scenario.name,
         title: tags.title,
-        description: (_b = tags.description) !== null && _b !== void 0 ? _b : scenario.description,
-        projectId,
+        description: (_d = tags.description) !== null && _d !== void 0 ? _d : scenario.description,
         steps: scenario.steps.map(mapStep),
-        workItemId: tags.workItemId,
+        workItemIds: tags.workItemIds,
         namespace: tags.nameSpace,
         classname: tags.className,
-        // Disable for now (BUG??)
-        // labels:
-        //   tags.labels.length > 0
-        //     ? tags.labels.map((label) => ({ name: label }))
-        //     : undefined,
+        labels: (_e = tags.labels) === null || _e === void 0 ? void 0 : _e.map((label) => ({ name: label })),
     };
 }
 exports.mapScenario = mapScenario;
 //TODO: Implement using "parameters" fields
 function mapExamples(examples) {
     var _a, _b, _c, _d;
-    let table = [];
+    let table;
     const body = examples.tableBody.map((row) => row.cells.map((cell) => cell.value));
     if (examples.tableHeader !== undefined) {
         const header = (_a = examples.tableHeader) === null || _a === void 0 ? void 0 : _a.cells.map((cell) => cell.value);
@@ -112,12 +81,12 @@ function mapExamples(examples) {
     }
     const description = [examples.description];
     const tags = (0, utils_1.parseTags)(examples.tags);
-    if (table.length > 0) {
+    if (Array.isArray(table)) {
         description.push(JSON.stringify(table));
     }
     return {
-        title: (_c = (_b = tags.title) !== null && _b !== void 0 ? _b : tags.name) !== null && _c !== void 0 ? _c : (examples.name !== '' ? examples.name : 'Parameters'),
-        description: (_d = tags.description) !== null && _d !== void 0 ? _d : description.join('\n\n'),
+        title: (_c = (_b = tags.title) !== null && _b !== void 0 ? _b : tags.name) !== null && _c !== void 0 ? _c : (examples.name !== "" ? examples.name : "Parameters"),
+        description: (_d = tags.description) !== null && _d !== void 0 ? _d : description.join("\n\n"),
     };
 }
 exports.mapExamples = mapExamples;
@@ -134,9 +103,7 @@ function mapDataTable(dataTable) {
         return undefined;
     }
     const keys = dataTable.rows[0].cells.map((cell) => cell.value);
-    const rows = dataTable.rows
-        .slice(1)
-        .map((row) => row.cells.map((cell) => cell.value));
+    const rows = dataTable.rows.slice(1).map((row) => row.cells.map((cell) => cell.value));
     const objects = rows.map((value) => keys.reduce((acc, key, i) => {
         acc[key] = value[i];
         return acc;