@datagrok/helm 2.5.6 → 2.5.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "author": {
     "name": "Aleksandr Tanas",
     "email": "atanas@datagrok.ai"
@@ -16,7 +16,7 @@
     "css/helm.css"
   ],
   "dependencies": {
-    "@datagrok-libraries/bio": "^5.45.4",
+    "@datagrok-libraries/bio": "^5.45.5",
     "@datagrok-libraries/chem-meta": "^1.2.7",
     "@datagrok-libraries/utils": "^4.3.6",
     "cash-dom": "^8.1.1",

package/src/helm-helper.ts

@@ -19,6 +19,7 @@ import {
 import {IHelmWebEditor} from '@datagrok-libraries/bio/src/helm/types';
 import {IMonomerLib, IMonomerLibBase, IMonomerLinkData, IMonomerSetPlaceholder} from '@datagrok-libraries/bio/src/types/index';
 import {GAP_SYMBOL, GapOriginals, NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule/consts';
+import {ISeqHelper} from '@datagrok-libraries/bio/src/utils/seq-helper';
 
 import {HelmWebEditor} from './helm-web-editor';
 import {OrgHelmModule, ScilModule} from './types';
@@ -39,6 +40,7 @@ export class HelmHelper implements IHelmHelper {
   private static instanceCount: number = 0;
 
   constructor(
+    public readonly seqHelper: ISeqHelper,
     private readonly logger: ILogger
   ) {
     // Watchdog for singleton

package/src/package-utils.ts

@@ -207,13 +207,6 @@ export const helmJsonReplacer = (key: string, value: any): any => {
 export class HelmPackage extends DG.Package {
   public alertOriginal: ((s: string) => void) | null = null;
 
-  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)
@@ -221,6 +214,10 @@ export class HelmPackage extends DG.Package {
     return this._helmHelper;
   };
 
+  public get seqHelper(): ISeqHelper {
+    return this._helmHelper.seqHelper;
+  }
+
   public _libHelper!: IMonomerLibHelper;
 
   constructor(opts: { debug: boolean } = {debug: false}) {
@@ -328,8 +325,7 @@ export class HelmPackage extends DG.Package {
   private _initialized: boolean = false;
 
   /** Requires both Bio & HELMWebEditor initialized */
-  completeInit(seqHelper: ISeqHelper, helmHelper: IHelmHelper, libHelper: IMonomerLibHelper): void {
-    this._seqHelper = seqHelper;
+  completeInit(helmHelper: IHelmHelper, libHelper: IMonomerLibHelper): void {
     this._helmHelper = helmHelper;
     this._libHelper = libHelper;
 

package/src/package.ts

@@ -51,15 +51,13 @@ async function initHelmInt(): Promise<void> {
   _package.logger.debug(`${logPrefix}, start`);
 
   try {
-    const helmHelper: IHelmHelper = new HelmHelper(_package.logger);
     const [_, seqHelper, libHelper] = await Promise.all([
       _package.initHELMWebEditor(),
       getSeqHelper(),
       getMonomerLibHelper(),
     ]);
-
-    _package.logger.debug(`${logPrefix}, lib loaded`);
-    _package.completeInit(seqHelper, helmHelper, libHelper);
+    const helmHelper: IHelmHelper = new HelmHelper(seqHelper, _package.logger);
+    _package.completeInit(helmHelper, libHelper);
   } catch (err: any) {
     const [errMsg, errStack] = errInfo(err);
     // const errMsg: string = err instanceof Error ? err.message : !!err ? err.toString() : 'Exception \'undefined\'';