@datagrok/helm 2.5.2 → 2.5.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "author": {
     "name": "Aleksandr Tanas",
     "email": "atanas@datagrok.ai"
@@ -16,33 +16,35 @@
     "css/helm.css"
   ],
   "dependencies": {
-    "@datagrok-libraries/bio": "^5.44.1",
+    "@datagrok-libraries/bio": "^5.45.0",
     "@datagrok-libraries/chem-meta": "^1.2.7",
-    "@datagrok-libraries/utils": "^4.3.4",
+    "@datagrok-libraries/utils": "^4.3.6",
     "cash-dom": "^8.1.1",
     "datagrok-api": "^1.21.1",
     "dayjs": "^1.10.6",
+    "lru-cache": "^10.4.3",
     "rxjs": "^6.5.5",
     "wu": "latest"
   },
   "devDependencies": {
-    "@datagrok-libraries/helm-web-editor": "^1.1.11",
-    "@datagrok-libraries/js-draw-lite": "^0.0.8",
-    "@datagrok/bio": "^2.15.5",
-    "@datagrok/chem": "^1.12.1",
+    "@datagrok-libraries/helm-web-editor": "^1.1.12",
+    "@datagrok-libraries/js-draw-lite": "^0.0.9",
+    "@datagrok/bio": "^2.16.0",
+    "@datagrok/chem": "^1.12.3",
     "@types/node": "17.0.45",
     "@types/webpack-env": "^1.18.5",
     "@types/wu": "latest",
     "@typescript-eslint/eslint-plugin": "^7.16.0",
     "@typescript-eslint/parser": "^7.16.0",
     "datagrok-tools": "latest",
-    "eslint": "^8.18.0",
-    "eslint-config-google": "^0.14.0",
-    "eslint-plugin-rxjs": "^5.0.3",
+    "eslint": "latest",
+    "eslint-config-google": "latest",
+    "eslint-plugin-deprecation": "latest",
+    "eslint-plugin-rxjs": "latest",
     "path": "^0.12.7",
-    "source-map-loader": "^4.0.1",
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.8.4",
+    "source-map-loader": "latest",
+    "ts-loader": "latest",
+    "typescript": "latest",
     "webpack": "^5.76.3",
     "webpack-cli": "^4.9.1"
   },

package/src/helm-helper.ts

@@ -4,12 +4,13 @@ import * as DG from 'datagrok-api/dg';
 
 import $ from 'cash-dom';
 
+/* eslint-disable max-len */
 import {
   App, Point, HelmAtom, HelmBond, HelmMol, HelmType, GetMonomerFunc, GetMonomerResType,
   MonomerExplorer, TabDescType, MonomersFuncs, MonomerSetType, ISeqMonomer, PolymerType, MonomerType,
-  DojoType, JSDraw2ModuleType,
+  DojoType, JSDraw2ModuleType, IHelmEditorOptions, IHelmDrawOptions
 } from '@datagrok-libraries/bio/src/helm/types';
