Move test plan index type to types.ts

allure-framework · Jul 1, 2024 · b8dd06d · b8dd06d
1 parent 6c63bfe
commit b8dd06d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/allure-mocha/src/AllureMochaReporter.ts b/packages/allure-mocha/src/AllureMochaReporter.ts
@@ -15,6 +15,7 @@ import {
 import { setGlobalTestRuntime } from "allure-js-commons/sdk/runtime";
 import { MochaTestRuntime } from "./MochaTestRuntime.js";
 import { setLegacyApiRuntime } from "./legacyUtils.js";
+import type { TestPlanIndices } from "./types.js";
 import {
   applyTestPlan,
   createTestPlanIndices,
@@ -30,7 +31,6 @@ import {
   resolveParallelModeSetupFile,
   setTestScope,
 } from "./utils.js";
-import type { TestPlanIndices } from "./utils.js";
 
 const {
   EVENT_SUITE_BEGIN,

diff --git a/packages/allure-mocha/src/types.ts b/packages/allure-mocha/src/types.ts
@@ -1,5 +1,10 @@
 import type { Label } from "allure-js-commons";
 
+export type TestPlanIndices = {
+  fullNameIndex: ReadonlySet<string>;
+  idIndex: ReadonlySet<string>;
+};
+
 export type AllureMochaTestData = {
   isIncludedInTestRun: boolean;
   fullName: string;

diff --git a/packages/allure-mocha/src/utils.ts b/packages/allure-mocha/src/utils.ts
@@ -7,7 +7,7 @@ import { LabelName } from "allure-js-commons";
 import type { TestPlanV1, TestPlanV1Test } from "allure-js-commons/sdk";
 import { extractMetadataFromString } from "allure-js-commons/sdk";
 import { getHostLabel, getRelativePath, getThreadLabel, md5, parseTestPlan } from "allure-js-commons/sdk/reporter";
-import type { AllureMochaTestData, HookCategory, HookScope, HookType } from "./types.js";
+import type { AllureMochaTestData, HookCategory, HookScope, HookType, TestPlanIndices } from "./types.js";
 
 const filename = fileURLToPath(import.meta.url);
 
@@ -41,11 +41,6 @@ const createTestPlanIdIndex = (testplan: TestPlanV1) => createTestPlanIndex((e)
 const createTestPlanIndex = <T>(keySelector: (entry: TestPlanV1Test) => T | undefined, testplan: TestPlanV1): Set<T> =>
   new Set(testplan.tests.map((e) => keySelector(e)).filter((v) => v)) as Set<T>;
 
-export type TestPlanIndices = {
-  fullNameIndex: ReadonlySet<string>;
-  idIndex: ReadonlySet<string>;
-};
-
 export const createTestPlanIndices = (): TestPlanIndices | undefined => {
   const testplan = parseTestPlan();
   if (testplan) {