Merge branch 'master' into #736-block-some-tools-if-they-are-applied-…

…to-FG

# Conflicts:
#	packages/ketcher-react/src/script/editor/tool/apoint.js
#	packages/ketcher-react/src/script/editor/tool/chain.js
#	packages/ketcher-react/src/script/editor/tool/charge.js
#	packages/ketcher-react/src/script/editor/tool/eraser.js
#	packages/ketcher-react/src/script/editor/tool/rgroupatom.js

packages/ketcher-core/package.json

@@ -29,7 +29,7 @@
     "node": ">=10"
   },
   "scripts": {
-    "build": "cross-env NODE_ENV=production rollup -c -m true --silent",
+    "build": "cross-env NODE_ENV=production rollup -c -m true",
     "start": "cross-env NODE_ENV=development rollup -c -m true -w",
     "test": "run-s prettier test:lint test:unit",
     "test:lint": "eslint src --ext .ts,.tsx,.js,.jsx",

packages/ketcher-react/src/script/editor/shared/action.ts → packages/ketcher-core/src/application/editor/actions/action.ts

@@ -15,11 +15,11 @@
  ***************************************************************************/
 
 import { BaseOperation } from '../operations/base'
-import { ReStruct } from 'ketcher-core'
+import { ReStruct } from '../../render'
 //
 // Undo/redo actions
 //
-class Action {
+export class Action {
   operations: BaseOperation[]
 
   constructor(operations = []) {
@@ -62,5 +62,3 @@ class Action {
     )
   }
 }
-
-export default Action

packages/ketcher-react/src/script/editor/actions/aromatic-fusing.js → packages/ketcher-core/src/application/editor/actions/aromatic-fusing.js

@@ -14,10 +14,10 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Bond, MolSerializer } from 'ketcher-core'
-
-import Action from '../shared/action'
+import { Action } from './action'
+import { Bond } from 'domain/entities'
 import { BondAttr } from '../operations'
+import { MolSerializer } from 'domain/serializers'
 
 /**
  * @param restruct { ReStruct }

packages/ketcher-react/src/script/editor/actions/atom.js → packages/ketcher-core/src/application/editor/actions/atom.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Atom, Bond, RGroup } from 'ketcher-core'
+import { Atom, Bond, RGroup } from 'domain/entities'
 import {
   AtomAdd,
   AtomAttr,
@@ -33,7 +33,7 @@ import { atomGetAttr, atomGetDegree, atomGetSGroups } from './utils'
 import { fromRGroupFragment, fromUpdateIfThen } from './rgroup'
 import { removeAtomFromSgroupIfNeeded, removeSgroupIfNeeded } from './sgroup'
 
-import Action from '../shared/action'
+import { Action } from './action'
 import { fromBondStereoUpdate } from './bond'
 import { without } from 'lodash/fp'
 

packages/ketcher-react/src/script/editor/actions/basic.js → packages/ketcher-core/src/application/editor/actions/basic.js

@@ -16,7 +16,7 @@
 
 import { AlignDescriptors, CanvasLoad } from '../operations'
 
-import Action from '../shared/action'
+import { Action } from './action'
 
 export function fromNewCanvas(restruct, struct) {
   var action = new Action()

packages/ketcher-react/src/script/editor/actions/bond.ts → packages/ketcher-core/src/application/editor/actions/bond.ts

@@ -18,12 +18,10 @@ import {
   Atom,
   Bond,
   Neighbor,
-  ReStruct,
   StereoLabel,
-  StereoValidator,
   Struct,
   Vec2
-} from 'ketcher-core'
+} from 'domain/entities'
 import {
   AtomAdd,
   AtomAttr,
@@ -42,7 +40,9 @@ import {
   mergeSgroups
 } from './atom'
 
-import Action from '../shared/action'
+import { Action } from './action'
+import { ReStruct } from '../../render'
+import { StereoValidator } from 'domain/helpers'
 import utils from '../shared/utils'
 
 export function fromBondAddition(

packages/ketcher-react/src/script/editor/actions/chain.js → packages/ketcher-core/src/application/editor/actions/chain.js

@@ -16,8 +16,8 @@
 
 import { AtomAdd, FragmentAdd } from '../operations'
 
-import Action from '../shared/action'
-import { Vec2 } from 'ketcher-core'
+import { Action } from './action'
+import { Vec2 } from 'domain/entities'
 import { atomGetAttr } from './utils'
 import { fromBondAddition } from './bond'
 

packages/ketcher-react/src/script/editor/actions/closely-fusing.js → packages/ketcher-core/src/application/editor/actions/closely-fusing.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-import Action from '../shared/action'
+import { Action } from './action'
 import { fromAtomMerge } from './atom'
 import { fromBondsMerge } from './bond'
 import utils from '../shared/utils'

packages/ketcher-react/src/script/editor/actions/erase.js → packages/ketcher-core/src/application/editor/actions/erase.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Atom, Bond, RGroup } from 'ketcher-core'
+import { Atom, Bond, RGroup } from 'domain/entities'
 import {
   AtomAttr,
   AtomDelete,
@@ -31,7 +31,7 @@ import {
   removeSgroupIfNeeded
 } from './sgroup'
 
-import Action from '../shared/action'
+import { Action } from './action'
 import { Pile } from 'ketcher-core'
 import { atomGetDegree } from './utils'
 import { fromBondStereoUpdate } from '../actions/bond'

packages/ketcher-react/src/script/editor/actions/fragment.js → packages/ketcher-core/src/application/editor/actions/fragment.js

@@ -29,10 +29,10 @@ import {
   SimpleObjectMove,
   TextMove
 } from '../operations'
-import { Pile, RGroup, Vec2 } from 'ketcher-core'
+import { Pile, RGroup, Vec2 } from 'domain/entities'
 import { fromRGroupFragment, fromUpdateIfThen } from './rgroup'
 
-import Action from '../shared/action'
+import { Action } from './action'
 import { fromAtomsFragmentAttr } from './atom'
 import { getRelSgroupsBySelection } from './utils'
 
@@ -129,7 +129,7 @@ export function fromMultipleMove(restruct, lists, d) {
   return action.perform(restruct)
 }
 
-export function fromStereoFlagUpdate(restruct, frid, flag) {
+export function fromStereoFlagUpdate(restruct, frid, flag = null) {
   const action = new Action()
 
   if (!flag) {

packages/ketcher-core/src/application/editor/actions/index.ts

@@ -0,0 +1,18 @@
+export * from './action'
+export * from './aromatic-fusing'
+export * from './atom'
+export * from './basic'
+export * from './bond'
+export * from './chain'
+export * from './closely-fusing'
+export * from './erase'
+export * from './fragment'
+export * from './paste'
+export * from './reaction'
+export * from './rgroup'
+export * from './rotate'
+export * from './sgroup'
+export * from './simpleobject'
+export * from './template'
+export * from './text'
+export * from './utils'

packages/ketcher-react/src/script/editor/actions/paste.js → packages/ketcher-core/src/application/editor/actions/paste.js

@@ -27,8 +27,8 @@ import {
 } from '../operations'
 import { fromRGroupAttrs, fromUpdateIfThen } from './rgroup'
 
-import Action from '../shared/action'
-import { Vec2 } from 'ketcher-core'
+import { Action } from './action'
+import { Vec2 } from 'domain/entities'
 import { fromSgroupAddition } from './sgroup'
 
 export function fromPaste(restruct, pstruct, point, angle = 0) {

packages/ketcher-react/src/script/editor/actions/reaction.js → packages/ketcher-core/src/application/editor/actions/reaction.js

@@ -22,7 +22,7 @@ import {
   RxnPlusDelete
 } from '../operations'
 
-import Action from '../shared/action'
+import { Action } from './action'
 
 export function fromArrowAddition(restruct, pos, mode) {
   const action = new Action()

packages/ketcher-react/src/script/editor/actions/rgroup.js → packages/ketcher-core/src/application/editor/actions/rgroup.js

@@ -16,7 +16,7 @@
 
 import { RGroupAttr, RGroupFragment, UpdateIfThen } from '../operations'
 
-import Action from '../shared/action'
+import { Action } from './action'
 
 export function fromRGroupAttrs(restruct, id, attrs) {
   const action = new Action()

packages/ketcher-react/src/script/editor/actions/rotate.js → packages/ketcher-core/src/application/editor/actions/rotate.js

@@ -22,11 +22,10 @@ import {
   RxnPlusMove,
   SGroupDataMove
 } from '../operations'
-import { Bond, Pile, Vec2 } from 'ketcher-core'
+import { Bond, Fragment, Pile, Vec2 } from 'domain/entities'
 import { getRelSgroupsBySelection, structSelection } from './utils'
 
-import Action from '../shared/action'
-import { Fragment } from 'ketcher-core'
+import { Action } from './action'
 import utils from '../shared/utils'
 
 export function fromFlip(restruct, selection, dir, center) {

packages/ketcher-react/src/script/editor/actions/sgroup.js → packages/ketcher-core/src/application/editor/actions/sgroup.js

@@ -24,10 +24,10 @@ import {
   SGroupDelete,
   SGroupRemoveFromHierarchy
 } from '../operations'
-import { Pile, SGroup } from 'ketcher-core'
+import { Pile, SGroup } from 'domain/entities'
 import { atomGetAttr, atomGetDegree, atomGetSGroups } from './utils'
 
-import Action from '../shared/action'
+import { Action } from './action'
 import { SgContexts } from '../shared/constants'
 import { uniq } from 'lodash/fp'
 

packages/ketcher-react/src/script/editor/actions/simpleobject.ts → packages/ketcher-core/src/application/editor/actions/simpleobject.ts

@@ -20,7 +20,7 @@ import {
   SimpleObjectResize
 } from '../operations'
 
-import Action from '../shared/action'
+import { Action } from './action'
 
 export function fromSimpleObjectDeletion(restruct, id) {
   const action = new Action()

packages/ketcher-react/src/script/editor/actions/template.js → packages/ketcher-core/src/application/editor/actions/template.js

@@ -14,13 +14,13 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Atom, Vec2 } from 'ketcher-core'
+import { Atom, Vec2 } from 'domain/entities'
 import { AtomAdd, BondAdd, CalcImplicitH } from '../operations'
 import { atomForNewBond, atomGetAttr } from './utils'
 import { fromAtomsAttrs, mergeSgroups } from './atom'
 import { fromBondAddition, fromBondStereoUpdate, fromBondsAttrs } from './bond'
 
-import Action from '../shared/action'
+import { Action } from './action'
 import closest from '../shared/closest'
 import { fromAromaticTemplateOnBond } from './aromatic-fusing'
 import { fromPaste } from './paste'

packages/ketcher-react/src/script/editor/actions/text.ts → packages/ketcher-core/src/application/editor/actions/text.ts

@@ -14,10 +14,11 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { ReStruct, Vec2 } from 'ketcher-core'
 import { TextCreate, TextDelete, TextUpdate } from '../operations'
 
-import Action from '../shared/action'
+import { Action } from './action'
+import { ReStruct } from '../../render'
+import { Vec2 } from 'domain/entities'
 
 export function fromTextCreation(
   restruct: ReStruct,

packages/ketcher-react/src/script/editor/actions/utils.js → packages/ketcher-core/src/application/editor/actions/utils.js

@@ -14,8 +14,8 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Bond } from 'ketcher-core'
-import { Vec2 } from 'ketcher-core'
+import { Bond, Vec2 } from 'domain/entities'
+
 import closest from '../shared/closest'
 import { difference } from 'lodash'
 

packages/ketcher-core/src/application/editor/index.ts

@@ -13,5 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-
+export * from './operations'
+export * from './actions'
+export * from './shared/constants'
 export * from './editor.types'

packages/ketcher-react/src/script/editor/operations/CanvasLoad.ts → packages/ketcher-core/src/application/editor/operations/CanvasLoad.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { ReStruct, Struct } from 'ketcher-core'
-
 import { BaseOperation } from './base'
 import { OperationType } from './OperationType'
+import { ReStruct } from '../../render'
+import { Struct } from 'domain/entities'
 
 export class CanvasLoad extends BaseOperation {
   data: {

packages/ketcher-react/src/script/editor/operations/EnhancedFlagMove.ts → packages/ketcher-core/src/application/editor/operations/EnhancedFlagMove.ts

@@ -14,10 +14,11 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Fragment, ReStruct, Vec2 } from 'ketcher-core'
+import { Fragment, Vec2 } from 'domain/entities'
 
 import { BaseOperation } from './base'
 import { OperationType } from './OperationType'
+import { ReStruct } from '../../render'
 
 export class EnhancedFlagMove extends BaseOperation {
   data: {

packages/ketcher-react/src/script/editor/operations/FragmentStereoFlag.ts → packages/ketcher-core/src/application/editor/operations/FragmentStereoFlag.ts

@@ -16,7 +16,7 @@
 
 import { BaseOperation } from './base'
 import { OperationType } from './OperationType'
-import { ReStruct } from 'ketcher-core'
+import { ReStruct } from '../../render'
 
 export class FragmentStereoFlag extends BaseOperation {
   frid: number

packages/ketcher-react/src/script/editor/operations/LoopMove.ts → packages/ketcher-core/src/application/editor/operations/LoopMove.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { ReStruct, Scale } from 'ketcher-core'
-
 import { BaseOperation } from './base'
 import { OperationType } from './OperationType'
+import { ReStruct } from '../../render'
+import { Scale } from 'domain/helpers'
 
 export class LoopMove extends BaseOperation {
   data: {

packages/ketcher-react/src/script/editor/operations/Text/TextCreateDelete.ts → packages/ketcher-core/src/application/editor/operations/Text/TextCreateDelete.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { ReStruct, ReText, Text, Vec2 } from 'ketcher-core'
+import { ReStruct, ReText } from '../../../render'
+import { Text, Vec2 } from 'domain/entities'
 
 import { BaseOperation } from '../base'
 import { OperationType } from '../OperationType'

packages/ketcher-react/src/script/editor/operations/Text/TextMove.ts → packages/ketcher-core/src/application/editor/operations/Text/TextMove.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { ReStruct, Scale } from 'ketcher-core'
-
 import { BaseOperation } from '../base'
 import { OperationType } from '../OperationType'
+import { ReStruct } from '../../../render'
+import { Scale } from 'domain/helpers'
 
 interface TextMoveData {
   id: any

packages/ketcher-react/src/script/editor/operations/Text/TextUpdate.ts → packages/ketcher-core/src/application/editor/operations/Text/TextUpdate.ts

@@ -16,7 +16,7 @@
 
 import { BaseOperation } from '../base'
 import { OperationType } from '../OperationType'
-import { ReStruct } from 'ketcher-core'
+import { ReStruct } from '../../../render'
 
 interface TextUpdateData {
   id: number

packages/ketcher-react/src/script/editor/operations/atom/AtomAttr.ts → packages/ketcher-core/src/application/editor/operations/atom/AtomAttr.ts

@@ -16,7 +16,7 @@
 
 import { BaseOperation } from '../base'
 import { OperationType } from '../OperationType'
-import { ReStruct } from 'ketcher-core'
+import { ReStruct } from '../../../render'
 
 type Data = {
   aid?: any

packages/ketcher-react/src/script/editor/operations/atom/AtomMove.ts → packages/ketcher-core/src/application/editor/operations/atom/AtomMove.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { ReStruct, Scale } from 'ketcher-core'
-
 import { BaseOperation } from '../base'
 import { OperationType } from '../OperationType'
+import { ReStruct } from '../../../render'
+import { Scale } from 'domain/helpers'
 
 export class AtomMove extends BaseOperation {
   data: {