Skip to content

Commit

Permalink
ESLint: add sort-imports
Browse files Browse the repository at this point in the history
  • Loading branch information
qmonmert committed Feb 7, 2025
1 parent 7a683e6 commit ec57191
Show file tree
Hide file tree
Showing 23 changed files with 42 additions and 36 deletions.
6 changes: 6 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ export default typescript.config(
parserOptions: { parser: '@typescript-eslint/parser' },
},
},
{
files: ['src/*/webapp/**/*.ts'],
rules: {
'sort-imports': ['error', { ignoreDeclarationSort: true }],
},
},
{
files: ['src/*/webapp/**/*.vue', 'src/*/webapp/**/*.ts'],
rules: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IconVue } from '@/shared/icon/infrastructure/primary';
import { defineComponent, onMounted, PropType, ref, Ref } from 'vue';
import { PropType, Ref, defineComponent, onMounted, ref } from 'vue';

export default defineComponent({
name: 'LandscapeMiniMapComponentVue',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LandscapeModule } from '@/module/domain/landscape/LandscapeModule';
import { IconVue } from '@/shared/icon/infrastructure/primary';
import { defineComponent, PropType } from 'vue';
import { PropType, defineComponent } from 'vue';

export default defineComponent({
name: 'LandscapeComponentVue',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { APPLICATION_LISTENER, CURSOR_UPDATER, inject } from '@/injections';
import {
LANDSCAPE_SCROLLER,
MODULE_PARAMETERS_REPOSITORY,
MODULES_REPOSITORY,
MODULE_PARAMETERS_REPOSITORY,
PROJECT_FOLDERS_REPOSITORY,
} from '@/module/application/ModuleProvider';
import { AnchorPointState } from '@/module/domain/AnchorPointState';
Expand All @@ -23,7 +23,7 @@ import { ALERT_BUS } from '@/shared/alert/application/AlertProvider';
import { IconVue } from '@/shared/icon/infrastructure/primary';
import { Loader } from '@/shared/loader/infrastructure/primary/Loader';
import { Optional } from '@/shared/optional/domain/Optional';
import { computed, defineComponent, nextTick, onBeforeUnmount, onMounted, Ref, ref } from 'vue';
import { Ref, computed, defineComponent, nextTick, onBeforeUnmount, onMounted, ref } from 'vue';
import { castValue, empty } from '../PropertyValue';
import { LandscapeLoaderVue } from '../landscape-loader';
import { LandscapeMiniMapVue } from '../landscape-minimap';
Expand All @@ -32,8 +32,8 @@ import { LandscapePresetConfigurationVue } from '../landscape-preset-configurati
import { ModulePropertiesFormVue } from '../module-properties-form';
import { ProjectActionsVue } from '../project-actions';
import { DisplayMode } from './DisplayMode';
import { buildConnector, LandscapeConnector } from './LandscapeConnector';
import { emptyLandscapeSize, LandscapeConnectorsSize } from './LandscapeConnectorsSize';
import { LandscapeConnector, buildConnector } from './LandscapeConnector';
import { LandscapeConnectorsSize, emptyLandscapeSize } from './LandscapeConnectorsSize';
import { LandscapeNavigation } from './LandscapeNavigation';

export default defineComponent({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ModuleParameterType } from '@/module/domain/ModuleParameters';
import { ModulePropertyDefinition } from '@/module/domain/ModulePropertyDefinition';
import { defineComponent, PropType } from 'vue';
import { PropType, defineComponent } from 'vue';
import { ModulePropertiesType } from '../ModulePropertiesType';
import { notEmpty } from '../PropertyValue';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ModuleParameter } from '@/module/domain/ModuleParameter';
import { ModuleParameterType } from '@/module/domain/ModuleParameters';
import { ModulePropertyDefinition } from '@/module/domain/ModulePropertyDefinition';
import { ModulePropertyKey } from '@/module/domain/ModulePropertyKey';
import { defineComponent, PropType } from 'vue';
import { PropType, defineComponent } from 'vue';
import { empty } from '../PropertyValue';

export default defineComponent({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { inject } from '@/injections';
import { MODULE_PARAMETERS_REPOSITORY, MODULES_REPOSITORY, PROJECT_FOLDERS_REPOSITORY } from '@/module/application/ModuleProvider';
import { MODULES_REPOSITORY, MODULE_PARAMETERS_REPOSITORY, PROJECT_FOLDERS_REPOSITORY } from '@/module/application/ModuleProvider';
import { ModuleParameter } from '@/module/domain/ModuleParameter';
import { ModulePropertyDefinition } from '@/module/domain/ModulePropertyDefinition';
import { ModulePropertyKey } from '@/module/domain/ModulePropertyKey';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ThemeRepository } from '../domain/ThemeRepository';
import { getMediaPreference, ThemePreference as Theme } from './GetMediaPreference';
import { ThemePreference as Theme, getMediaPreference } from './GetMediaPreference';

const THEME_STORAGE_KEY = 'theme';

Expand Down
8 changes: 4 additions & 4 deletions src/main/webapp/app/module/secondary/RestModulesRepository.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Presets } from '@/module/domain/Presets';
import { mapToPresets, RestPresets } from '@/module/secondary/RestPresets';
import { RestPresets, mapToPresets } from '@/module/secondary/RestPresets';
import { AxiosHttp } from '@/shared/http/infrastructure/secondary/AxiosHttp';
import { Optional } from '@/shared/optional/domain/Optional';
import { AxiosResponse, RawAxiosRequestConfig } from 'axios';
Expand All @@ -12,11 +12,11 @@ import { ModuleToApply } from '../domain/ModuleToApply';
import { Project } from '../domain/Project';
import { ProjectFolder } from '../domain/ProjectFolder';
import { ProjectHistory } from '../domain/ProjectHistory';
import { mapToLandscape, RestLandscape } from './RestLandscape';
import { mapToModules, RestModules } from './RestModules';
import { RestLandscape, mapToLandscape } from './RestLandscape';
import { RestModules, mapToModules } from './RestModules';
import { RestModulesToApply, toRestModulesToApply } from './RestModulesToApply';
import { RestModuleToApply, toRestModuleToApply } from './RestModuleToApply';
import { mapToModuleHistory, RestProjectHistory } from './RestProjectHistory';
import { RestProjectHistory, mapToModuleHistory } from './RestProjectHistory';

export class RestModulesRepository implements ModulesRepository {
constructor(private readonly axiosInstance: AxiosHttp) {}
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/module/secondary/RestPreset.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Preset } from '@/module/domain/Preset';
import { mapPresetModulesToApply, RestPresetModuleToApply } from './RestPresetModuleToApply';
import { RestPresetModuleToApply, mapPresetModulesToApply } from './RestPresetModuleToApply';

export interface RestPreset {
name: string;
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/module/secondary/RestPresets.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Presets } from '@/module/domain/Presets';
import { AxiosResponse } from 'axios';
import { mapToPreset, RestPreset } from './RestPreset';
import { RestPreset, mapToPreset } from './RestPreset';

export interface RestPresets {
presets: RestPreset[];
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/module/secondary/RestProjectHistory.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AxiosResponse } from 'axios';
import { ModuleParameterType } from '../domain/ModuleParameters';
import { ModulePropertyValue, ProjectHistory } from '../domain/ProjectHistory';
import { mapAppliedModules, RestAppliedModule } from './RestAppliedModule';
import { RestAppliedModule, mapAppliedModules } from './RestAppliedModule';

export interface RestProjectHistory {
modules?: RestAppliedModule[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { IconVue } from '@/shared/icon/infrastructure/primary';
import { TIMEOUT } from '@/shared/toast/application/ToastProvider';
import { ToastMessage } from '@/shared/toast/infrastructure/primary/ToastMessage';
import { ToastType } from '@/shared/toast/infrastructure/primary/ToastType';
import { defineComponent, onBeforeUnmount, onMounted, ref, Ref } from 'vue';
import { Ref, defineComponent, onBeforeUnmount, onMounted, ref } from 'vue';

const WORD_TIME_MS = 300;
const TOAST_ATTENTION_MS = 1500;
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/unit/common/primary/header/Header.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { provide } from '@/injections';
import { MANAGEMENT_REPOSITORY, THEMES_REPOSITORY } from '@/module/application/ModuleProvider';
import { HeaderVue } from '@/shared/header/infrastructure/primary';
import { mount, VueWrapper } from '@vue/test-utils';
import { VueWrapper, mount } from '@vue/test-utils';
import { describe, expect, it } from 'vitest';
import { ManagementRepositoryStub, stubLocalManagementRepository } from '../../../module/domain/ManagementRepository.fixture';
import { LocalWindowThemeRepositoryStub, stubLocalWindowThemeRepository } from '../../../module/domain/ThemeRepository.fixture';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Timeoutable, TimeoutListener } from '@/shared/toast/domain/Timeout';
import { TimeoutListener, Timeoutable } from '@/shared/toast/domain/Timeout';
import sinon, { SinonStub } from 'sinon';

interface TimeoutListenerStub extends TimeoutListener {
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/unit/common/primary/toast/Toast.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TIMEOUT } from '@/shared/toast/application/ToastProvider';
import { TimeoutListener } from '@/shared/toast/domain/Timeout';
import { ToastVue } from '@/shared/toast/infrastructure/primary';
import { ToastType } from '@/shared/toast/infrastructure/primary/ToastType';
import { shallowMount, VueWrapper } from '@vue/test-utils';
import { VueWrapper, shallowMount } from '@vue/test-utils';
import { describe, expect, it, vi } from 'vitest';
import { AlertListenerFixture, stubAlertListener } from '../../../shared/alert/domain/AlertListener.fixture';
import { stubTimeout } from '../timeout/Timeout.fixture';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { APPLICATION_LISTENER, CURSOR_UPDATER, GLOBAL_WINDOW, provide } from '@/injections';
import {
LANDSCAPE_SCROLLER,
MODULE_PARAMETERS_REPOSITORY,
MODULES_REPOSITORY,
MODULE_PARAMETERS_REPOSITORY,
PROJECT_FOLDERS_REPOSITORY,
} from '@/module/application/ModuleProvider';
import { ModuleParametersRepository } from '@/module/domain/ModuleParametersRepository';
Expand All @@ -15,13 +15,13 @@ import { BodyCursorUpdater } from '@/module/primary/landscape/BodyCursorUpdater'
import { LandscapeScroller } from '@/module/primary/landscape/LandscapeScroller';
import { ALERT_BUS } from '@/shared/alert/application/AlertProvider';
import { ApplicationListener } from '@/shared/alert/infrastructure/primary/ApplicationListener';
import { DOMWrapper, flushPromises, mount, VueWrapper } from '@vue/test-utils';
import { DOMWrapper, VueWrapper, flushPromises, mount } from '@vue/test-utils';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { stubAlertBus } from '../../../shared/alert/domain/AlertBus.fixture';
import { wrappedElement } from '../../../WrappedElement';
import { defaultLandscape } from '../../domain/landscape/Landscape.fixture';
import { ModuleParametersRepositoryStub, stubModuleParametersRepository } from '../../domain/ModuleParameters.fixture';
import { defaultPresets, ModulesRepositoryStub, projectHistoryWithInit, stubModulesRepository } from '../../domain/Modules.fixture';
import { ModulesRepositoryStub, defaultPresets, projectHistoryWithInit, stubModulesRepository } from '../../domain/Modules.fixture';
import { ProjectFoldersRepositoryStub, stubProjectFoldersRepository } from '../../domain/ProjectFolders.fixture';
import { stubWindow } from '../GlobalWindow.fixture';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { provide } from '@/injections';
import { MODULES_REPOSITORY } from '@/module/application/ModuleProvider';
import { LandscapePresetConfigurationVue } from '@/module/primary/landscape-preset-configuration';
import { flushPromises, mount, VueWrapper } from '@vue/test-utils';
import { VueWrapper, flushPromises, mount } from '@vue/test-utils';
import { describe, expect, it, vi } from 'vitest';
import { wrappedElement } from '../../../WrappedElement';
import { defaultPresets, ModulesRepositoryStub, stubModulesRepository } from '../../domain/Modules.fixture';
import { ModulesRepositoryStub, defaultPresets, stubModulesRepository } from '../../domain/Modules.fixture';

const wrap = (modulesRepository: ModulesRepositoryStub): VueWrapper => {
provide(MODULES_REPOSITORY, modulesRepository);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import { GLOBAL_WINDOW, provide } from '@/injections';
import { MODULE_PARAMETERS_REPOSITORY, MODULES_REPOSITORY, PROJECT_FOLDERS_REPOSITORY } from '@/module/application/ModuleProvider';
import { MODULES_REPOSITORY, MODULE_PARAMETERS_REPOSITORY, PROJECT_FOLDERS_REPOSITORY } from '@/module/application/ModuleProvider';
import { Module } from '@/module/domain/Module';
import { ModuleParametersRepository } from '@/module/domain/ModuleParametersRepository';
import { Modules } from '@/module/domain/Modules';
import { ModulesRepository } from '@/module/domain/ModulesRepository';
import { ProjectFoldersRepository } from '@/module/domain/ProjectFoldersRepository';
import { ModulesVue } from '@/module/primary/modules-patch';
import { ALERT_BUS } from '@/shared/alert/application/AlertProvider';
import { flushPromises, mount, VueWrapper } from '@vue/test-utils';
import { VueWrapper, flushPromises, mount } from '@vue/test-utils';
import { describe, expect, it } from 'vitest';
import { wrappedElement } from '../../../WrappedElement';
import { stubAlertBus } from '../../../shared/alert/domain/AlertBus.fixture';
import { ModuleParametersRepositoryStub, stubModuleParametersRepository } from '../../domain/ModuleParameters.fixture';
import {
ModulesRepositoryStub,
defaultModules,
defaultModulesWithNonDefaultProperties,
defaultProjectHistory,
moduleSlug,
ModulesRepositoryStub,
stubModulesRepository,
} from '../../domain/Modules.fixture';
import { ProjectFoldersRepositoryStub, stubProjectFoldersRepository } from '../../domain/ProjectFolders.fixture';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { MODULES_REPOSITORY } from '@/module/application/ModuleProvider';
import { ModulesRepository } from '@/module/domain/ModulesRepository';
import { ProjectActionsVue } from '@/module/primary/project-actions';
import { ALERT_BUS } from '@/shared/alert/application/AlertProvider';
import { flushPromises, shallowMount, VueWrapper } from '@vue/test-utils';
import { VueWrapper, flushPromises, shallowMount } from '@vue/test-utils';
import { describe, expect, it, vi } from 'vitest';
import { stubAlertBus } from '../../../shared/alert/domain/AlertBus.fixture';
import { wrappedElement } from '../../../WrappedElement';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import { describe, expect, it } from 'vitest';
import { dataBackendResponse, stubAxiosHttp } from '../../http/AxiosHttpStub';
import { defaultLandscape } from '../domain/landscape/Landscape.fixture';
import {
defaultModuleToApply,
defaultModules,
defaultModulesToApply,
defaultModuleToApply,
defaultPresets,
defaultProjectHistory,
moduleSlug,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppVue } from '@/root/infrastructure/primary';
import { shallowMount, type VueWrapper } from '@vue/test-utils';
import { type VueWrapper, shallowMount } from '@vue/test-utils';
import { describe, expect, it } from 'vitest';

let wrapper: VueWrapper;
Expand Down
8 changes: 4 additions & 4 deletions src/test/webapp/unit/router/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { APPLICATION_LISTENER, CURSOR_UPDATER, GLOBAL_WINDOW, provide } from '@/
import {
LANDSCAPE_SCROLLER,
MANAGEMENT_REPOSITORY,
MODULE_PARAMETERS_REPOSITORY,
MODULES_REPOSITORY,
MODULE_PARAMETERS_REPOSITORY,
PROJECT_FOLDERS_REPOSITORY,
THEMES_REPOSITORY,
} from '@/module/application/ModuleProvider';
Expand All @@ -20,18 +20,18 @@ import { AlertListener } from '@/shared/alert/domain/AlertListener';
import { ApplicationListener } from '@/shared/alert/infrastructure/primary/ApplicationListener';
import { TIMEOUT } from '@/shared/toast/application/ToastProvider';
import { TimeoutListener } from '@/shared/toast/domain/Timeout';
import { flushPromises, mount, VueWrapper } from '@vue/test-utils';
import { VueWrapper, flushPromises, mount } from '@vue/test-utils';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { createRouter, createWebHistory, Router } from 'vue-router';
import { Router, createRouter, createWebHistory } from 'vue-router';
import { stubTimeout } from '../common/primary/timeout/Timeout.fixture';
import { defaultLandscape } from '../module/domain/landscape/Landscape.fixture';
import { ManagementRepositoryStub, stubLocalManagementRepository } from '../module/domain/ManagementRepository.fixture';
import { ModuleParametersRepositoryStub, stubModuleParametersRepository } from '../module/domain/ModuleParameters.fixture';
import {
ModulesRepositoryStub,
applicationBaseNamePropertyDefinition,
defaultPresets,
moduleSlug,
ModulesRepositoryStub,
optionalBooleanPropertyDefinition,
stubModulesRepository,
} from '../module/domain/Modules.fixture';
Expand Down

0 comments on commit ec57191

Please sign in to comment.