-import {HelmTypes, MonomerTypes, PolymerTypes} from '@datagrok-libraries/bio/src/helm/consts';
+import {HelmTabKeys, HelmTypes, MonomerTypes, PolymerTypes} from '@datagrok-libraries/bio/src/helm/consts';
 import {errInfo} from '@datagrok-libraries/bio/src/utils/err-info';
 import {ILogger} from '@datagrok-libraries/bio/src/utils/logger';
 import {
@@ -17,13 +18,13 @@ import {
 } from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {IHelmWebEditor} from '@datagrok-libraries/bio/src/helm/types';
 import {IMonomerLib, IMonomerLibBase, IMonomerLinkData, IMonomerSetPlaceholder} from '@datagrok-libraries/bio/src/types/index';
-import {HelmTabKeys, IHelmDrawOptions} from '@datagrok-libraries/helm-web-editor/src/types/org-helm';
 import {GAP_SYMBOL, GapOriginals, NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule/consts';
 
 import {HelmWebEditor} from './helm-web-editor';
 import {OrgHelmModule, ScilModule} from './types';
 import {HelmInput} from './widgets/helm-input';
 import {getHoveredMonomerFromEditorMol} from './utils/get-hovered';
+/* eslint-enable max-len */
 
 import {_package} from './package';
 
@@ -47,7 +48,7 @@ export class HelmHelper implements IHelmHelper {
 
   createHelmInput(name?: string, options?: IHelmInputInitOptions): HelmInputBase {
     try {
-      const monomerLib: IMonomerLibBase = _package.libHelper!.getMonomerLib();
+      const monomerLib: IMonomerLibBase = _package._libHelper!.getMonomerLib();
       return HelmInput.create(this, monomerLib, name, options);
     } catch (err: any) {
       const [errMsg, errStack] = errInfo(err);
@@ -56,8 +57,8 @@ export class HelmHelper implements IHelmHelper {
     }
   }
 
-  createHelmWebEditor(host?: HTMLDivElement, drawOptions?: Partial<IHelmDrawOptions>): IHelmWebEditor {
-    return new HelmWebEditor(host, drawOptions);
+  createHelmWebEditor(host?: HTMLDivElement, options?: Partial<IHelmEditorOptions>): IHelmWebEditor {
+    return new HelmWebEditor(host, options);
   }
 
   createWebEditorApp(host: HTMLDivElement, helm: string): App {
@@ -146,7 +147,7 @@ export class HelmHelper implements IHelmHelper {
   }
 
   public onShowTabPlaceholdersSets(mex: MonomerExplorer, div: HTMLDivElement): void {
-    const monomerSets = _package.libHelper!.getMonomerSets();
+    const monomerSets = _package._libHelper!.getMonomerSets();
 
     const phSet: { [polymerType: string]: { [helmType: string]: IMonomerSetPlaceholder[] } } = {};
     for (const ph of monomerSets.placeholders) {
@@ -340,7 +341,7 @@ export class HelmHelper implements IHelmHelper {
   }
 
   public parse(helm: string, origin?: Point): HelmMol {
-    const molHandler = new JSDraw2.MolHandler<HelmType>();
+    const molHandler = new JSDraw2.MolHandler<HelmType, IHelmEditorOptions>();
     const plugin = new org.helm.webeditor.Plugin(molHandler);
     org.helm.webeditor.IO.parseHelm(plugin, helm, origin ?? new JSDraw2.Point(0, 0));
     return plugin.jsd.m;

package/src/helm-web-editor.ts

@@ -6,7 +6,7 @@ import {Unsubscribable} from 'rxjs';
 
 import {ILogger} from '@datagrok-libraries/bio/src/utils/logger';
 import {
-  App, Editor, HelmType, IHelmWebEditor, HelmEditor, IHelmDrawOptions
+  App, Editor, HelmType, IHelmWebEditor, HelmEditor, IHelmEditorOptions
 } from '@datagrok-libraries/bio/src/helm/types';
 
 import {JSDraw2Module, OrgHelmModule, ScilModule} from './types';
@@ -27,16 +27,17 @@ export class HelmWebEditor implements IHelmWebEditor {
 
   constructor(
     host?: HTMLDivElement,
-    drawOptions?: Partial<IHelmDrawOptions>,
+    options?: Partial<IHelmEditorOptions>,
     private logger: ILogger = _package.logger
   ) {
     this.host = host ?? ui.div([], {style: {width: `${this.w}px`, height: `${this.h}px`}});
 
-    const styleBackup = {width: this.host.style.width, height: this.host.style.height, overflow: this.host.style.overflow};
-    this.editor = new JSDraw2.Editor(this.host, {
-      width: this.w, height: this.h, viewonly: true,
-      drawOptions: drawOptions
-    });
+    const styleBackup = {
+      width: this.host.style.width, height: this.host.style.height,
+      overflow: this.host.style.overflow
+    };
+    this.editor = new JSDraw2.Editor(this.host,
+      Object.assign({width: this.w, height: this.h, viewonly: true}, options));
     this.host.style.width = styleBackup.width;
     this.host.style.height = styleBackup.height;
     this.host.style.overflow = styleBackup.overflow;

package/src/package-test.ts

@@ -5,7 +5,7 @@ import * as grok from 'datagrok-api/grok';
 // import {JSDraw2ModuleType} from '@datagrok/js-draw-lite/src/types/jsdraw2';
 // import {HelmType, OrgHelmModuleType} from '@datagrok/helm-web-editor/src/types/org-helm';
 
-import {runTests, tests, TestContext, initAutoTests as initTests } from '@datagrok-libraries/utils/src/test';
+import {runTests, tests, TestContext, initAutoTests as initTests} from '@datagrok-libraries/utils/src/test';
 
 import './tests/_first-tests';
 import './tests/helm-tests';

package/src/package-utils.ts

@@ -13,9 +13,10 @@ import {
 import {HelmServiceBase} from '@datagrok-libraries/bio/src/viewers/helm-service';
 import {IMonomerLib} from '@datagrok-libraries/bio/src/types';
 import {LoggerWrapper} from '@datagrok-libraries/bio/src/utils/logger';
+import {IHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
+import {ISeqHelper} from '@datagrok-libraries/bio/src/utils/seq-helper';
 
-import {HelmHelper} from './helm-helper';
 import {HelmService} from './utils/helm-service';
 import {OrgHelmModule, ScilModule} from './types';
 import {rewriteLibraries} from './utils/get-monomer';
@@ -38,14 +39,15 @@ type DojoConfigWindowType = {
   },
 };
 type HelmWindowType = {
-  $helmService?: HelmServiceBase,
+  $helmServicePromise?: Promise<HelmServiceBase>,
   require: any,
 };
 declare const window: Window & DojoConfigWindowType & DojoWindowType & HweWindow & HelmWindowType;
 
-export function _getHelmService(): HelmServiceBase {
-  let res = window.$helmService;
-  if (!res) res = window.$helmService = new HelmService();
+export async function _getHelmService(): Promise<HelmServiceBase> {
+  let res = window.$helmServicePromise;
+  if (!res)
+    res = window.$helmServicePromise = Promise.resolve(new HelmService());
   return res;
 }
 
@@ -57,7 +59,8 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
   try {
     const requireBackup = window.require;
 
-    // dojo.window','dojo.io.script','dojo.io.iframe','dojo.dom','dojox.gfx','dojox.gfx.svg','dojox.gfx.shape','dojox.charting'
+    // 'dojo.window','dojo.io.script','dojo.io.iframe','dojo.dom',
+    // 'dojox.gfx','dojox.gfx.svg','dojox.gfx.shape','dojox.charting'
     const dojoTargetList: { name: string, checker: () => boolean }[] = [
       {name: 'dojo.window', checker: () => !!(window.dojo?.window)},
       {name: 'dojo.ready', checker: () => !!(window.dojo?.ready)},
@@ -120,14 +123,16 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
         const cmp = dojoRequire == requireBackup;
         try {
           await new Promise<void>((resolve, reject) => {
-            dojoRequire(['dojo/window', 'dojo/dom', 'dojo/io/script', 'dojo/io/iframe',
+            /* eslint-disable indent */
+            dojoRequire([
+                'dojo/window', 'dojo/dom', 'dojo/io/script', 'dojo/io/iframe',
                 'dojox/gfx', 'dojox/gfx/svg', 'dojox/gfx/shape',
                 'dojox/storage/Provider', 'dojox/storage/LocalStorageProvider',
                 'dijit/_base', 'dijit/Tooltip', 'dijit/form/_FormValueWidget',
                 'dijit/form/DropDownButton', 'dijit/layout/AccordionContainer', 'dijit/form/ComboButton',
-                'dijit/layout/StackController', 'dijit/layout/StackContainer',
-              ],
+                'dijit/layout/StackController', 'dijit/layout/StackContainer',],
               (...args: any[]) => { resolve(); });
+            /* eslint-enable indent */
           });
         } finally {
           // TODO: Check interference with NGL
@@ -142,7 +147,8 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
           const dojoProgress = dojoTargetList.length - dojoNotReadyList.length;
           pi.update(Math.round(100 * dojoProgress / dojoTargetList.length),
             `Loading Helm Web Editor ${dojoProgress}/${dojoTargetList.length}`);
-          _package.logger.debug(`${logPrefix}, dojo loading ... ${dojoNotReadyList.map((m) => `'${m}'`).join(',')} ...`);
+          _package.logger.debug(`${logPrefix}, dojo loading ... ` +
+            `${dojoNotReadyList.map((m) => `'${m}'`).join(',')} ...`);
           await delay(100);
         }
         _package.logger.debug(`${logPrefix}, dojo ready all modules`);
@@ -199,15 +205,27 @@ export const helmJsonReplacer = (key: string, value: any): any => {
 
 export class HelmPackage extends DG.Package {
   public alertOriginal: ((s: string) => void) | null = null;
-  public readonly helmHelper: HelmHelper;
-  public libHelper!: IMonomerLibHelper;
+
+  private _seqHelper: ISeqHelper;
+  public get seqHelper(): ISeqHelper {
+    if (!this._seqHelper)
+      throw new Error('Package Helm .seqHelper is not initialized');
+    return this._seqHelper;
+  }
+
+  private _helmHelper: IHelmHelper;
+  public get helmHelper(): IHelmHelper {
+    if (!this._helmHelper)
+      throw new Error('Package Helm .helmHelper is not initialized');
+    return this._helmHelper;
+  };
+
+  public _libHelper!: IMonomerLibHelper;
 
   constructor(opts: { debug: boolean } = {debug: false}) {
     super();
     // @ts-ignore
     super._logger = new LoggerWrapper(super.logger, opts.debug);
-
-    this.helmHelper = new HelmHelper(this.logger);
   }
 
   // -- Init --
@@ -299,16 +317,20 @@ export class HelmPackage extends DG.Package {
   // -- MonomerLib --
 
   public get monomerLib(): IMonomerLib {
-    if (!this.libHelper)
+    if (!this._libHelper)
       throw new Error(`Helm: _package.libHelper is not initialized yet`);
-    return this.libHelper.getMonomerLib();
+    return this._libHelper.getMonomerLib();
   }
 
   private _monomerLibSub?: Unsubscribable;
 
+  private _initialized: boolean = false;
+
   /** Requires both Bio & HELMWebEditor initialized */
-  initMonomerLib(libHelper: IMonomerLibHelper): void {
-    this.libHelper = libHelper;
+  completeInit(seqHelper: ISeqHelper, helmHelper: IHelmHelper, libHelper: IMonomerLibHelper): void {
+    this._seqHelper = seqHelper;
+    this._helmHelper = helmHelper;
+    this._libHelper = libHelper;
 
     const lib = this.monomerLib;
     rewriteLibraries(lib); // initHelm()
@@ -316,6 +338,7 @@ export class HelmPackage extends DG.Package {
       .subscribe(this.monomerLibOnChangedHandler.bind(this));
 
     this.initHelmPatchPistoia();
+    this._initialized = true;
   }
 
   monomerLibOnChangedHandler(): void {

package/src/package.ts

@@ -8,15 +8,16 @@ import $ from 'cash-dom';
 import {testEvent} from '@datagrok-libraries/utils/src/test';
 import {errInfo} from '@datagrok-libraries/bio/src/utils/err-info';
 import {NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule';
-import {SeqHandler} from '@datagrok-libraries/bio/src/utils/seq-handler';
-import {App, Editor, HelmMol, HelmType, HweWindow} from '@datagrok-libraries/bio/src/helm/types';
+import {getSeqHelper} from '@datagrok-libraries/bio/src/utils/seq-helper';
+import {App, HweWindow} from '@datagrok-libraries/bio/src/helm/types';
 import {HelmInputBase, IHelmHelper, IHelmInputInitOptions} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {HelmServiceBase} from '@datagrok-libraries/bio/src/viewers/helm-service';
 import {getMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
 
 import {getPropertiesWidget} from './widgets/properties-widget';
 import {HelmGridCellRenderer, HelmGridCellRendererBack} from './utils/helm-grid-cell-renderer';
-import {_getHelmService, HelmPackage, initHelmLoadAndPatchDojo} from './package-utils';
+import {_getHelmService, HelmPackage} from './package-utils';
+import {HelmHelper} from './helm-helper';
 
 // Do not import anything than types from @datagrok/helm-web-editor/src/types
 import type {JSDraw2Module, OrgHelmModule, ScilModule} from './types';
@@ -40,10 +41,9 @@ let initHelmPromise: Promise<void> | null = null;
 
 //tags: init
 export async function initHelm(): Promise<void> {
-  if (initHelmPromise === null) {
+  if (initHelmPromise === null)
     initHelmPromise = initHelmInt();
-  }
-  await initHelmPromise;
+  return initHelmPromise;
 }
 
 async function initHelmInt(): Promise<void> {
@@ -51,13 +51,15 @@ async function initHelmInt(): Promise<void> {
   _package.logger.debug(`${logPrefix}, start`);
 
   try {
-    const [_, libHelper] = await Promise.all([
+    const helmHelper: IHelmHelper = new HelmHelper(_package.logger);
+    const [_, seqHelper, libHelper] = await Promise.all([
       _package.initHELMWebEditor(),
+      getSeqHelper(),
       getMonomerLibHelper(),
     ]);
 
     _package.logger.debug(`${logPrefix}, lib loaded`);
-    _package.initMonomerLib(libHelper);
+    _package.completeInit(seqHelper, helmHelper, libHelper);
   } catch (err: any) {
     const [errMsg, errStack] = errInfo(err);
     // const errMsg: string = err instanceof Error ? err.message : !!err ? err.toString() : 'Exception \'undefined\'';
@@ -72,8 +74,9 @@ async function initHelmInt(): Promise<void> {
 }
 
 //name: getHelmService
+//description: Helm renderer service
 //output: object result
-export function getHelmService(): HelmServiceBase {
+export async function getHelmService(): Promise<HelmServiceBase> {
   return _getHelmService();
 }
 
@@ -108,7 +111,7 @@ export function editMoleculeCell(cell: DG.GridCell): void {
 export function openEditor(mol: string): void {
   const df = grok.shell.tv.grid.dataFrame;
   const col = df.columns.bySemType('Macromolecule')! as DG.Column<string>;
-  const colSh = SeqHandler.forColumn(col);
+  const colSh = _package.seqHelper.getSeqHandler(col);
   const colUnits = col.meta.units;
   if (df.currentRowIdx === -1)
     return;
@@ -133,7 +136,7 @@ function openWebEditor(cell: DG.GridCell, value?: string, units?: string) {
   // const df = grok.shell.tv.grid.dataFrame;
   // const col = df.columns.bySemType('Macromolecule')!
   const col = cell.cell.column as DG.Column<string>;
-  const sh = SeqHandler.forColumn(col);
+  const sh = _package.seqHelper.getSeqHandler(col);
   const app: App =
     _package.helmHelper.createWebEditorApp(view, !!cell && units === undefined ? cell.cell.value : value!);
   const dlg = ui.dialog({showHeader: false, showFooter: true});
@@ -184,7 +187,7 @@ export function helmInput(name: string, options: IHelmInputInitOptions): HelmInp
 
 //name: getHelmHelper
 //output: object result
-export async function getHelmHelper(): Promise<IHelmHelper> {
+export function getHelmHelper(): IHelmHelper {
   return _package.helmHelper;
 }
 
@@ -224,7 +227,6 @@ export async function measureCellRenderer(): Promise<void> {
 // -- Test apps --
 
 //name: Highlight Monomers
-//tags: app
 //output: view result
 export async function highlightMonomers(): Promise<void> {
   const pi = DG.TaskBarProgressIndicator.create('Test app highlight monomers');

package/src/tests/findMonomers-tests.ts

@@ -6,7 +6,7 @@ import {after, before, category, delay, expect, expectObject, test} from '@datag
 import {UserLibSettings} from '@datagrok-libraries/bio/src/monomer-works/types';
 import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
 import {
-  getUserLibSettings, setUserLibSettings, setUserLibSettingsForTests
+  getUserLibSettings, setUserLibSettings,
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
 
 import {findMonomers, parseHelm} from '../utils';
@@ -25,8 +25,7 @@ category('findMonomers', () => {
     userLibSettings = await getUserLibSettings();
 
     // Tests 'findMonomers' requires default monomer library loaded
-    await setUserLibSettingsForTests();
-    await monomerLibHelper.loadMonomerLib(true); // load default libraries for tests
+    await monomerLibHelper.loadMonomerLibForTests(); // load default libraries for tests
   });
 
   after(async () => {

package/src/tests/get-molfiles-tests.ts

@@ -5,7 +5,7 @@ import * as DG from 'datagrok-api/dg';
 import {after, before, category, delay, expect, test, expectArray, testEvent} from '@datagrok-libraries/utils/src/test';
 import {getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {
-  getUserLibSettings, setUserLibSettings, setUserLibSettingsForTests
+  getUserLibSettings, setUserLibSettings,
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
 import {UserLibSettings} from '@datagrok-libraries/bio/src/monomer-works/types';
 import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
@@ -24,8 +24,8 @@ category('getMolfiles', () => {
     await initHelmMainPackage();
     monomerLibHelper = await getMonomerLibHelper();
     userLibSettings = await getUserLibSettings();
-    await setUserLibSettingsForTests();
-    await monomerLibHelper.loadMonomerLib(true);
+
+    await monomerLibHelper.loadMonomerLibForTests();
   });
 
   after(async () => {

package/src/tests/get-monomer-tests.ts

@@ -15,9 +15,9 @@ import {IHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
 import {UserLibSettings} from '@datagrok-libraries/bio/src/monomer-works/types';
 import {
-  getUserLibSettings, setUserLibSettings, setUserLibSettingsForTests
+  getUserLibSettings, setUserLibSettings,
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
-import {defaultMonomerLibSummary, expectMonomerLib} from '@datagrok-libraries/bio/src/tests/monomer-lib-tests';
+import {expectMonomerLib} from '@datagrok-libraries/bio/src/tests/monomer-lib-tests';
 
 import {rewriteLibraries} from '../utils/get-monomer';
 import {JSDraw2Module, OrgHelmModule} from '../types';
@@ -25,6 +25,7 @@ import {JSDraw2Module, OrgHelmModule} from '../types';
 import {initHelmMainPackage} from './utils';
 
 import {_package} from '../package-test';
+import {PolymerTypes} from '@datagrok-libraries/bio/src/helm/consts';
 
 declare const org: OrgHelmModule;
 declare const JSDraw2: JSDraw2Module;
@@ -79,9 +80,7 @@ category('getMonomer', ()=>{
     [monomerLibHelper, helmHelper, userLibSettings] = await Promise.all(
       [getMonomerLibHelper(), getHelmHelper(), getUserLibSettings()]);
 
-    await setUserLibSettingsForTests();
-    await monomerLibHelper.awaitLoaded();
-    await monomerLibHelper.loadMonomerLib(true); // load default libraries for tests
+    await monomerLibHelper.loadMonomerLibForTests(); // load default libraries for tests
   });
 
   after(async ()=>{
@@ -93,22 +92,14 @@ category('getMonomer', ()=>{
     const monomerLib = monomerLibHelper.getMonomerLib();
     rewriteLibraries(monomerLib);
 
-    // const overriddenMonomersFuncs = helmHelper.revertOriginalMonomersFuncs();
-    // try {
-      const helmHelper: IHelmHelper = await getHelmHelper();
-      expect(helmHelper != null, true);
-      const getMonomerFunc: GetMonomerFunc = helmHelper.originalMonomersFuncs!.getMonomer!;
+    const helmHelper: IHelmHelper = await getHelmHelper();
+    expect(helmHelper != null, true);
+    const getMonomerFunc: GetMonomerFunc = helmHelper.originalMonomersFuncs!.getMonomer!;
 
-      return _testAll('original', getMonomerFunc);
-    // } finally {
-    //   helmHelper.overrideMonomersFuncs(overriddenMonomersFuncs);
-    // }
+    return _testAll('original', getMonomerFunc);
   }, {isAggregated: true});
 
   test('monomerLib', async () =>{
-    const monomerLib = monomerLibHelper.getMonomerLib();
-    expectMonomerLib(monomerLib);
-
     const getMonomerFunc = org.helm.webeditor.Monomers.getMonomer;
     return _testAll('monomerLib', getMonomerFunc);
   }, {isAggregated: true});
@@ -138,8 +129,6 @@ category('getMonomer', ()=>{
     resDf.set('res', resI, '');
     resDf.set('tgt', resI, '');
     try {
-      const monomerLib = monomerLibHelper.getMonomerLib();
-      expectMonomerLib(monomerLib);
       resDf.set('success', resI, true);
     } catch (err) {
       const [errMsg, errStack] = errInfo(err);
@@ -172,16 +161,15 @@ category('getMonomer', ()=>{
   }
 
   test('missing', async ()=> {
+    const monomerLib = monomerLibHelper.getMonomerLib();
     /* Tests getMonomer function adding missing monomers. */
     const helmStr = 'PEPTIDE1{[mis1].R.[mis2].T.C.F}$$$$;';
 
-    expectMonomerLib(monomerLibHelper.getMonomerLib());
+    const libSummary = monomerLib.getSummaryObj();
     const editor = new JSDraw2.Editor(ui.div(), {viewonly: true});
     editor.setHelm(helmStr);
-    const withMissing = JSON.parse(JSON.stringify(
-      defaultMonomerLibSummary)) as MonomerLibSummaryType;
-    withMissing['PEPTIDE'] += 2;
-    expectMonomerLib(monomerLibHelper.getMonomerLib(), withMissing);
+    libSummary[PolymerTypes.PEPTIDE] += 2;
+    expectMonomerLib(monomerLib, libSummary);
   });
 });
 

package/src/tests/helm-helper-tests.ts

@@ -2,14 +2,16 @@ import * as grok from 'datagrok-api/grok';
 import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
+/* eslint-disable max-len */
 import {after, before, category, delay, expect, expectArray, test, testEvent} from '@datagrok-libraries/utils/src/test';
-import {HelmNotSupportedError, IHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
+import {HelmNotSupportedError, HelmNotSupportedErrorType, IHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
+/* eslint-enable max-len */
 
 import {_package} from '../package-test';
 
 type TestSrcType = { helm: string };
-type TestTgtType = { helm: string | null, map: [number, number][] };
+type TestTgtType = { helm: string | null, map: [number, number][], errType?: string };
 
 category('HelmHelper: removeGaps', () => {
   let helmHelper: IHelmHelper;
@@ -63,13 +65,13 @@ category('HelmHelper: removeGaps', () => {
     },
     'single-cycle-gap-at-connection': {
       src: {helm: 'PEPTIDE1{[meY].*.C.R.N.P.C.T}$PEPTIDE1,PEPTIDE1,2:R3-7:R3$$$V2.0'},
-      tgt: {helm: null, map: []}
+      tgt: {helm: null, map: [], errType: HelmNotSupportedErrorType}
     }
   };
 
   for (const [testName, testData] of Object.entries(tests)) {
     test(`${testName}`, async () => {
-      let resErr: any = null;
+      let resErr: HelmNotSupportedError | null = null;
       try {
         const res = helmHelper.removeGaps(testData.src.helm);
         expect(res.resHelm, testData.tgt.helm);
@@ -78,17 +80,8 @@ category('HelmHelper: removeGaps', () => {
         resErr = err;
       }
 
-      if (testData.tgt.helm === null) { // err expected, for debug on GitHub CI
-        expect(resErr != null, true, 'Error expected');
-        const isErrorInstance = resErr instanceof HelmNotSupportedError;
-        const errCtorName = resErr.constructor.name;
-        const isErrorCtor = errCtorName === 'HelmNotSupportedError';
-        _package.logger.debug(`Check error object. ` +
-          `isErrorInstance: ${isErrorInstance}, isErrorCtor: ${isErrorCtor}, errCtorName: ${errCtorName}`);
-      }
-
-      expect((resErr instanceof HelmNotSupportedError) || resErr?.constructor.name === 'HelmNotSupportedError',
-        testData.tgt.helm === null, 'HelmNotSupportedError thrown expected');
-    }, testData.tgt.helm == null ? {skipReason: 'GitHub CI does not support testing exceptions'} : undefined);
+      if (testData.tgt.errType)
+        expect(resErr?.type, testData.tgt.errType, 'HelmNotSupportedError thrown expected');
+    });
   }
 });

package/src/tests/helm-input-tests.ts

@@ -8,7 +8,7 @@ import {after, before, category, delay, expect, test, testEvent} from '@datagrok
 import {IHelmHelper, getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
 import {
-  getUserLibSettings, setUserLibSettings, setUserLibSettingsForTests
+  getUserLibSettings, setUserLibSettings,
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
 import {UserLibSettings} from '@datagrok-libraries/bio/src/monomer-works/types';
 
@@ -28,9 +28,7 @@ category('HelmInput', () => {
     userLibSettings = await getUserLibSettings();
 
     // Test 'helm' requires default monomer library loaded
-    await setUserLibSettingsForTests();
-    await monomerLibHelper.awaitLoaded();
-    await monomerLibHelper.loadMonomerLib(true); // load default libraries
+    await monomerLibHelper.loadMonomerLibForTests(); // load default libraries
   });
 
   after(async () => {

package/src/tests/helm-service-tests.ts

@@ -16,7 +16,7 @@ import {RenderTask} from '@datagrok-libraries/bio/src/utils/cell-renderer-async-
 import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
 import {UserLibSettings} from '@datagrok-libraries/bio/src/monomer-works/types';
 import {
-  getUserLibSettings, setUserLibSettings, setUserLibSettingsForTests
+  getUserLibSettings, setUserLibSettings,
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
 
 import {initHelmMainPackage} from './utils';
@@ -38,11 +38,7 @@ category('HelmService', () => {
       monomerLibHelper = await getMonomerLibHelper();
       userLibSettings = await getUserLibSettings();
 
-      await delay(1000); // for loading monomer libraries files
-      // Test 'helm' requires default monomer library loaded
-      await setUserLibSettingsForTests();
-      await monomerLibHelper.loadMonomerLib(true); // load default libraries
-      const libSummary = monomerLibHelper.getMonomerLib().getSummaryObj();
+      await monomerLibHelper.loadMonomerLibForTests(); // load default libraries
 
       helmSvc = await getHelmService();
       await helmSvc.reset();
@@ -68,6 +64,7 @@ category('HelmService', () => {
     const logPrefix: string = `Helm: tests: HelmService: helm`;
     _package.logger.debug(`${logPrefix}, start`);
     const helmStr: string = 'PEPTIDE1{I.H.A.N.T.Thr_PO3H2.Aca.D-Tyr_Et}$$$$';
+    const monomerLib = monomerLibHelper.getMonomerLib();
     let consumerId: number | null = null;
     let taskAux: HelmAux | null = null;
     const event = new Subject<void>();
@@ -78,7 +75,7 @@ category('HelmService', () => {
         const task: RenderTask<HelmProps, HelmAux> = {
           name: 'test1',
           props: {
-            helm: helmStr,
+            helm: helmStr, monomerLib: monomerLib,
             backColor: DG.Color.fromHtml('#FFFFFF'),
             width: 300, height: 100,
           },