fix: apply ordered-import rule on multiline import statements (#1344)

eslint-rules/src/rules/ordered-imports.ts

@@ -35,7 +35,14 @@ const orderedImportsRule: TSESLint.RuleModule<keyof typeof messages> = {
         .map(imp => context.getSourceCode().getText(imp))
         .sort();
 
-      return nodeText.replace(/\{.*\}/, `{ ${sortedNamedImports.join(', ')} }`);
+      if (/\{.*\}/.test(nodeText)) {
+        return nodeText.replace(/\{.*\}/, `{ ${sortedNamedImports.join(', ')} }`);
+      }
+
+      return nodeText.replace(
+        /\{(.|\n)*\}/,
+        `{${lineEnding}  ${sortedNamedImports.join(`,${lineEnding}  `)},${lineEnding}}`
+      );
     }
 
     const importDeclarations: TSESTree.ImportDeclaration[] = [];

src/app/core/facades/account.facade.ts

@@ -15,11 +15,11 @@ import { MessagesPayloadType } from 'ish-core/store/core/messages';
 import {
   createCustomerAddress,
   deleteCustomerAddress,
-  updateCustomerAddress,
   getAddressesError,
   getAddressesLoading,
   getAllAddresses,
   loadAddresses,
+  updateCustomerAddress,
 } from 'ish-core/store/customer/addresses';
 import { getUserRoles } from 'ish-core/store/customer/authorization';
 import {

src/app/core/store/core/configuration/configuration.effects.ts

@@ -16,8 +16,8 @@ import { distinctCompareWith, mapToPayload, whenTruthy } from 'ish-core/utils/op
 import { StatePropertiesService } from 'ish-core/utils/state-transfer/state-properties.service';
 
 import {
-  applyConfiguration,
   ConfigurationType,
+  applyConfiguration,
   loadSingleServerTranslation,
   loadSingleServerTranslationSuccess,
 } from './configuration.actions';

src/app/core/store/customer/addresses/addresses.effects.spec.ts

@@ -21,11 +21,11 @@ import {
   deleteCustomerAddress,
   deleteCustomerAddressFail,
   deleteCustomerAddressSuccess,
+  loadAddresses,
+  loadAddressesSuccess,
   updateCustomerAddress,
   updateCustomerAddressFail,
   updateCustomerAddressSuccess,
-  loadAddresses,
-  loadAddressesSuccess,
 } from './addresses.actions';
 import { AddressesEffects } from './addresses.effects';
 

src/app/core/store/customer/addresses/addresses.effects.ts

@@ -12,15 +12,15 @@ import {
   createCustomerAddress,
   createCustomerAddressFail,
   createCustomerAddressSuccess,
-  updateCustomerAddress,
-  updateCustomerAddressFail,
-  updateCustomerAddressSuccess,
   deleteCustomerAddress,
   deleteCustomerAddressFail,
   deleteCustomerAddressSuccess,
   loadAddresses,
   loadAddressesFail,
   loadAddressesSuccess,
+  updateCustomerAddress,
+  updateCustomerAddressFail,
+  updateCustomerAddressSuccess,
 } from './addresses.actions';
 
 @Injectable()

src/app/core/store/customer/basket/basket-items.effects.spec.ts

@@ -31,10 +31,10 @@ import {
   loadBasketSuccess,
   updateBasketItem,
   updateBasketItemFail,
+  updateBasketItemSuccess,
   updateBasketItems,
   updateBasketItemsFail,
   updateBasketItemsSuccess,
-  updateBasketItemSuccess,
   validateBasket,
 } from './basket.actions';
 

src/app/core/store/customer/basket/basket-items.effects.ts

@@ -38,10 +38,10 @@ import {
   loadBasket,
   updateBasketItem,
   updateBasketItemFail,
+  updateBasketItemSuccess,
   updateBasketItems,
   updateBasketItemsFail,
   updateBasketItemsSuccess,
-  updateBasketItemSuccess,
   validateBasket,
 } from './basket.actions';
 import { getCurrentBasket, getCurrentBasketId } from './basket.selectors';

src/app/core/store/customer/basket/basket.reducer.ts

@@ -73,10 +73,10 @@ import {
   updateBasketFail,
   updateBasketItem,
   updateBasketItemFail,
+  updateBasketItemSuccess,
   updateBasketItems,
   updateBasketItemsFail,
   updateBasketItemsSuccess,
-  updateBasketItemSuccess,
   updateBasketPayment,
   updateBasketPaymentFail,
   updateBasketPaymentSuccess,

src/app/core/store/shopping/products/products.effects.ts

@@ -48,14 +48,14 @@ import {
   loadProductLinksSuccess,
   loadProductParts,
   loadProductPartsSuccess,
-  loadProductsForCategory,
-  loadProductsForCategoryFail,
-  loadProductsForMaster,
-  loadProductsForMasterFail,
   loadProductSuccess,
   loadProductVariationsFail,
   loadProductVariationsIfNotLoaded,
   loadProductVariationsSuccess,
+  loadProductsForCategory,
+  loadProductsForCategoryFail,
+  loadProductsForMaster,
+  loadProductsForMasterFail,
 } from './products.actions';
 import {
   getBreadcrumbForProductPage,

src/app/core/utils/operators.ts

@@ -7,9 +7,9 @@ import {
   OperatorFunction,
   combineLatest,
   concat,
+  connect,
   of,
   throwError,
-  connect,
 } from 'rxjs';
 import { buffer, catchError, distinctUntilChanged, filter, map, mergeAll, take, withLatestFrom } from 'rxjs/operators';
 

src/app/extensions/captcha/exports/lazy-captcha/lazy-captcha.component.ts

@@ -2,13 +2,13 @@ import {
   AfterViewInit,
   ChangeDetectionStrategy,
   Component,
-  createNgModule,
   Injector,
   Input,
   OnDestroy,
   OnInit,
   ViewChild,
   ViewContainerRef,
+  createNgModule,
 } from '@angular/core';
 import { AbstractControl, FormArray, FormGroup, Validators } from '@angular/forms';
 import { Subject } from 'rxjs';

src/app/extensions/quoting/store/quoting/quoting.effects.ts

@@ -32,6 +32,9 @@ import {
   createQuoteRequestFromQuoteRequest,
   createQuoteRequestFromQuoteRequestSuccess,
   createQuoteRequestFromQuoteSuccess,
+  deleteQuoteFromBasket,
+  deleteQuoteFromBasketFail,
+  deleteQuoteFromBasketSuccess,
   deleteQuotingEntity,
   deleteQuotingEntityFail,
   deleteQuotingEntitySuccess,
@@ -46,9 +49,6 @@ import {
   submitQuoteRequestSuccess,
   updateQuoteRequest,
   updateQuoteRequestSuccess,
-  deleteQuoteFromBasket,
-  deleteQuoteFromBasketSuccess,
-  deleteQuoteFromBasketFail,
 } from './quoting.actions';
 import { getQuotingEntity } from './quoting.selectors';