@apollo-annotation/jbrowse-plugin-apollo 0.3.8 → 0.3.9

package/src/session/session.ts

@@ -165,20 +165,16 @@ export function extendSession(
           const lgv = view as unknown as LinearGenomeViewModel
           if (lgv.initialized) {
             const { dynamicBlocks } = lgv
-            // eslint-disable-next-line unicorn/no-array-for-each
-            dynamicBlocks.forEach((block) => {
-              if (block.regionNumber !== undefined) {
-                const { assemblyName, end, refName, start } = block
-                const assembly =
-                  self.apolloDataStore.assemblies.get(assemblyName)
-                if (
-                  assembly &&
-                  assembly.backendDriverType === 'CollaborationServerDriver'
-                ) {
-                  locations.push({ assemblyName, refName, start, end })
-                }
+            for (const block of dynamicBlocks.contentBlocks) {
+              const { assemblyName, end, refName, start } = block
+              const assembly = self.apolloDataStore.assemblies.get(assemblyName)
+              if (
+                assembly &&
+                assembly.backendDriverType === 'CollaborationServerDriver'
+              ) {
+                locations.push({ assemblyName, refName, start, end })
               }
-            })
+            }
           }
         }
         if (locations.length === 0) {
@@ -235,21 +231,17 @@ export function extendSession(
                 const lgv = view as unknown as LinearGenomeViewModel
                 if (lgv.initialized) {
                   const { dynamicBlocks } = lgv
-                  // eslint-disable-next-line unicorn/no-array-for-each
-                  dynamicBlocks.forEach((block) => {
-                    if (block.regionNumber !== undefined) {
-                      const { assemblyName, end, refName, start } = block
-                      const assembly =
-                        self.apolloDataStore.assemblies.get(assemblyName)
-                      if (
-                        assembly &&
-                        assembly.backendDriverType ===
-                          'CollaborationServerDriver'
-                      ) {
-                        locations.push({ assemblyName, refName, start, end })
-                      }
+                  for (const block of dynamicBlocks.contentBlocks) {
+                    const { assemblyName, end, refName, start } = block
+                    const assembly =
+                      self.apolloDataStore.assemblies.get(assemblyName)
+                    if (
+                      assembly &&
+                      assembly.backendDriverType === 'CollaborationServerDriver'
+                    ) {
+                      locations.push({ assemblyName, refName, start, end })
                     }
-                  })
+                  }
                 }
               }
               if (locations.length === 0) {

package/src/util/glyphUtils.ts

@@ -2,16 +2,193 @@ import {
   type AnnotationFeature,
   type TranscriptPartCoding,
 } from '@apollo-annotation/mst'
+import { type BaseDisplayModel } from '@jbrowse/core/pluggableElementTypes'
 import { type MenuItem } from '@jbrowse/core/ui'
-import { type AbstractSessionModel } from '@jbrowse/core/util'
+import {
+  type AbstractSessionModel,
+  getContainingView,
+} from '@jbrowse/core/util'
 import { type LinearGenomeViewModel } from '@jbrowse/plugin-linear-genome-view'
+import SkipNextRoundedIcon from '@mui/icons-material/SkipNextRounded'
+import SkipPreviousRoundedIcon from '@mui/icons-material/SkipPreviousRounded'
 
 import { type LinearApolloDisplayMouseEvents } from '../LinearApolloDisplay/stateModel/mouseEvents'
 import { type LinearApolloSixFrameDisplayMouseEvents } from '../LinearApolloSixFrameDisplay/stateModel/mouseEvents'
 import { AddChildFeature, CopyFeature, DeleteFeature } from '../components'
+import { type ApolloSessionModel } from '../session'
+
+import { type MousePositionWithFeature } from '.'
 
 type NavLocation = Parameters<LinearGenomeViewModel['navTo']>[0]
 
+export function selectFeatureAndOpenWidget(
+  stateModel:
+    | LinearApolloDisplayMouseEvents
+    | LinearApolloSixFrameDisplayMouseEvents,
+  feature: AnnotationFeature,
+) {
+  if (stateModel.apolloDragging) {
+    return
+  }
+  stateModel.setSelectedFeature(feature)
+  const { session } = stateModel
+  const { apolloDataStore } = session
+  const { featureTypeOntology } = apolloDataStore.ontologyManager
+  if (!featureTypeOntology) {
+    throw new Error('featureTypeOntology is undefined')
+  }
+
+  let containsCDSOrExon = false
+  for (const [, child] of feature.children ?? []) {
+    if (
+      featureTypeOntology.isTypeOf(child.type, 'CDS') ||
+      featureTypeOntology.isTypeOf(child.type, 'exon')
+    ) {
+      containsCDSOrExon = true
+      break
+    }
+  }
+  if (
+    (featureTypeOntology.isTypeOf(feature.type, 'transcript') ||
+      featureTypeOntology.isTypeOf(feature.type, 'pseudogenic_transcript')) &&
+    containsCDSOrExon
+  ) {
+    stateModel.showFeatureDetailsWidget(feature, [
+      'ApolloTranscriptDetails',
+      'apolloTranscriptDetails',
+    ])
+  } else {
+    stateModel.showFeatureDetailsWidget(feature)
+  }
+}
+
+export function isTranscriptFeature(
+  feature: AnnotationFeature,
+  session: ApolloSessionModel,
+): boolean {
+  const { featureTypeOntology } = session.apolloDataStore.ontologyManager
+  if (!featureTypeOntology) {
+    throw new Error('featureTypeOntology is undefined')
+  }
+  return (
+    featureTypeOntology.isTypeOf(feature.type, 'transcript') ||
+    featureTypeOntology.isTypeOf(feature.type, 'pseudogenic_transcript')
+  )
+}
+
+export function isExonFeature(
+  feature: AnnotationFeature,
+  session: ApolloSessionModel,
+): boolean {
+  const { featureTypeOntology } = session.apolloDataStore.ontologyManager
+  if (!featureTypeOntology) {
+    throw new Error('featureTypeOntology is undefined')
+  }
+  return featureTypeOntology.isTypeOf(feature.type, 'exon')
+}
+
+export function isCDSFeature(
+  feature: AnnotationFeature,
+  session: ApolloSessionModel,
+): boolean {
+  const { featureTypeOntology } = session.apolloDataStore.ontologyManager
+  if (!featureTypeOntology) {
+    throw new Error('featureTypeOntology is undefined')
+  }
+  return featureTypeOntology.isTypeOf(feature.type, 'CDS')
+}
+
+export interface AdjacentExons {
+  upstream: AnnotationFeature | undefined
+  downstream: AnnotationFeature | undefined
+}
+
+export function getAdjacentExons(
+  currentExon: AnnotationFeature,
+  display:
+    | LinearApolloDisplayMouseEvents
+    | LinearApolloSixFrameDisplayMouseEvents,
+  mousePosition: MousePositionWithFeature,
+  session: ApolloSessionModel,
+): AdjacentExons {
+  const lgv = getContainingView(
+    display as BaseDisplayModel,
+  ) as unknown as LinearGenomeViewModel
+
+  // Genomic coords of current view
+  const viewGenomicLeft = mousePosition.bp - lgv.bpPerPx * mousePosition.x
+  const viewGenomicRight = viewGenomicLeft + lgv.coarseTotalBp
+  if (!currentExon.parent) {
+    return { upstream: undefined, downstream: undefined }
+  }
+  const transcript = currentExon.parent
+  if (!transcript.children) {
+    throw new Error(`Error getting children of ${transcript._id}`)
+  }
+  const { featureTypeOntology } = session.apolloDataStore.ontologyManager
+  if (!featureTypeOntology) {
+    throw new Error('featureTypeOntology is undefined')
+  }
+
+  let exons = []
+  for (const [, child] of transcript.children) {
+    if (featureTypeOntology.isTypeOf(child.type, 'exon')) {
+      exons.push(child)
+    }
+  }
+  const adjacentExons: AdjacentExons = {
+    upstream: undefined,
+    downstream: undefined,
+  }
+  exons = exons.sort((a, b) => (a.min < b.min ? -1 : 1))
+  for (const exon of exons) {
+    if (exon.min > viewGenomicRight) {
+      adjacentExons.downstream = exon
+      break
+    }
+  }
+  exons = exons.sort((a, b) => (a.min > b.min ? -1 : 1))
+  for (const exon of exons) {
+    if (exon.max < viewGenomicLeft) {
+      adjacentExons.upstream = exon
+      break
+    }
+  }
+  if (transcript.strand === -1) {
+    const newUpstream = adjacentExons.downstream
+    adjacentExons.downstream = adjacentExons.upstream
+    adjacentExons.upstream = newUpstream
+  }
+  return adjacentExons
+}
+
+export function getStreamIcon(
+  strand: 1 | -1 | undefined,
+  isUpstream: boolean,
+  isFlipped: boolean | undefined,
+) {
+  // This is the icon you would use for strand=1, downstream, straight
+  // (non-flipped) view
+  let icon = SkipNextRoundedIcon
+
+  if (strand === -1) {
+    icon = SkipPreviousRoundedIcon
+  }
+  if (isUpstream) {
+    icon =
+      icon === SkipPreviousRoundedIcon
+        ? SkipNextRoundedIcon
+        : SkipPreviousRoundedIcon
+  }
+  if (isFlipped) {
+    icon =
+      icon === SkipPreviousRoundedIcon
+        ? SkipNextRoundedIcon
+        : SkipPreviousRoundedIcon
+  }
+  return icon
+}
+
 export function getMinAndMaxPx(
   feature: AnnotationFeature | TranscriptPartCoding,
   refName: string,

package/src/util/loadAssemblyIntoClient.ts

@@ -4,10 +4,11 @@ import {
   type CheckResultSnapshot,
 } from '@apollo-annotation/mst'
 import { gff3ToAnnotationFeature } from '@apollo-annotation/shared'
-import gff, {
+import {
   type GFF3Comment,
   type GFF3Feature,
   type GFF3Sequence,
+  parseStringSync,
 } from '@gmod/gff'
 import { getSnapshot } from 'mobx-state-tree'
 
@@ -17,7 +18,7 @@ export async function loadAssemblyIntoClient(
   apolloDataStore: ClientDataStore,
 ) {
   const featuresAndSequences: (GFF3Feature | GFF3Sequence | GFF3Comment)[] =
-    gff.parseStringSync(gff3FileText, {
+    parseStringSync(gff3FileText, {
       parseSequences: true,
       parseComments: true,
       parseDirectives: false,