@datagrok/sequence-translator 1.4.8 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/.eslintrc.json +1 -1
  2. package/CHANGELOG.md +24 -0
  3. package/dist/package-test.js +1 -1
  4. package/dist/package-test.js.map +1 -1
  5. package/dist/package.js +1 -1
  6. package/dist/package.js.map +1 -1
  7. package/files/polytool-rules/rules_example.json +35 -38
  8. package/package.json +9 -9
  9. package/src/apps/common/model/oligo-toolkit-package.ts +13 -7
  10. package/src/package.ts +8 -7
  11. package/src/polytool/const.ts +1 -0
  12. package/src/polytool/{pt-conversion.ts → conversion/pt-chain.ts} +118 -285
  13. package/src/polytool/conversion/pt-conversion.ts +26 -0
  14. package/src/polytool/conversion/pt-misc.ts +193 -0
  15. package/src/polytool/conversion/pt-rules.ts +231 -0
  16. package/src/polytool/conversion/rule-manager.ts +205 -0
  17. package/src/polytool/pt-convert-editor.ts +1 -1
  18. package/src/polytool/pt-dialog.ts +133 -6
  19. package/src/polytool/{pt-enumeration-helm-dialog.ts → pt-enumerate-seq-dialog.ts} +243 -114
  20. package/src/polytool/pt-enumeration-helm.ts +2 -2
  21. package/src/polytool/pt-placeholders-breadth-input.ts +80 -39
  22. package/src/polytool/pt-placeholders-input.ts +96 -35
  23. package/src/polytool/pt-unrule-dialog.ts +1 -1
  24. package/src/polytool/pt-unrule.ts +2 -2
  25. package/src/polytool/types.ts +5 -1
  26. package/src/tests/polytool-chain-from-notation-tests.ts +9 -18
  27. package/src/tests/polytool-chain-parse-notation-tests.ts +3 -2
  28. package/src/tests/polytool-convert-tests.ts +5 -3
  29. package/src/tests/polytool-unrule-tests.ts +1 -1
  30. package/src/tests/toAtomicLevel-tests.ts +5 -6
  31. package/src/utils/cell-renderer-cyclized.ts +37 -0
  32. package/src/utils/context-menu.ts +1 -1
  33. package/src/utils/cyclized.ts +23 -26
  34. package/src/polytool/pt-rules.ts +0 -93
@@ -7,25 +7,38 @@ import {Unsubscribable} from 'rxjs';
7
7
 
