@datagrok/helm 2.4.1 → 2.4.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "author": {
     "name": "Oleksandra Serhiienko",
     "email": "oserhiienko@datagrok.ai"
@@ -16,18 +16,18 @@
     "css/helm.css"
   ],
   "dependencies": {
-    "@datagrok-libraries/bio": "^5.42.9",
+    "@datagrok-libraries/bio": "^5.42.10",
     "@datagrok-libraries/chem-meta": "^1.2.5",
     "@datagrok-libraries/utils": "^4.2.19",
     "cash-dom": "^8.1.1",
-    "datagrok-api": "^1.20.0",
+    "datagrok-api": "^1.20.1",
     "dayjs": "^1.10.6",
     "rxjs": "^6.5.5",
     "wu": "latest"
   },
   "devDependencies": {
-    "@datagrok-libraries/helm-web-editor": "^1.1.8",
-    "@datagrok-libraries/js-draw-lite": "^0.0.6",
+    "@datagrok-libraries/helm-web-editor": "^1.1.9",
+    "@datagrok-libraries/js-draw-lite": "^0.0.7",
     "@datagrok/bio": "^2.14.1",
     "@datagrok/chem": "^1.9.2",
     "@types/node": "17.0.45",

package/src/helm-helper.ts

@@ -2,6 +2,8 @@ import * as grok from 'datagrok-api/grok';
 import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
+import $ from 'cash-dom';
+
 import {
   App, Atom, HelmType, GetMonomerFunc, GetMonomerResType, HelmString, HelmMol,
   MonomerExplorer, TabDescType, MonomersFuncs, MonomerSetType, HelmAtom, ISeqMonomer, PolymerType, MonomerType, type DojoType
@@ -63,7 +65,7 @@ export class HelmHelper implements IHelmHelper {
       sequenceviewonly: false,
       mexfavoritefirst: true,
       mexfilter: true,
-      // currentTabKey: HelmTabKeys.Helm,
+      currentTabKey: HelmTabKeys.Helm,
       overrideTabs: (tabs: Partial<TabDescType>[]): Partial<TabDescType>[] => {
         const res: Partial<TabDescType>[] = [...tabs,
           {caption: 'Placeholders', tabkey: 'placeholders'},
@@ -313,4 +315,21 @@ export class HelmHelper implements IHelmHelper {
   public getHoveredAtom(x: number, y: number, mol: HelmMol, height: number): HelmAtom | null {
     return getHoveredMonomerFromEditorMol(x, y, mol, height);
   }
+
+  public getMolfiles(helmStrList: string[]): string[] {
+    const host = ui.div([], {style: {width: '0', height: '0'}});
+    document.documentElement.appendChild(host);
+    try {
+      const editor = new JSDraw2.Editor(host, {viewonly: true});
+      const resList = helmStrList.map((helmStr, i) => {
+        editor.setHelm(helmStr);
+        const mol = editor.getMolfile();
+        return mol;
+      });
+      return resList;
+    } finally {
+      $(host).empty();
+      host.remove();
+    }
+  }
 }

package/src/package-utils.ts

@@ -203,6 +203,8 @@ export class HelmPackage extends DG.Package {
 
     // Alternatively load old bundles by package.json/sources
     _package.logger.debug(`${logPrefix}, HelmWebEditor awaiting …`);
+    // require('../helm/JSDraw/Scilligence.JSDraw2.Lite-uncompressed');
+    // require('../helm/JSDraw/Pistoia.HELM-uncompressed');
     require('../node_modules/@datagrok-libraries/helm-web-editor/dist/package.js');
     await window.helmWebEditor$.initPromise;
     _package.logger.debug(`${logPrefix}, HelmWebEditor loaded`);

package/src/package.ts

@@ -154,23 +154,11 @@ function openWebEditor(cell: DG.Cell, value?: string, units?: string) {
 //name: getMolfiles
 //input: column col {semType: Macromolecule}
 //output: column res
-export function getMolfiles(col: DG.Column): DG.Column {
-  const res = DG.Column.string('mols', col.length);
-
-  const host = ui.div([], {style: {width: '0', height: '0'}});
-  document.documentElement.appendChild(host);
-  try {
-    const editor = new JSDraw2.Editor(host, {viewonly: true});
-    res.init((i) => {
-      editor.setHelm(col.get(i));
-      const mol = editor.getMolfile();
-      return mol;
-    });
-    return res;
-  } finally {
-    $(host).empty();
-    host.remove();
-  }
+export function getMolfiles(col: DG.Column<string>): DG.Column<string> {
+  const helmStrList = col.toList();
+  const molfileList = _package.helmHelper.getMolfiles(helmStrList);
+  const molfileCol = DG.Column.fromStrings('mols', molfileList);
+  return molfileCol;
 }
 
 // -- Inputs --

package/src/utils/helm-service.ts

@@ -5,7 +5,7 @@ import * as DG from 'datagrok-api/dg';
 import $ from 'cash-dom';
 import {Subject, Unsubscribable} from 'rxjs';
 
-import {HelmEditor} from '@datagrok-libraries/bio/src/helm/types';
+import {HelmEditor, HelmType, IHelmDrawOptions} from '@datagrok-libraries/bio/src/helm/types';
 import {RenderTask} from '@datagrok-libraries/bio/src/utils/cell-renderer-async-base';
 import {HelmAux, HelmProps, HelmServiceBase} from '@datagrok-libraries/bio/src/viewers/helm-service';
 import {svgToImage} from '@datagrok-libraries/utils/src/svg';
@@ -48,7 +48,7 @@ export class HelmService extends HelmServiceBase {
     const emptyCanvasHash: number = 0;
 
     if (!this.editor) {
-      this.editor = new JSDraw2.Editor(this.hostDiv,
+      this.editor = new JSDraw2.Editor<HelmType, IHelmDrawOptions>(this.hostDiv,
         {width: task.props.width, height: task.props.height, skin: 'w8', viewonly: true});
     }
     const lST = window.performance.now();