From b5954834b9732d7ec6bbb89abb7ef9488dc39392 Mon Sep 17 00:00:00 2001 From: Noritaka Kobayashi Date: Tue, 7 Oct 2025 00:15:34 +0900 Subject: [PATCH] refactor: remove imported multiple times --- packages/image-comparison-core/src/helpers/options.ts | 3 +-- .../image-comparison-core/src/helpers/utils.interfaces.ts | 3 +-- .../src/methods/createCompareReport.test.ts | 3 +-- .../src/methods/images.executeImageCompare.test.ts | 3 +-- .../image-comparison-core/src/methods/images.interfaces.ts | 3 +-- packages/image-comparison-core/src/methods/images.ts | 3 +-- .../image-comparison-core/src/methods/processDiffPixels.ts | 3 +-- .../src/methods/screenshots.interfaces.ts | 3 +-- packages/visual-reporter/app/components/SelectHeader.tsx | 4 +--- packages/visual-service/tests/reporter.test.ts | 3 +-- 10 files changed, 10 insertions(+), 21 deletions(-) diff --git a/packages/image-comparison-core/src/helpers/options.ts b/packages/image-comparison-core/src/helpers/options.ts index b86b1c69..896e85e7 100644 --- a/packages/image-comparison-core/src/helpers/options.ts +++ b/packages/image-comparison-core/src/helpers/options.ts @@ -8,9 +8,8 @@ import { } from './constants.js' import type { ClassOptions, DefaultOptions } from './options.interfaces.js' import type { MethodImageCompareCompareOptions, ScreenMethodImageCompareCompareOptions } from '../methods/images.interfaces.js' -import type { BeforeScreenshotOptions } from './beforeScreenshot.interfaces.js' +import type { BeforeScreenshotOptions, BeforeScreenshotResult } from './beforeScreenshot.interfaces.js' import type { AfterScreenshotOptions } from './afterScreenshot.interfaces.js' -import type { BeforeScreenshotResult } from './beforeScreenshot.interfaces.js' import type { InstanceData } from '../methods/instanceData.interfaces.js' import type { ComparisonIgnoreOption } from '../resemble/compare.interfaces.js' import { diff --git a/packages/image-comparison-core/src/helpers/utils.interfaces.ts b/packages/image-comparison-core/src/helpers/utils.interfaces.ts index 3d05fe13..b44ecb91 100644 --- a/packages/image-comparison-core/src/helpers/utils.interfaces.ts +++ b/packages/image-comparison-core/src/helpers/utils.interfaces.ts @@ -1,6 +1,5 @@ -import type { BaseCoordinates, BaseDimensions, FilePaths, FolderPaths } from '../base.interfaces.js' +import type { BaseCoordinates, BaseDimensions, FilePaths, FolderPaths, Folders } from '../base.interfaces.js' import type { DeviceRectangles } from '../methods/rectangles.interfaces.js' -import type { Folders } from '../base.interfaces.js' export interface GetAndCreatePathOptions { /** The name of the browser */ diff --git a/packages/image-comparison-core/src/methods/createCompareReport.test.ts b/packages/image-comparison-core/src/methods/createCompareReport.test.ts index fdcbc43d..f0a39b05 100644 --- a/packages/image-comparison-core/src/methods/createCompareReport.test.ts +++ b/packages/image-comparison-core/src/methods/createCompareReport.test.ts @@ -2,8 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import { writeFileSync, readFileSync } from 'node:fs' import { createCompareReport, createJsonReportIfNeeded } from './createCompareReport.js' import type { CompareData } from '../resemble/compare.interfaces.js' -import type { BoundingBox } from './rectangles.interfaces.js' -import type { IgnoreBoxes } from './rectangles.interfaces.js' +import type { BoundingBox, IgnoreBoxes } from './rectangles.interfaces.js' import type { BaseDimensions } from '../base.interfaces.js' import { getBase64ScreenshotSize } from '../helpers/utils.js' diff --git a/packages/image-comparison-core/src/methods/images.executeImageCompare.test.ts b/packages/image-comparison-core/src/methods/images.executeImageCompare.test.ts index a095827b..c1baa46d 100644 --- a/packages/image-comparison-core/src/methods/images.executeImageCompare.test.ts +++ b/packages/image-comparison-core/src/methods/images.executeImageCompare.test.ts @@ -1,8 +1,7 @@ import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest' import { join } from 'node:path' import logger from '@wdio/logger' -import { promises as fsPromises } from 'node:fs' -import { readFileSync, writeFileSync } from 'node:fs' +import { promises as fsPromises, readFileSync, writeFileSync } from 'node:fs' import * as utils from '../helpers/utils.js' import * as rectangles from './rectangles.js' import * as processDiffPixels from './processDiffPixels.js' diff --git a/packages/image-comparison-core/src/methods/images.interfaces.ts b/packages/image-comparison-core/src/methods/images.interfaces.ts index 11a6ff07..bdafd41d 100644 --- a/packages/image-comparison-core/src/methods/images.interfaces.ts +++ b/packages/image-comparison-core/src/methods/images.interfaces.ts @@ -1,7 +1,6 @@ -import type { RectanglesOutput } from './rectangles.interfaces.js' +import type { RectanglesOutput, DeviceRectangles } from './rectangles.interfaces.js' import type { BaseCoordinates, BaseDeviceInfo, BaseDimensions, BaseImageCompareOptions, BaseMobileBlockOutOptions, Folders } from '../base.interfaces.js' import type { TestContext } from './compareReport.interfaces.js' -import type { DeviceRectangles } from './rectangles.interfaces.js' import type { WicElement } from 'src/index.js' export interface ResizeDimensions { diff --git a/packages/image-comparison-core/src/methods/images.ts b/packages/image-comparison-core/src/methods/images.ts index 2d5bd775..578cc018 100644 --- a/packages/image-comparison-core/src/methods/images.ts +++ b/packages/image-comparison-core/src/methods/images.ts @@ -1,6 +1,5 @@ import { fileURLToPath } from 'node:url' -import { readFileSync, writeFileSync } from 'node:fs' -import { promises as fsPromises, constants } from 'node:fs' +import { readFileSync, writeFileSync, promises as fsPromises, constants } from 'node:fs' import { dirname, join } from 'node:path' import { Jimp, JimpMime } from 'jimp' import logger from '@wdio/logger' diff --git a/packages/image-comparison-core/src/methods/processDiffPixels.ts b/packages/image-comparison-core/src/methods/processDiffPixels.ts index 05200b3c..4ac86995 100644 --- a/packages/image-comparison-core/src/methods/processDiffPixels.ts +++ b/packages/image-comparison-core/src/methods/processDiffPixels.ts @@ -46,8 +46,7 @@ import logger from '@wdio/logger' import type { Pixel, WicImageCompareOptions } from 'src/methods/images.interfaces.js' -import type { BoundingBox } from './rectangles.interfaces.js' -import type { IgnoreBoxes } from './rectangles.interfaces.js' +import type { BoundingBox, IgnoreBoxes } from './rectangles.interfaces.js' import type { CompareData } from '../resemble/compare.interfaces.js' import { saveBase64Image, addBlockOuts } from './images.js' diff --git a/packages/image-comparison-core/src/methods/screenshots.interfaces.ts b/packages/image-comparison-core/src/methods/screenshots.interfaces.ts index 4f580919..a2ca7436 100644 --- a/packages/image-comparison-core/src/methods/screenshots.interfaces.ts +++ b/packages/image-comparison-core/src/methods/screenshots.interfaces.ts @@ -1,5 +1,4 @@ -import type { DeviceRectangles } from './rectangles.interfaces.js' -import type { RectanglesOutput } from './rectangles.interfaces.js' +import type { DeviceRectangles, RectanglesOutput } from './rectangles.interfaces.js' // === UNIVERSAL BASE INTERFACES === diff --git a/packages/visual-reporter/app/components/SelectHeader.tsx b/packages/visual-reporter/app/components/SelectHeader.tsx index 23bcfe62..73b52707 100644 --- a/packages/visual-reporter/app/components/SelectHeader.tsx +++ b/packages/visual-reporter/app/components/SelectHeader.tsx @@ -1,8 +1,6 @@ 'use client' -import type { MultiValue, SingleValue, StylesConfig } from 'react-select' -import { components } from 'react-select' -import Select from 'react-select' +import Select, { components, type MultiValue, type SingleValue, type StylesConfig } from 'react-select' import type { OptionType, SelectedOptions, diff --git a/packages/visual-service/tests/reporter.test.ts b/packages/visual-service/tests/reporter.test.ts index ae37ee00..89db875f 100644 --- a/packages/visual-service/tests/reporter.test.ts +++ b/packages/visual-service/tests/reporter.test.ts @@ -1,7 +1,6 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import fs from 'node:fs' -import path from 'node:path' -import { join } from 'node:path' +import path, { join } from 'node:path' import logger from '@wdio/logger' import VisualReportGenerator from '../src/reporter.js' import { jsonFileContent } from './reporter.tests.mockdata.js'