8
8
  import {getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
9
9
  import {errInfo} from '@datagrok-libraries/bio/src/utils/err-info';
10
- import {NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule';
10
+ import {ALPHABET, NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule';
11
11
  import {getSeqHelper, ISeqHelper} from '@datagrok-libraries/bio/src/utils/seq-helper';
12
12
  import {MmcrTemps} from '@datagrok-libraries/bio/src/utils/cell-renderer-consts';
13
- import {buildMonomerHoverLink} from '@datagrok-libraries/bio/src/monomer-works/monomer-hover';
13
+ import {addMonomerHoverLink, buildMonomerHoverLink} from '@datagrok-libraries/bio/src/monomer-works/monomer-hover';
14
14
  import {getRdKitModule} from '@datagrok-libraries/bio/src/chem/rdkit-module';
15
15
  import {RDModule} from '@datagrok-libraries/chem-meta/src/rdkit-api';
16
16
 
17
- import {getRules, RuleInputs, Rules, RULES_PATH, RULES_STORAGE_NAME} from './pt-rules';
18
- import {doPolyToolConvert, getOverriddenLibrary} from './pt-conversion';
17
+ import {getRules, RuleInputs, RULES_PATH, RULES_STORAGE_NAME} from './conversion/pt-rules';
18
+ import {doPolyToolConvert} from './conversion/pt-conversion';
19
+ import {getOverriddenLibrary} from './conversion/pt-misc';
19
20
  import {defaultErrorHandler} from '../utils/err-info';
20
21
  import {getLibrariesList} from './utils';
21
22
  import {getEnumerationChem, PT_CHEM_EXAMPLE} from './pt-enumeration-chem';
22
23
 
23
24
  import {
24
25
  PT_ERROR_DATAFRAME, PT_UI_ADD_HELM, PT_UI_DIALOG_CONVERSION, PT_UI_DIALOG_ENUMERATION,
25
- PT_UI_GET_HELM, PT_UI_RULES_USED, PT_UI_USE_CHIRALITY, PT_WARNING_COLUMN
26
+ PT_UI_GET_HELM, PT_UI_HIGHLIGHT_MONOMERS, PT_UI_RULES_USED, PT_UI_USE_CHIRALITY
26
27
  } from './const';
27
28
 
28
29
  import {_package} from '../package';
30
+ import {IMonomerLibBase} from '@datagrok-libraries/bio/src/types/index';
31
+ import {MonomerHoverLink} from '@datagrok-libraries/bio/src/monomer-works/utils';
32
+ import {MonomerMap} from '@datagrok-libraries/bio/src/monomer-works/types';
33
+ import {ISeqMonomer} from '@datagrok-libraries/bio/src/helm/types';
34
+ import wu from 'wu';
35
+ import {PolymerTypes} from '@datagrok-libraries/js-draw-lite/src/types/org';
36
+ import {getMonomersDictFromLib} from '@datagrok-libraries/bio/src/monomer-works/to-atomic-level';
37
+ import {monomerSeqToMolfile} from '@datagrok-libraries/bio/src/monomer-works/to-atomic-level-utils';
38
+ import {LRUCache} from 'lru-cache';
39
+ import {getMonomerHover, ISubstruct, setMonomerHover} from '@datagrok-libraries/chem-meta/src/types';
40
+ import {getMolHighlight} from '@datagrok-libraries/bio/src/monomer-works/seq-to-molfile';
41
+ import {ChemTags} from '@datagrok-libraries/chem-meta/src/consts';
29
42
 
30
43
  type PolyToolConvertSerialized = {
31
44
  generateHelm: boolean;
@@ -87,6 +100,7 @@ export async function getPolyToolConvertDialog(srcCol?: DG.Column): Promise<DG.D
87
100
  ui.tooltip.bind(generateHelmInput.root, PT_UI_ADD_HELM);
88
101
 
89
102
  const chiralityEngineInput = ui.input.bool(PT_UI_USE_CHIRALITY, {value: false});
103
+ const highlightMonomersInput = ui.input.bool(PT_UI_HIGHLIGHT_MONOMERS, {value: false});
90
104
  let ruleFileList: string[];
91
105
  const ruleInputs = new RuleInputs(RULES_PATH, RULES_STORAGE_NAME, '.json', {
92
106
  onValueChanged: (value: string[]) => { ruleFileList = value; }
@@ -99,6 +113,7 @@ export async function getPolyToolConvertDialog(srcCol?: DG.Column): Promise<DG.D
99
113
  srcColInput,
100
114
  generateHelmInput,
101
115
  chiralityEngineInput,
116
+ highlightMonomersInput,
102
117
  rulesHeader,
103
118
  rulesForm
104
119
  ]);
@@ -129,7 +144,7 @@ export async function getPolyToolConvertDialog(srcCol?: DG.Column): Promise<DG.D
129
144
  /* applyInput */ (x: PolyToolConvertSerialized): void => {
130
145
  generateHelmInput.value = x.generateHelm;
131
146
  chiralityEngineInput.value = x.chiralityEngine;
132
- ruleInputs.setActive(ruleFileList);
147
+ ruleInputs.setActive(x.rules);
133
148
  });
134
149
  return dialog;
135
150
  } catch (err: any) {
@@ -287,9 +302,121 @@ export async function polyToolConvert(
287
302
  }
288
303
 
289
304
  buildMonomerHoverLink(resHelmCol, resMolCol, lib, seqHelper, rdKitModule);
305
+ buildCyclizedMonomerHoverLink(seqCol, resHelmCol, resMolCol, lib, seqHelper, rdKitModule);
290
306
 
291
307
  return [resHelmCol, resMolCol];
292
308
  } finally {
293
309
  pi.close();
294
310
  }
295
311
  }
312
+
313
+ function buildCyclizedMonomerHoverLink(
314
+ cyclizedCol: DG.Column<string>, seqCol: DG.Column<string>, molCol: DG.Column<string>,
315
+ monomerLib: IMonomerLibBase, seqHelper: ISeqHelper, rdKitModule: RDModule
316
+ ): MonomerHoverLink {
317
+ function buildMonomerMap(seqCol: DG.Column<string>, tableRowIdx: number): MonomerMap {
318
+ const seqSH = seqHelper.getSeqHandler(seqCol);
319
+ const seqSS = seqSH.getSplitted(tableRowIdx);
320
+ const biotype = seqSH.defaultBiotype;
321
+ const seqMList: ISeqMonomer[] = wu.count(0).take(seqSS.length)
322
+ .map((posIdx) => {
323
+ return {position: posIdx, symbol: seqSS.getCanonical(posIdx), biotype: biotype} as ISeqMonomer;
324
+ })
325
+ .toArray();
326
+
327
+ const alphabet = seqSH.alphabet as ALPHABET;
328
+ const polymerType = alphabet == ALPHABET.RNA || alphabet == ALPHABET.DNA ? PolymerTypes.RNA : PolymerTypes.PEPTIDE;
329
+ const monomersDict = getMonomersDictFromLib([seqMList], polymerType, alphabet, monomerLib, rdKitModule);
330
+ // Call seq-to-molfile worker core directly
331
+ const molWM = monomerSeqToMolfile(seqMList, monomersDict, alphabet, polymerType);
332
+ return molWM.monomers;
333
+ }
334
+
335
+ const monomerMapLruCache = new LRUCache<string, MonomerMap>({max: 100});
336
+
337
+ function getMonomerMap(seqCol: DG.Column<string>, tableRowIdx: number): MonomerMap | null {
338
+ const seq = seqCol.get(tableRowIdx);
339
+ if (seq == null) return null;
340
+
341
+ let resMonomerMap = monomerMapLruCache.get(seq);
342
+ if (!resMonomerMap)
343
+ monomerMapLruCache.set(seq, resMonomerMap = buildMonomerMap(seqCol, tableRowIdx));
344
+
345
+ return resMonomerMap;
346
+ }
347
+
348
+ const resLink: MonomerHoverLink = {
349
+ targetCol: molCol,
350
+ handler: (seqGridCell: DG.GridCell, cyclizedMonomer: ISeqMonomer | null, targetGridCol: DG.GridColumn): boolean => {
351
+ const grid = targetGridCol.grid;
352
+ const tableRowIdx = seqGridCell.tableRowIndex!;
353
+ const gridRowIdx = seqGridCell.gridRow;
354
+ const targetGridCell = grid.cell(targetGridCol.name, gridRowIdx);
355
+
356
+ const prev = getMonomerHover();
357
+ if (!prev || (prev && (prev.dataFrameId != seqCol.dataFrame.id || prev.gridRowIdx != gridRowIdx ||
358
+ prev.seqColName != seqCol.name || prev.seqPosition != cyclizedMonomer?.position))
359
+ ) {
360
+ if (prev) {
361
+ setMonomerHover(null);
362
+ prev.gridCell.grid?.invalidate();
363
+ // prev.gridCell.render();
364
+ }
365
+ if (!cyclizedMonomer) {
366
+ setMonomerHover(null);
367
+ return true;
368
+ }
369
+
370
+ setMonomerHover({
371
+ gridCell: targetGridCell,
372
+ dataFrameId: seqCol.dataFrame.id,
373
+ gridRowIdx: gridRowIdx,
374
+ seqColName: seqCol.name,
375
+ seqPosition: cyclizedMonomer ? cyclizedMonomer.position : -1,
376
+ getSubstruct: (): ISubstruct | undefined => { // Gets monomer highlight
377
+ if (!cyclizedMonomer || cyclizedMonomer.symbol === '*')
378
+ return undefined;
379
+
380
+ const molMonomerMap = getMonomerMap(seqCol, tableRowIdx);
381
+ if (!molMonomerMap)
382
+ return undefined;
383
+
384
+ const resSubstructList: ISubstruct[] = [];
385
+ const seqMonomerList: number[] = [cyclizedMonomer.position]; // TODO: Map position of harmonized sequence
386
+ for (const seqMonomer of seqMonomerList) {
387
+ const monomerMap = molMonomerMap.get(cyclizedMonomer!.position); // single monomer
388
+ if (!monomerMap) return {atoms: [], bonds: [], highlightAtomColors: [], highlightBondColors: []};
389
+ resSubstructList.push(getMolHighlight([monomerMap], monomerLib));
390
+ }
391
+ //TODO: refine merge substract
392
+ //const res: ISubstruct = mergeSubstructs(resSubstructList);
393
+ return undefined;
394
+ }
395
+ });
396
+
397
+ // TODO: Invalidate targetGridCell
398
+ grid.invalidate();
399
+ // targetGridCell.render();
400
+ }
401
+
402
+ return true;
403
+ },
404
+ /* ISubstructProvider.*/getSubstruct: (tableRowIdx: number | null): ISubstruct | undefined =>{
405
+ // Gets whole molecule highlight
406
+ if (molCol.getTag(ChemTags.SEQUENCE_SRC_HL_MONOMERS) != 'true') return undefined;
407
+ if (tableRowIdx == null) return undefined;
408
+ const seq = seqCol.get(tableRowIdx);
409
+ if (!seq) return undefined;
410
+
411
+ const molMonomerMap = getMonomerMap(seqCol, tableRowIdx);
412
+ if (!molMonomerMap) return undefined;
413
+ const res: ISubstruct = getMolHighlight(molMonomerMap.values(), monomerLib);
414
+ return res;
415
+ }
416
+ };
417
+
418
+ addMonomerHoverLink(cyclizedCol.temp, resLink);
419
+ // addSubstructProvider(molCol.temp, resLink); //
420
+
421
+ return resLink;
422
+ }