#2765 - refactor import statements for sGroupAttachmentPoint

epam · Jul 14, 2023 · acc7ae2 · acc7ae2
1 parent 5a16d11
commit acc7ae2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAttachmentPoints.ts b/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAttachmentPoints.ts
@@ -1,7 +1,7 @@
 import { BaseOperation } from '../base';
 import { OperationType } from '../OperationType';
 import { ReStruct } from '../../../render';
-import { SGroupAttachmentPoint } from 'domain/entities/sGroupAttachmentPoint';
+import { SGroupAttachmentPoint } from 'domain/entities';
 import assert from 'assert';
 
 type Data = {

diff --git a/packages/ketcher-core/src/domain/entities/index.ts b/packages/ketcher-core/src/domain/entities/index.ts
@@ -34,3 +34,4 @@ export * from './vec2';
 export * from './box2Abs';
 export * from './pool';
 export * from './highlight';
+export * from './sGroupAttachmentPoint';
diff --git a/packages/ketcher-core/src/domain/entities/sgroup.ts b/packages/ketcher-core/src/domain/entities/sgroup.ts
@@ -22,10 +22,9 @@ import { Struct } from './struct';
 import { SaltsAndSolventsProvider } from '../helpers';
 import { Vec2 } from './vec2';
 import { ReStruct } from '../../application/render';
-import { Pool } from 'domain/entities/pool';
+import { Pool, SGroupAttachmentPoint } from 'domain/entities';
 import { ReSGroup } from 'application/render';
 import { SgContexts } from 'application/editor/shared/constants';
-import { SGroupAttachmentPoint } from 'domain/entities/sGroupAttachmentPoint';
 import assert from 'assert';
 
 export class SGroupBracketParams {

diff --git a/packages/ketcher-core/src/domain/serializers/ket/fromKet/moleculeToStruct.ts b/packages/ketcher-core/src/domain/serializers/ket/fromKet/moleculeToStruct.ts
@@ -14,11 +14,16 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Atom, Bond, SGroup, Struct } from 'domain/entities';
+import {
+  Atom,
+  Bond,
+  SGroup,
+  Struct,
+  SGroupAttachmentPoint,
+} from 'domain/entities';
 
 import { Elements } from 'domain/constants';
 import { ifDef } from 'utilities';
-import { SGroupAttachmentPoint } from 'domain/entities/sGroupAttachmentPoint';
 import { mergeFragmentsToStruct } from './mergeFragmentsToStruct';
 
 export function toRlabel(values) {

diff --git a/packages/ketcher-core/src/domain/serializers/ket/toKet/moleculeToKet.ts b/packages/ketcher-core/src/domain/serializers/ket/toKet/moleculeToKet.ts
@@ -14,10 +14,9 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { SGroup, Struct } from 'domain/entities';
+import { SGroup, Struct, SGroupAttachmentPoint } from 'domain/entities';
 
 import { ifDef } from 'utilities';
-import { SGroupAttachmentPoint } from 'domain/entities/sGroupAttachmentPoint';
 
 function fromRlabel(rg) {
   const res: Array<any> = [];

diff --git a/packages/ketcher-core/src/domain/serializers/mol/molfile.ts b/packages/ketcher-core/src/domain/serializers/mol/molfile.ts
@@ -14,12 +14,11 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { StereoFlag, Struct } from 'domain/entities';
+import { StereoFlag, Struct, SGroupAttachmentPoint } from 'domain/entities';
 
 import { Elements } from 'domain/constants';
 import common from './common';
 import utils from './utils';
-import { SGroupAttachmentPoint } from 'domain/entities/sGroupAttachmentPoint';
 
 const END_V2000 = '2D 1   1.00000     0.00000     0';
 

diff --git a/packages/ketcher-core/src/domain/serializers/mol/parseSGroup.js b/packages/ketcher-core/src/domain/serializers/mol/parseSGroup.js
@@ -14,10 +14,9 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Pool, SGroup, Vec2 } from 'domain/entities';
+import { Pool, SGroup, Vec2, SGroupAttachmentPoint } from 'domain/entities';
 
 import utils from './utils';
-import { SGroupAttachmentPoint } from 'domain/entities/sGroupAttachmentPoint';
 import assert from 'assert';
 
 /**