@datagrok/bio 2.24.0 → 2.25.1

package/src/utils/seq-helper/seq-handler.ts

@@ -132,7 +132,7 @@ export class SeqHandler implements ISeqHandler {
       for (const seq of values) {
         const mSeq = !!seq ? splitter(seq) : [];
 
-        if (firstLength === null)
+        if (firstLength == null)
           firstLength = mSeq.length;
         else if (mSeq.length !== firstLength)
           sameLength = false;
@@ -182,13 +182,13 @@ export class SeqHandler implements ISeqHandler {
         throw new Error('Alphabet is empty and not annotated.');
 
       let aligned = uh.column.getTag(TAGS.aligned);
-      if (aligned === null) {
+      if (aligned == null) {
         aligned = uh.stats.sameLength ? ALIGNMENT.SEQ_MSA : ALIGNMENT.SEQ;
         uh.column.setTag(TAGS.aligned, aligned);
       }
 
       let alphabet = uh.column.getTag(TAGS.alphabet);
-      if (alphabet === null) {
+      if (alphabet == null) {
         alphabet = detectAlphabet(uh.stats.freq, candidateAlphabets);
         uh.column.setTag(TAGS.alphabet, alphabet);
       }
@@ -200,7 +200,7 @@ export class SeqHandler implements ISeqHandler {
       }
     } else if (units === NOTATION.HELM) {
       let alphabet = uh.column.getTag(TAGS.alphabet);
-      if (alphabet === null) {
+      if (alphabet == null) {
         // const cats = uh.column.categories;
         // const splitter = uh.getSplitter();
         // const samples = Array.from(new Set(
@@ -232,7 +232,7 @@ export class SeqHandler implements ISeqHandler {
 
   public get separator(): string | undefined {
     const separator: string | undefined = this.column.getTag(TAGS.separator) ?? undefined;
-    if (this.notation === NOTATION.SEPARATOR && separator === undefined)
+    if (this.notation === NOTATION.SEPARATOR && separator == undefined)
       throw new Error(`Separator is mandatory  for column '${this.column.name}' of notation '${this.notation}'.`);
     return separator;
   }
@@ -327,7 +327,7 @@ export class SeqHandler implements ISeqHandler {
       const seq = this.column.get(rowIdx);
       return this.getSplitter(limit)(seq);
     } else {
-      if (this.column.version !== this.columnVersion || this._splitted === null) {
+      if (this.column.version !== this.columnVersion || this._splitted == null) {
         this.columnVersion = this.column.version;
         this._splitted = new Array<WeakRef<ISeqSplitted>>(this.column.length);
       }
@@ -408,7 +408,7 @@ export class SeqHandler implements ISeqHandler {
   }
 
   public get stats(): SeqColStats {
-    if (this._stats === null) {
+    if (this._stats == null) {
       const freq: { [m: string]: number } = {};
       let sameLength = true;
       let firstLength = null;
@@ -435,7 +435,7 @@ export class SeqHandler implements ISeqHandler {
 
   private _maxLength: number | null = null;
   public get maxLength(): number {
-    if (this._maxLength === null) {
+    if (this._maxLength == null) {
       this._maxLength = this.column.length === 0 ? 0 :
         wu.count(0).take(this.column.length).map((rowIdx) => this.getSplitted(rowIdx).length).reduce((a, b) => a > b ? a : b, 0);
     }
@@ -444,7 +444,7 @@ export class SeqHandler implements ISeqHandler {
 
   private _posList: string[] | null = null;
   public get posList(): string[] {
-    if (this._posList === null) {
+    if (this._posList == null) {
       const posListTxt = this.column.getTag(TAGS.positionNames);
       this._posList = posListTxt ? posListTxt.split(positionSeparator).map((p) => p.trim()) :
         wu.count(1).take(this.maxLength).map((pos) => pos.toString()).toArray();
@@ -619,7 +619,7 @@ export class SeqHandler implements ISeqHandler {
   }
 
   get splitter(): SplitterFunc {
-    if (this._splitter === null)
+    if (this._splitter == null)
       this._splitter = this.getSplitter();
     return this._splitter;
   }
@@ -1049,21 +1049,30 @@ function joinToHelm(srcSS: ISeqSplitted, wrappers: string[], isDnaOrRna: boolean
 }
 
 function joinToBiln(srcSS: ISeqSplitted): string {
+  const needsSquareBrackets = (cm: string | null) => {
+    return cm && (cm.includes('-') || cm.includes('*') || cm.includes('[R'));
+  };
+
   if (!srcSS.graphInfo || !((srcSS.graphInfo.connections?.length ?? 0) > 0)) {
     const resOMList: string[] = new Array<string>(srcSS.length);
     for (let posIdx: number = 0; posIdx < srcSS.length; ++posIdx) {
-      resOMList[posIdx] = srcSS.getCanonical(posIdx);
-      if (resOMList[posIdx]?.includes('-')) // Biln uses '-' as a separator, need to enclose in []
-        resOMList[posIdx] = `[${resOMList[posIdx]}]`;
+      const canonical = srcSS.getCanonical(posIdx);
+      if (needsSquareBrackets(canonical)) // Biln uses '-' as a separator, need to enclose in []. also there might be smiles in there, where Rs are represented as '*' or R
+        resOMList[posIdx] = `[${canonical}]`;
+      else
+        resOMList[posIdx] = canonical;
     }
     return resOMList.join('-'); // Biln uses '-' as a separator
   } else { // conversion happens only if there is a graph info
     const disjointSequenceIdxs = srcSS.graphInfo.disjointSeqStarts;
     const allSeqParts = new Array<string>(srcSS.length);
     for (let posIdx = 0; posIdx < srcSS.length; ++posIdx) {
-      allSeqParts[posIdx] = srcSS.getCanonical(posIdx);
-      if (allSeqParts[posIdx]?.includes('-')) // Biln uses '-' as a separator, need to enclose in []
-        allSeqParts[posIdx] = `[${allSeqParts[posIdx]}]`;
+      const canonical = srcSS.getCanonical(posIdx);
+      // allSeqParts[posIdx] = srcSS.getCanonical(posIdx);
+      if (needsSquareBrackets(canonical)) // Biln uses '-' as a separator, need to enclose in []
+        allSeqParts[posIdx] = `[${canonical}]`;
+      else
+        allSeqParts[posIdx] = canonical;
     }
     for (let i = 0; i < srcSS.graphInfo.connections.length; i++) {
       const conn: ISeqConnection = srcSS.graphInfo.connections[i];

package/src/utils/ui-utils.ts

@@ -3,7 +3,7 @@ import * as DG from 'datagrok-api/dg';
 
 export function getMacromoleculeColumns(): DG.Column<string>[] {
   const columns = grok.shell.t.columns.bySemTypeAll(DG.SEMTYPE.MACROMOLECULE);
-  if (columns === null) {
+  if (columns == null) {
     grok.shell.error('Current table does not contain macromolecules');
     return [];
   }

package/src/viewers/web-logo-viewer.ts

@@ -34,6 +34,7 @@ import {AggFunc, getAgg} from '../utils/agg';
 import {_package, PackageFunctions} from '../package';
 import {numbersWithinMaxDiff} from './utils';
 import {buildCompositionTable} from '@datagrok-libraries/bio/src/utils/composition-table';
+import {helmTypeToPolymerType} from '@datagrok-libraries/bio/src/monomer-works/monomer-works';
 
 declare global {
   interface HTMLCanvasElement {
@@ -212,14 +213,24 @@ export class PositionInfo {
   ) {
     for (const [monomer, pmInfo] of Object.entries(this._freqs)) {
       if (monomer !== GAP_SYMBOL) {
-        const monomerTxt = monomerToShort(monomer, maxMonomerLetters);
+        // to handle explicit smiles based monomers in monomer lib
+        let monomerDisplayValue = monomer;
+
         const b = pmInfo.bounds!;
         const left = b.left;
 
         let color: string = undefinedColor;
-        if (monomerLib)
-          color = monomerLib.getMonomerTextColor(biotype, monomer)!;
-
+        if (monomerLib) {
+          try {
+            color = monomerLib.getMonomerTextColor(biotype, monomer)!;
+            const m = monomerLib.getMonomer(helmTypeToPolymerType(biotype), monomer);
+            if (m && m.symbol !== monomer) // for explicit smiles based monomers
+              monomerDisplayValue = m.symbol;
+          } catch (e) {
+            errorToConsole(e);
+          }
+        }
+        const monomerTxt = monomerToShort(monomerDisplayValue, maxMonomerLetters);
         g.resetTransform();
         g.strokeStyle = 'lightgray';
         g.lineWidth = 1;
@@ -949,7 +960,7 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
       return [null, null, null];
 
     const monomer: string | undefined = pi.getMonomerAt(calculatedX, p.y);
-    if (monomer === undefined)
+    if (monomer == undefined)
       return [pi, null, null];
 
     return [pi, monomer, pi.getFreq(monomer)];
@@ -1262,7 +1273,7 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
       const [pi, monomer] = this.getMonomer(cursorP, dpr);
       const positionLabelHeight = this.showPositionLabels ? POSITION_LABELS_HEIGHT * dpr : 0;
 
-      if (pi !== null && monomer === null && 0 <= cursorP.y && cursorP.y <= positionLabelHeight) {
+      if (pi !== null && monomer == null && 0 <= cursorP.y && cursorP.y <= positionLabelHeight) {
         // Position tooltip
 
         const tooltipRows = [ui.divText(`Position ${pi.label}`)];
@@ -1373,8 +1384,8 @@ function renderPositionLabels(g: CanvasRenderingContext2D,
       const pos = positions[jPos];
       const tm = g.measureText(pos.name);
       const textHeight = tm.actualBoundingBoxDescent - tm.actualBoundingBoxAscent;
-      maxPosNameWidth = maxPosNameWidth === null ? tm.width : Math.max(maxPosNameWidth, tm.width);
-      maxPosNameHeight = maxPosNameHeight === null ? textHeight : Math.max(maxPosNameHeight, textHeight);
+      maxPosNameWidth = maxPosNameWidth == null ? tm.width : Math.max(maxPosNameWidth, tm.width);
+      maxPosNameHeight = maxPosNameHeight == null ? textHeight : Math.max(maxPosNameHeight, textHeight);
     }
     const hScale = maxPosNameWidth! < (positionWidth * dpr - 2) ? 1 : (positionWidth * dpr - 2) / maxPosNameWidth!;