Combine some files to avoid circular dependencies

Author: garrettjstevens

…hared/src/Changes/DeleteFeatureChange.ts …rc/Changes/AddAndDeleteFeatureChanges.tspackages/apollo-shared/src/Changes/DeleteFeatureChange.ts renamed to packages/apollo-shared/src/Changes/AddAndDeleteFeatureChanges.ts packages/apollo-shared/src/Changes/DeleteFeatureChange.ts renamed to packages/apollo-shared/src/Changes/AddAndDeleteFeatureChanges.ts

@@ -8,7 +8,29 @@ import {
 import type { AnnotationFeatureSnapshot } from '@apollo-annotation/mst'
 import type { Feature } from '@apollo-annotation/schemas'
 
-import { AddFeatureChange } from './AddFeatureChange.js'
+interface SerializedAddFeatureChangeBase extends SerializedFeatureChange {
+  typeName: 'AddFeatureChange'
+}
+
+export interface AddFeatureChangeDetails {
+  addedFeature: AnnotationFeatureSnapshot
+  parentFeatureId?: string // Parent feature to where feature will be added
+  copyFeature?: boolean // Are we copying or adding a new child feature
+  allIds?: string[]
+}
+
+interface SerializedAddFeatureChangeSingle
+  extends SerializedAddFeatureChangeBase,
+    AddFeatureChangeDetails {}
+
+interface SerializedAddFeatureChangeMultiple
+  extends SerializedAddFeatureChangeBase {
+  changes: AddFeatureChangeDetails[]
+}
+
+export type SerializedAddFeatureChange =
+  | SerializedAddFeatureChangeSingle
+  | SerializedAddFeatureChangeMultiple
 
 interface SerializedDeleteFeatureChangeBase extends SerializedFeatureChange {
   typeName: 'DeleteFeatureChange'
@@ -32,6 +54,62 @@ export type SerializedDeleteFeatureChange =
   | SerializedDeleteFeatureChangeSingle
   | SerializedDeleteFeatureChangeMultiple
 
+export class AddFeatureChange extends FeatureChange {
+  typeName = 'AddFeatureChange' as const
+  changes: AddFeatureChangeDetails[]
+
+  constructor(json: SerializedAddFeatureChange, options?: ChangeOptions) {
+    super(json, options)
+    this.changes = 'changes' in json ? json.changes : [json]
+  }
+  // eslint-disable-next-line @typescript-eslint/class-literal-property-style
+  get notification() {
+    return 'Feature added successfully'
+  }
+
+  toJSON(): SerializedAddFeatureChange {
+    const { assembly, changedIds, changes, typeName } = this
+    if (changes.length === 1) {
+      const [{ addedFeature, allIds, copyFeature, parentFeatureId }] = changes
+      return {
+        typeName,
+        changedIds,
+        assembly,
+        addedFeature,
+        parentFeatureId,
+        copyFeature,
+        allIds,
+      }
+    }
+    return { typeName, changedIds, assembly, changes }
+  }
+
+  getInverse() {
+    const { assembly, changedIds, changes, logger } = this
+    const inverseChangedIds = [...changedIds].reverse()
+    const inverseChanges = [...changes].reverse().map((addFeatureChange) => ({
+      deletedFeature: addFeatureChange.addedFeature,
+      parentFeatureId: addFeatureChange.parentFeatureId,
+    }))
+
+    return new DeleteFeatureChange(
+      {
+        changedIds: inverseChangedIds,
+        typeName: 'DeleteFeatureChange',
+        changes: inverseChanges,
+        assembly,
+      },
+      { logger },
+    )
+  }
+}
+
+export function isAddFeatureChange(
+  change: unknown,
+): change is AddFeatureChange {
+  return (change as AddFeatureChange).typeName === 'AddFeatureChange'
+}
+
 export class DeleteFeatureChange extends FeatureChange {
   typeName = 'DeleteFeatureChange' as const
   changes: DeleteFeatureChangeDetails[]

packages/apollo-shared/src/Changes/AddFeatureChange.ts

@@ -5,8 +5,6 @@ import {
 } from '@apollo-annotation/common'
 import type { AnnotationFeatureSnapshot } from '@apollo-annotation/mst'
 
-import { UndoMergeExonsChange } from './UndoMergeExonsChange.js'
-
 interface SerializedMergeExonsChangeBase extends SerializedFeatureChange {
   typeName: 'MergeExonsChange'
 }
@@ -30,6 +28,28 @@ export type SerializedMergeExonsChange =
   | SerializedMergeExonsChangeSingle
   | SerializedMergeExonsChangeMultiple
 
+interface SerializedUndoMergeExonsChangeBase extends SerializedFeatureChange {
+  typeName: 'UndoMergeExonsChange'
+}
+
+export interface UndoMergeExonsChangeDetails {
+  exonsToRestore: AnnotationFeatureSnapshot[]
+  parentFeatureId: string
+}
+
+interface SerializedUndoMergeExonsChangeSingle
+  extends SerializedUndoMergeExonsChangeBase,
+    UndoMergeExonsChangeDetails {}
+
+interface SerializedUndoMergeExonsChangeMultiple
+  extends SerializedUndoMergeExonsChangeBase {
+  changes: UndoMergeExonsChangeDetails[]
+}
+
+export type SerializedUndoMergeExonsChange =
+  | SerializedUndoMergeExonsChangeSingle
+  | SerializedUndoMergeExonsChangeMultiple
+
 export class MergeExonsChange extends FeatureChange {
   typeName = 'MergeExonsChange' as const
   changes: MergeExonsChangeDetails[]
@@ -111,3 +131,51 @@ export class MergeExonsChange extends FeatureChange {
   //   return mergedAttrs
   // }
 }
+
+export class UndoMergeExonsChange extends FeatureChange {
+  typeName = 'UndoMergeExonsChange' as const
+  changes: UndoMergeExonsChangeDetails[]
+
+  constructor(json: SerializedUndoMergeExonsChange, options?: ChangeOptions) {
+    super(json, options)
+    this.changes = 'changes' in json ? json.changes : [json]
+  }
+
+  toJSON(): SerializedUndoMergeExonsChange {
+    const { assembly, changedIds, changes, typeName } = this
+    if (changes.length === 1) {
+      const [{ exonsToRestore, parentFeatureId }] = changes
+
+      return {
+        typeName,
+        changedIds,
+        assembly,
+        exonsToRestore,
+        parentFeatureId,
+      }
+    }
+    return { typeName, changedIds, assembly, changes }
+  }
+
+  getInverse() {
+    const { assembly, changedIds, changes, logger } = this
+    const inverseChangedIds = [...changedIds].reverse()
+    const inverseChanges = [...changes]
+      .reverse()
+      .map((undoMergeExonsChange) => ({
+        firstExon: undoMergeExonsChange.exonsToRestore[0],
+        secondExon: undoMergeExonsChange.exonsToRestore[1],
+        parentFeatureId: undoMergeExonsChange.parentFeatureId,
+      }))
+
+    return new MergeExonsChange(
+      {
+        changedIds: inverseChangedIds,
+        typeName: 'MergeExonsChange',
+        changes: inverseChanges,
+        assembly,
+      },
+      { logger },
+    )
+  }
+}

…o-shared/src/Changes/MergeExonsChange.ts …Changes/MergeAndUndoMergeExonsChanges.tspackages/apollo-shared/src/Changes/MergeExonsChange.ts renamed to packages/apollo-shared/src/Changes/MergeAndUndoMergeExonsChanges.ts packages/apollo-shared/src/Changes/MergeExonsChange.ts renamed to packages/apollo-shared/src/Changes/MergeAndUndoMergeExonsChanges.ts

@@ -16,8 +16,6 @@ import { getSnapshot } from '@jbrowse/mobx-state-tree'
 
 import { attributesToRecords, stringifyAttributes } from '../util.js'
 
-import { UndoMergeTranscriptsChange } from './UndoMergeTranscriptsChange.js'
-
 interface SerializedMergeTranscriptsChangeBase extends SerializedFeatureChange {
   typeName: 'MergeTranscriptsChange'
 }
@@ -41,6 +39,29 @@ export type SerializedMergeTranscriptsChange =
   | SerializedMergeTranscriptsChangeSingle
   | SerializedMergeTranscriptsChangeMultiple
 
+interface SerializedUndoMergeTranscriptsChangeBase
+  extends SerializedFeatureChange {
+  typeName: 'UndoMergeTranscriptsChange'
+}
+
+export interface UndoMergeTranscriptsChangeDetails {
+  transcriptsToRestore: AnnotationFeatureSnapshot[]
+  parentFeatureId: string
+}
+
+interface SerializedUndoMergeTranscriptsChangeSingle
+  extends SerializedUndoMergeTranscriptsChangeBase,
+    UndoMergeTranscriptsChangeDetails {}
+
+interface SerializedUndoMergeTranscriptsChangeMultiple
+  extends SerializedUndoMergeTranscriptsChangeBase {
+  changes: UndoMergeTranscriptsChangeDetails[]
+}
+
+export type SerializedUndoMergeTranscriptsChange =
+  | SerializedUndoMergeTranscriptsChangeSingle
+  | SerializedUndoMergeTranscriptsChangeMultiple
+
 export class MergeTranscriptsChange extends FeatureChange {
   typeName = 'MergeTranscriptsChange' as const
   changes: MergeTranscriptsChangeDetails[]
@@ -328,3 +349,54 @@ export class MergeTranscriptsChange extends FeatureChange {
     )
   }
 }
+
+export class UndoMergeTranscriptsChange extends FeatureChange {
+  typeName = 'UndoMergeTranscriptsChange' as const
+  changes: UndoMergeTranscriptsChangeDetails[]
+
+  constructor(
+    json: SerializedUndoMergeTranscriptsChange,
+    options?: ChangeOptions,
+  ) {
+    super(json, options)
+    this.changes = 'changes' in json ? json.changes : [json]
+  }
+
+  toJSON(): SerializedUndoMergeTranscriptsChange {
+    const { assembly, changedIds, changes, typeName } = this
+    if (changes.length === 1) {
+      const [{ transcriptsToRestore, parentFeatureId }] = changes
+
+      return {
+        typeName,
+        changedIds,
+        assembly,
+        transcriptsToRestore,
+        parentFeatureId,
+      }
+    }
+    return { typeName, changedIds, assembly, changes }
+  }
+
+  getInverse() {
+    const { assembly, changedIds, changes, logger } = this
+    const inverseChangedIds = [...changedIds].reverse()
+    const inverseChanges = [...changes]
+      .reverse()
+      .map((undoMergeTranscriptsChange) => ({
+        firstTranscript: undoMergeTranscriptsChange.transcriptsToRestore[0],
+        secondTranscript: undoMergeTranscriptsChange.transcriptsToRestore[1],
+        parentFeatureId: undoMergeTranscriptsChange.parentFeatureId,
+      }))
+
+    return new MergeTranscriptsChange(
+      {
+        changedIds: inverseChangedIds,
+        typeName: 'MergeTranscriptsChange',
+        changes: inverseChanges,
+        assembly,
+      },
+      { logger },
+    )
+  }
+}