@datagrok-libraries/bio 5.41.0 → 5.41.2

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 (61) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/package.json +1 -1
  3. package/src/helm/helm-helper.d.ts +1 -0
  4. package/src/helm/helm-helper.d.ts.map +1 -1
  5. package/src/helm/helm-helper.js +1 -0
  6. package/src/helm/helm-helper.js.map +1 -1
  7. package/src/monomer-works/monomer-utils.d.ts +19 -0
  8. package/src/monomer-works/monomer-utils.d.ts.map +1 -1
  9. package/src/monomer-works/monomer-utils.js +2 -2
  10. package/src/monomer-works/monomer-utils.js.map +1 -1
  11. package/src/monomer-works/monomer-works.d.ts +3 -2
  12. package/src/monomer-works/monomer-works.d.ts.map +1 -1
  13. package/src/monomer-works/monomer-works.js +27 -0
  14. package/src/monomer-works/monomer-works.js.map +1 -1
  15. package/src/monomer-works/to-atomic-level.js +1 -1
  16. package/src/tests/monomer-lib-tests.d.ts +7 -0
  17. package/src/tests/monomer-lib-tests.d.ts.map +1 -0
  18. package/src/tests/monomer-lib-tests.js +27 -0
  19. package/src/tests/monomer-lib-tests.js.map +1 -0
  20. package/src/types/helm-web-editor.d.ts +26 -0
  21. package/src/types/helm-web-editor.d.ts.map +1 -0
  22. package/src/types/helm-web-editor.js +2 -0
  23. package/src/types/helm-web-editor.js.map +1 -0
  24. package/src/types/helm.d.ts +53 -14
  25. package/src/types/helm.d.ts.map +1 -1
  26. package/src/types/index.d.ts +28 -9
  27. package/src/types/index.d.ts.map +1 -1
  28. package/src/types/index.js +1 -0
  29. package/src/types/index.js.map +1 -1
  30. package/src/types/jsdraw2.d.ts +36 -0
  31. package/src/types/jsdraw2.d.ts.map +1 -1
  32. package/src/types/renderer.d.ts +2 -2
  33. package/src/types/renderer.d.ts.map +1 -1
  34. package/src/types/renderer.js +5 -4
  35. package/src/types/renderer.js.map +1 -1
  36. package/src/utils/cell-renderer-async-base.d.ts +2 -5
  37. package/src/utils/cell-renderer-async-base.d.ts.map +1 -1
  38. package/src/utils/cell-renderer-async-base.js +12 -17
  39. package/src/utils/cell-renderer-async-base.js.map +1 -1
  40. package/src/utils/cell-renderer-back-base.d.ts +10 -3
  41. package/src/utils/cell-renderer-back-base.d.ts.map +1 -1
  42. package/src/utils/cell-renderer-back-base.js +24 -0
  43. package/src/utils/cell-renderer-back-base.js.map +1 -1
  44. package/src/utils/cell-renderer-monomer-placer.d.ts +4 -5
  45. package/src/utils/cell-renderer-monomer-placer.d.ts.map +1 -1
  46. package/src/utils/cell-renderer-monomer-placer.js +51 -20
  47. package/src/utils/cell-renderer-monomer-placer.js.map +1 -1
  48. package/src/utils/const.d.ts +10 -10
  49. package/src/utils/const.d.ts.map +1 -1
  50. package/src/utils/const.js +1 -0
  51. package/src/utils/const.js.map +1 -1
  52. package/src/utils/macromolecule/utils.d.ts.map +1 -1
  53. package/src/utils/macromolecule/utils.js +14 -1
  54. package/src/utils/macromolecule/utils.js.map +1 -1
  55. package/src/utils/seq-handler.d.ts +1 -1
  56. package/src/utils/seq-handler.d.ts.map +1 -1
  57. package/src/utils/seq-handler.js +4 -4
  58. package/src/utils/seq-handler.js.map +1 -1
  59. package/src/viewers/viewer.d.ts.map +1 -1
  60. package/src/viewers/viewer.js +2 -2
  61. package/src/viewers/viewer.js.map +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["renderer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAEhC,MAAM,WAAW,SAAS;IACxB,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IAEnC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAElC,sCAAsC;IACtC,aAAa,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,IAAI,SAAS,CAEhE;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAEpD"}
1
+ {"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["renderer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAEhC,MAAM,WAAW,SAAS;IACxB,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IAEnC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAElC,sCAAsC;IACtC,aAAa,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,IAAI,SAAS,CAG/D;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAEnD"}
@@ -1,7 +1,8 @@
1
- export function isIRenderer(value) {
2
- return value.onRendered !== undefined && value.invalidate !== undefined && value.awaitRendered !== undefined;
1
+ export function isRenderer(value) {
2
+ return value && value.onRendered !== undefined &&
3
+ value.invalidate !== undefined && value.awaitRendered !== undefined;
3
4
  }
4
- export function asIRenderer(o) {
5
- return isIRenderer(o) ? o : null;
5
+ export function asRenderer(o) {
6
+ return isRenderer(o) ? o : null;
6
7
  }
7
8
  //# sourceMappingURL=renderer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"renderer.js","sourceRoot":"","sources":["renderer.ts"],"names":[],"mappings":"AAeA,MAAM,UAAU,WAAW,CAAC,KAAgB;IAC1C,OAAO,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC;AAC/G,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,CAAM;IAChC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACnC,CAAC"}
1
+ {"version":3,"file":"renderer.js","sourceRoot":"","sources":["renderer.ts"],"names":[],"mappings":"AAeA,MAAM,UAAU,UAAU,CAAC,KAAgB;IACzC,OAAO,KAAK,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS;QAC5C,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,CAAM;IAC/B,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import * as DG from 'datagrok-api/dg';
2
- import { Observable, Unsubscribable } from 'rxjs';
2
+ import { Unsubscribable } from 'rxjs';
3
3
  import { ILogger } from './logger';
4
4
  import { CellRendererBackBase } from './cell-renderer-back-base';
5
5
  export declare class PropsBase {
@@ -50,6 +50,7 @@ export declare abstract class RenderServiceBase<TProps extends PropsBase, TAux>
50
50
  * @return {@link consumerId} or assigned new if null
51
51
  */
52
52
  render(consumerId: number | null, task: RenderTask<TProps, TAux>, key?: keyof any, tryCount?: number): number;
53
+ isBusy(consumerId: number): boolean;
53
54
  protected getTask(): RenderQueueItem<TProps, TAux> | undefined;
54
55
  private _processQueue;
55
56
  /** Sweep queue for stalled tasks */
@@ -85,10 +86,6 @@ export declare abstract class CellRendererBackAsyncBase<TProps extends PropsBase
85
86
  * @param cellImageData Image data of the cell to be drawn
86
87
  */
87
88
  protected renderOnGrid(gCtx: CanvasRenderingContext2D, bd: DG.Rect, gCell: DG.GridCell, cellImageData: ImageData): void;
88
- private _onRendered;
89
- get onRendered(): Observable<void>;
90
- invalidate(caller?: string): void;
91
- awaitRendered(timeout?: number, reason?: string): Promise<void>;
92
89
  }
93
90
  export {};
94
91
  //# sourceMappingURL=cell-renderer-async-base.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cell-renderer-async-base.d.ts","sourceRoot":"","sources":["cell-renderer-async-base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cell-renderer-async-base.d.ts","sourceRoot":"","sources":["cell-renderer-async-base.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,5 @@
1
1
  import * as DG from 'datagrok-api/dg';
2
2
  import * as ui from 'datagrok-api/ui';
3
- import { Subject } from 'rxjs';
4
- import { testEvent } from '@datagrok-libraries/utils/src/test';
5
3
  import { errInfo } from './err-info';
6
4
  import { CellRendererBackBase } from './cell-renderer-back-base';
7
5
  export class PropsBase {
@@ -64,11 +62,14 @@ export class RenderServiceBase {
64
62
  if (!this._busy) {
65
63
  this._sweepToggle(this._busy = true);
66
64
  // TODO: Use requestAnimationFrame()
67
- this.logger.debug(`${logPrefix}, window.setTimeout() -> this._processQueue() `);
68
- window.setTimeout(() => { this._processQueue(); }, 0 /* next event cycle */);
65
+ this.logger.debug(`${logPrefix}, window.requestAnimationFrame() -> this._processQueue() `);
66
+ window.requestAnimationFrame(() => { this._processQueue(); });
69
67
  }
70
68
  return consumerId;
71
69
  }
70
+ isBusy(consumerId) {
71
+ return this._queue.some((item) => item.consumerId === consumerId);
72
+ }
72
73
  getTask() {
73
74
  if (this._queue.length == 0)
74
75
  return undefined;
@@ -90,9 +91,8 @@ export class RenderServiceBase {
90
91
  }
91
92
  }
92
93
  }
93
- if (priorityItemIdx !== null) {
94
+ if (priorityItemIdx !== null)
94
95
  resItem = this._queue.splice(priorityItemIdx, 1)[0];
95
- }
96
96
  }
97
97
  if (!resItem)
98
98
  resItem = this._queue.shift();
@@ -111,8 +111,8 @@ export class RenderServiceBase {
111
111
  renderSub.unsubscribe(); // renderSub can be undefined for a sync render service (?)
112
112
  if (this._queue.length > 0) {
113
113
  // Schedule processQueue the next item only afterRender has asynchronously completed for the previous one
114
- this.logger.debug(`${logPrefixR}, ` + 'window.setTimeout() -> this._processQueue() ');
115
- window.setTimeout(() => { this._processQueue(); }, 0 /* next event cycle */);
114
+ this.logger.debug(`${logPrefixR}, ` + 'window.requestAnimationFrame() -> this._processQueue() ');
115
+ window.requestAnimationFrame(() => { this._processQueue(); });
116
116
  }
117
117
  else {
118
118
  // release flag allowing _processQueue on add queue item
@@ -219,8 +219,6 @@ export class CellRendererBackAsyncBase extends CellRendererBackBase {
219
219
  this.imageCache = new Map();
220
220
  /** Consumer identifier of the render service */
221
221
  this.consumerId = null;
222
- // -- IRenderer --
223
- this._onRendered = new Subject();
224
222
  }
225
223
  reset() {
226
224
  if (this.imageCache) {
@@ -300,6 +298,10 @@ export class CellRendererBackAsyncBase extends CellRendererBackBase {
300
298
  this.logger.debug('PdbRenderer.render(), ' + `from imageCache[${rowIdx}]`);
301
299
  this.renderOnGrid(g, bd, gridCell, cellImageData);
302
300
  }
301
+ if (!this.consumerId || !service.isBusy(this.consumerId)) {
302
+ // No async render task enqueued, fire onRendered as completed
303
+ this._onRendered.next();
304
+ }
303
305
  }
304
306
  catch (err) {
305
307
  const errMsg = err instanceof Error ? err.message : err.toString();
@@ -381,13 +383,6 @@ export class CellRendererBackAsyncBase extends CellRendererBackBase {
381
383
  gCtx.restore();
382
384
  }
383
385
  }
384
- get onRendered() { return this._onRendered; }
385
- invalidate(caller) {
386
- this.invalidateGrid();
387
- }
388
- async awaitRendered(timeout = 10000, reason = `await rendered ${timeout} timeout`) {
389
- await testEvent(this._onRendered, () => { }, () => { this.invalidate(); }, timeout, reason);
390
- }
391
386
  }
392
387
  async function base64ToImg(base64) {
393
388
  return new Promise((resolve, reject) => {
@@ -1 +1 @@
1
- {"version":3,"file":"cell-renderer-async-base.js","sourceRoot":"","sources":["cell-renderer-async-base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cell-renderer-async-base.js","sourceRoot":"","sources":["cell-renderer-async-base.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,19 @@
1
1
  import * as DG from 'datagrok-api/dg';
2
+ import { Observable, Subject, Unsubscribable } from 'rxjs';
2
3
  import { ILogger } from './logger';
3
- import { Unsubscribable } from 'rxjs';
4
+ import { IRenderer } from '../types/renderer';
4
5
  type GridCellRendererTemp<TBack> = {
5
6
  rendererBack: TBack;
6
7
  };
7
8
  export declare function getGridCellRendererBack<TValue, TBack extends CellRendererBackBase<TValue>>(gridCell: DG.GridCell): [DG.GridColumn | null, DG.Column<TValue>, GridCellRendererTemp<TBack>];
8
- export declare abstract class CellRendererBackBase<TValue> {
9
+ export declare abstract class CellRendererBackBase<TValue> implements IRenderer {
9
10
  /** Not null if rendered on a grid */
10
11
  protected readonly gridCol: DG.GridColumn | null;
11
12
  protected readonly tableCol: DG.Column<TValue>;
12
- protected readonly logger: ILogger;
13
+ readonly logger: ILogger;
13
14
  protected subs: Unsubscribable[];
14
15
  protected destroyed: boolean;
16
+ /** Overriding care to trigger {@link onRendered} event. */
15
17
  protected constructor(
16
18
  /** Not null if rendered on a grid */
17
19
  gridCol: DG.GridColumn | null, tableCol: DG.Column<TValue>, logger: ILogger);
@@ -21,6 +23,11 @@ export declare abstract class CellRendererBackBase<TValue> {
21
23
  protected destroy(): void;
22
24
  protected invalidateGrid(): void;
23
25
  protected abstract reset(): void;
26
+ errors: Error[];
27
+ protected _onRendered: Subject<void>;
28
+ get onRendered(): Observable<void>;
29
+ invalidate(caller?: string): void;
30
+ awaitRendered(timeout?: number, reason?: string): Promise<void>;
24
31
  }
25
32
  export {};
26
33
  //# sourceMappingURL=cell-renderer-back-base.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cell-renderer-back-base.d.ts","sourceRoot":"","sources":["cell-renderer-back-base.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGtC,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AACjC,OAAO,EAAC,cAAc,EAAC,MAAM,MAAM,CAAC;AAGpC,KAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC,YAAY,EAAE,KAAK,CAAC;CACrB,CAAA;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,KAAK,SAAS,oBAAoB,CAAC,MAAM,CAAC,EACxF,QAAQ,EAAE,EAAE,CAAC,QAAQ,GACpB,CAAC,EAAE,CAAC,UAAU,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAcxE;AAED,8BAAsB,oBAAoB,CAAC,MAAM;IAK7C,qCAAqC;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI;IAChD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAPpC,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,CAAM;IACtC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC,SAAS;IACP,qCAAqC;IAClB,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,EAC7B,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAC3B,MAAM,EAAE,OAAO;IAiCpC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgD;IAEzE,SAAS,CAAC,KAAK,IAAI,MAAM;IAIzB,SAAS,CAAC,OAAO,IAAI,IAAI;IAMzB,SAAS,CAAC,cAAc,IAAI,IAAI;IAIhC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI;CACjC"}
1
+ {"version":3,"file":"cell-renderer-back-base.d.ts","sourceRoot":"","sources":["cell-renderer-back-base.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGtC,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,cAAc,EAAC,MAAM,MAAM,CAAC;AAIzD,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAE5C,KAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC,YAAY,EAAE,KAAK,CAAC;CACrB,CAAA;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,KAAK,SAAS,oBAAoB,CAAC,MAAM,CAAC,EACxF,QAAQ,EAAE,EAAE,CAAC,QAAQ,GACpB,CAAC,EAAE,CAAC,UAAU,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAcxE;AAED,8BAAsB,oBAAoB,CAAC,MAAM,CAAE,YAAW,SAAS;IAMnE,qCAAqC;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI;IAChD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;aAC9B,MAAM,EAAE,OAAO;IARjC,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,CAAM;IACtC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC,2DAA2D;IAC3D,SAAS;IACP,qCAAqC;IAClB,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,EAC7B,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAC9B,MAAM,EAAE,OAAO;IAiCjC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgD;IAEzE,SAAS,CAAC,KAAK,IAAI,MAAM;IAIzB,SAAS,CAAC,OAAO,IAAI,IAAI;IAMzB,SAAS,CAAC,cAAc,IAAI,IAAI;IAIhC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI;IAIzB,MAAM,EAAE,KAAK,EAAE,CAAM;IAE5B,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAuB;IAE3D,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,CAAC,CAA6B;IAE/D,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAI3B,aAAa,CACjB,OAAO,GAAE,MAAc,EAAE,MAAM,GAAE,MAA6B,GAC7D,OAAO,CAAC,IAAI,CAAC;CAejB"}
@@ -1,4 +1,6 @@
1
1
  import * as grok from 'datagrok-api/grok';
2
+ import { Subject } from 'rxjs';
3
+ import { testEvent } from '@datagrok-libraries/utils/src/test';
2
4
  export function getGridCellRendererBack(gridCell) {
3
5
  let temp = null;
4
6
  let gridCol = null;
@@ -16,6 +18,7 @@ export function getGridCellRendererBack(gridCell) {
16
18
  return [gridCol, tableCol, temp];
17
19
  }
18
20
  export class CellRendererBackBase {
21
+ /** Overriding care to trigger {@link onRendered} event. */
19
22
  constructor(
20
23
  /** Not null if rendered on a grid */
21
24
  gridCol, tableCol, logger) {
@@ -25,6 +28,9 @@ export class CellRendererBackBase {
25
28
  this.subs = [];
26
29
  this.destroyed = false;
27
30
  this.viewerId = ++CellRendererBackBase.viewerCounter;
31
+ // -- IRenderer --
32
+ this.errors = [];
33
+ this._onRendered = new Subject();
28
34
  this.reset();
29
35
  if (this.tableCol && this.tableCol.dataFrame) {
30
36
  this.subs.push(this.tableCol.dataFrame.onDataChanged.subscribe(() => {
@@ -75,6 +81,24 @@ export class CellRendererBackBase {
75
81
  if (this.gridCol && this.gridCol.dart)
76
82
  this.gridCol.grid?.invalidate();
77
83
  }
84
+ get onRendered() { return this._onRendered; }
85
+ invalidate(caller) {
86
+ this.invalidateGrid();
87
+ }
88
+ async awaitRendered(timeout = 10000, reason = `${timeout} timeout`) {
89
+ const logPrefix = `${this.toLog()}.awaitRendered()`;
90
+ this.logger.debug(`${logPrefix}, start, testEvent before`);
91
+ await testEvent(this._onRendered, () => { }, () => {
92
+ this.invalidate();
93
+ }, timeout, `${logPrefix}, ${reason}`);
94
+ // Rethrow stored syncer error (for test purposes)
95
+ if (this.errors.length > 0) {
96
+ const err = this.errors[0];
97
+ this.errors = [];
98
+ throw err;
99
+ }
100
+ this.logger.debug(`${logPrefix}, end`);
101
+ }
78
102
  }
79
103
  CellRendererBackBase.viewerCounter = -1;
80
104
  //# sourceMappingURL=cell-renderer-back-base.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"cell-renderer-back-base.js","sourceRoot":"","sources":["cell-renderer-back-base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cell-renderer-back-base.js","sourceRoot":"","sources":["cell-renderer-back-base.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,10 @@
1
1
  import * as DG from 'datagrok-api/dg';
2
2
  import { SeqHandler } from './seq-handler';
3
3
  import { MonomerToShortFunc } from './macromolecule';
4
- import { IMonomerLib } from '../types';
5
4
  import { CellRendererBackBase } from './cell-renderer-back-base';
6
5
  import { ILogger } from './logger';
7
6
  type MonomerPlacerProps = {
8
7
  seqHandler: SeqHandler;
9
- monomerLib: IMonomerLib;
10
8
  monomerCharWidth: number;
11
9
  separatorWidth: number;
12
10
  monomerToShort: MonomerToShortFunc;
@@ -17,7 +15,8 @@ export declare class MonomerPlacer extends CellRendererBackBase<string> {
17
15
  private _monomerLengthList;
18
16
  private separatorWidth;
19
17
  props: MonomerPlacerProps;
20
- private _rowsProcessed;
18
+ private _processedRows;
19
+ private _processedMaxVisibleSeqLength;
21
20
  private _updated;
22
21
  get updated(): boolean;
23
22
  _monomerLengthMap: {
@@ -30,11 +29,11 @@ export declare class MonomerPlacer extends CellRendererBackBase<string> {
30
29
  constructor(gridCol: DG.GridColumn | null, tableCol: DG.Column<string>, logger: ILogger, propsProvider: () => MonomerPlacerProps);
31
30
  protected reset(): void;
32
31
  /** Returns monomers lengths of the {@link rowIdx} and cumulative sums for borders, monomer places */
33
- getCellMonomerLengths(rowIdx: number): [number[], number[]];
32
+ getCellMonomerLengths(rowIdx: number, width: number): [number[], number[]];
34
33
  private getCellMonomerLengthsForSeq;
35
34
  private getCellMonomerLengthsForSeqMsa;
36
35
  /** Returns seq position for pointer x */
37
- getPosition(rowIdx: number, x: number): number | null;
36
+ getPosition(rowIdx: number, x: number, width: number): number | null;
38
37
  setMonomerLengthLimit(limit: number): void;
39
38
  setSeparatorWidth(width: number): void;
40
39
  isMsa(): boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"cell-renderer-monomer-placer.d.ts","sourceRoot":"","sources":["cell-renderer-monomer-placer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAKtC,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAErC,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AAEjC,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,WAAW,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IACjD,cAAc,EAAE,kBAAkB,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAC;CAChE,CAAC;AAEF,qBAAa,aAAc,SAAQ,oBAAoB,CAAC,MAAM,CAAC;IAmB3D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAlBhC,OAAO,CAAC,kBAAkB,CAA2B;IAGrD,OAAO,CAAC,cAAc,CAAK;IACpB,KAAK,EAAE,kBAAkB,CAAC;IACjC,OAAO,CAAC,cAAc,CAAY;IAElC,OAAO,CAAC,QAAQ,CAAkB;IAClC,IAAW,OAAO,IAAI,OAAO,CAA0B;IAEhD,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAM;IACvD,oBAAoB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAM;IAEjE,sEAAsE;gBAEpE,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,EAC7B,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAC3B,MAAM,EAAE,OAAO,EACE,aAAa,EAAE,MAAM,kBAAkB;cAWvC,KAAK,IAAI,IAAI;IAQhC,qGAAqG;IAC9F,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC;IAWlE,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,8BAA8B;IAyCtC,yCAAyC;IAClC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAkCrD,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK1C,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKtC,KAAK,IAAI,OAAO;CAGxB"}
1
+ {"version":3,"file":"cell-renderer-monomer-placer.d.ts","sourceRoot":"","sources":["cell-renderer-monomer-placer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAKtC,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AAGjC,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IACjD,cAAc,EAAE,kBAAkB,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAC;CAChE,CAAC;AAEF,qBAAa,aAAc,SAAQ,oBAAoB,CAAC,MAAM,CAAC;IAoB3D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAnBhC,OAAO,CAAC,kBAAkB,CAA2B;IAGrD,OAAO,CAAC,cAAc,CAAK;IACpB,KAAK,EAAE,kBAAkB,CAAC;IACjC,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,6BAA6B,CAAa;IAElD,OAAO,CAAC,QAAQ,CAAkB;IAClC,IAAW,OAAO,IAAI,OAAO,CAA0B;IAEhD,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAM;IACvD,oBAAoB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAM;IAEjE,sEAAsE;gBAEpE,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,EAC7B,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAC3B,MAAM,EAAE,OAAO,EACE,aAAa,EAAE,MAAM,kBAAkB;cAsBvC,KAAK,IAAI,IAAI;IAQhC,qGAAqG;IAC9F,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC;IAWjF,OAAO,CAAC,2BAA2B;IA8BnC,OAAO,CAAC,8BAA8B;IAmDtC,yCAAyC;IAClC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAmCpE,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK1C,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKtC,KAAK,IAAI,OAAO;CAGxB"}
@@ -2,6 +2,7 @@ import * as DG from 'datagrok-api/dg';
2
2
  import wu from 'wu';
3
3
  import { SeqHandler } from './seq-handler';
4
4
  import { CellRendererBackBase } from './cell-renderer-back-base';
5
+ import { getMonomerLibHelper } from '../monomer-works/monomer-utils';
5
6
  export class MonomerPlacer extends CellRendererBackBase {
6
7
  get updated() { return this._updated; }
7
8
  /** View is required to subscribe and handle for data frame changes */
@@ -11,53 +12,73 @@ export class MonomerPlacer extends CellRendererBackBase {
11
12
  this._monomerLengthList = null;
12
13
  // width of separator symbol
13
14
  this.separatorWidth = 5;
15
+ this._processedMaxVisibleSeqLength = 0;
14
16
  this._updated = false;
15
17
  this._monomerLengthMap = {}; // caches the lengths to save time on g.measureText
16
18
  this._monomerStructureMap = {}; // caches the atomic structures of monomers
17
19
  this.props = this.propsProvider();
18
- this._rowsProcessed = DG.BitSet.create(this.tableCol.length);
19
- this.subs.push(this.props.monomerLib.onChanged.subscribe(() => {
20
- this.reset();
21
- }));
20
+ this._processedRows = DG.BitSet.create(this.tableCol.length);
21
+ if (this.gridCol) {
22
+ this.subs.push(this.gridCol.grid.onAfterDrawContent.subscribe(() => {
23
+ this._onRendered.next();
24
+ }));
25
+ }
26
+ getMonomerLibHelper().then((libHelper) => {
27
+ if (this.destroyed)
28
+ return;
29
+ const monomerLib = libHelper.getBioLib();
30
+ this.subs.push(monomerLib.onChanged.subscribe(() => {
31
+ this.reset();
32
+ this.gridCol?.grid?.invalidate();
33
+ }));
34
+ });
22
35
  }
23
36
  reset() {
24
37
  if (this.propsProvider)
25
38
  this.props = this.propsProvider();
26
- this._rowsProcessed = DG.BitSet.create(this.tableCol.length);
39
+ this._processedRows = DG.BitSet.create(this.tableCol.length);
27
40
  this._monomerLengthList = null;
28
41
  this._monomerLengthMap = {};
29
42
  this._monomerStructureMap = {};
30
43
  }
31
44
  /** Returns monomers lengths of the {@link rowIdx} and cumulative sums for borders, monomer places */
32
- getCellMonomerLengths(rowIdx) {
33
- const res = this.props.seqHandler.isMsa() ? this.getCellMonomerLengthsForSeqMsa() :
34
- this.getCellMonomerLengthsForSeq(rowIdx);
45
+ getCellMonomerLengths(rowIdx, width) {
46
+ const res = this.props.seqHandler.isMsa() ? this.getCellMonomerLengthsForSeqMsa(width) :
47
+ this.getCellMonomerLengthsForSeq(rowIdx, width);
35
48
  const resSum = new Array(res.length + 1);
36
49
  resSum[0] = 5; // padding
37
50
  for (let pos = 1; pos < resSum.length; pos++)
38
51
  resSum[pos] = resSum[pos - 1] + res[pos - 1];
39
52
  return [res, resSum];
40
53
  }
41
- getCellMonomerLengthsForSeq(rowIdx) {
54
+ getCellMonomerLengthsForSeq(rowIdx, width) {
42
55
  if (this._monomerLengthList === null) {
43
56
  this._monomerLengthList = new Array(this.tableCol.length).fill(null);
44
57
  this._updated = true;
45
58
  }
59
+ const minMonWidth = this.props.separatorWidth + 1 * this.props.monomerCharWidth;
60
+ const maxVisibleSeqLength = Math.ceil(width / minMonWidth);
61
+ const seqMonList = SeqHandler.forColumn(this.tableCol).getSplitted(rowIdx).originals;
62
+ const visibleSeqLength = Math.min(maxVisibleSeqLength, seqMonList.length);
46
63
  let res = this._monomerLengthList[rowIdx];
47
- if (res === null) {
48
- const seqMonList = SeqHandler.forColumn(this.tableCol).getSplitted(rowIdx).originals;
64
+ if (res === null || res.length < visibleSeqLength) {
49
65
  res = this._monomerLengthList[rowIdx] = new Array(seqMonList.length);
50
- for (const [seqMonLabel, seqMonI] of wu.enumerate(seqMonList)) {
66
+ let seqWidth = 0;
67
+ for (let seqMonI = 0; seqMonI < visibleSeqLength; ++seqMonI) {
68
+ const seqMonLabel = seqMonList[seqMonI];
51
69
  const shortMon = this.props.monomerToShort(seqMonLabel, this.props.monomerLengthLimit);
52
70
  const separatorWidth = this.props.seqHandler.isSeparator() ? this.separatorWidth : this.props.separatorWidth;
53
71
  const seqMonWidth = separatorWidth + shortMon.length * this.props.monomerCharWidth;
54
72
  res[seqMonI] = seqMonWidth;
73
+ seqWidth += seqMonWidth;
74
+ if (seqWidth > width)
75
+ break;
55
76
  }
56
77
  this._updated = true;
57
78
  }
58
79
  return res;
59
80
  }
60
- getCellMonomerLengthsForSeqMsa() {
81
+ getCellMonomerLengthsForSeqMsa(width) {
61
82
  var _a;
62
83
  if (this._monomerLengthList === null) {
63
84
  this._monomerLengthList = new Array(1).fill(null);
@@ -83,24 +104,34 @@ export class MonomerPlacer extends CellRendererBackBase {
83
104
  return { startIdx: 0, endIdx: Math.min(this.tableCol.length, 10) };
84
105
  }
85
106
  })();
107
+ const minMonWidth = this.props.separatorWidth + 1 * this.props.monomerCharWidth;
108
+ const maxVisibleSeqLength = Math.ceil(width / minMonWidth);
86
109
  for (let seqIdx = startIdx; seqIdx < endIdx; seqIdx++) {
87
- if (this._rowsProcessed.get(seqIdx))
110
+ if (this._processedRows.get(seqIdx) && maxVisibleSeqLength <= this._processedMaxVisibleSeqLength)
88
111
  continue;
89
- const seqMonList = SeqHandler.forColumn(this.tableCol).getSplitted(seqIdx).originals;
90
- if (seqMonList.length > res.length)
91
- res.push(...new Array(seqMonList.length - res.length).fill(0));
92
- for (const [seqMonLabel, seqMonI] of wu.enumerate(seqMonList)) {
112
+ const seqMonList = SeqHandler.forColumn(this.tableCol)
113
+ .getSplitted(seqIdx, maxVisibleSeqLength).originals;
114
+ const visibleSeqLength = Math.min(maxVisibleSeqLength, seqMonList.length);
115
+ if (visibleSeqLength > res.length)
116
+ res.push(...new Array(visibleSeqLength - res.length).fill(minMonWidth));
117
+ let seqWidth = 0;
118
+ for (let seqMonI = 0; seqMonI < visibleSeqLength; ++seqMonI) {
119
+ const seqMonLabel = seqMonList[seqMonI];
93
120
  const shortMon = this.props.monomerToShort(seqMonLabel, this.props.monomerLengthLimit);
94
121
  const seqMonWidth = this.props.separatorWidth + shortMon.length * this.props.monomerCharWidth;
95
122
  res[seqMonI] = Math.max(res[seqMonI] ?? 0, seqMonWidth);
123
+ seqWidth += seqMonWidth;
124
+ if (seqWidth >= width)
125
+ break;
96
126
  }
97
127
  this._updated = true;
128
+ this._processedMaxVisibleSeqLength = Math.max(this._processedMaxVisibleSeqLength, maxVisibleSeqLength);
98
129
  }
99
130
  return res; // first (and single) row of data
100
131
  }
101
132
  /** Returns seq position for pointer x */
102
- getPosition(rowIdx, x) {
103
- const [_monomerMaxLengthList, monomerMaxLengthSumList] = this.getCellMonomerLengths(rowIdx);
133
+ getPosition(rowIdx, x, width) {
134
+ const [_monomerMaxLengthList, monomerMaxLengthSumList] = this.getCellMonomerLengths(rowIdx, width);
104
135
  const sh = SeqHandler.forColumn(this.tableCol);
105
136
  const seqMonList = wu(sh.getSplitted(rowIdx).originals).toArray();
106
137
  if (seqMonList.length === 0)
@@ -1 +1 @@
1
- {"version":3,"file":"cell-renderer-monomer-placer.js","sourceRoot":"","sources":["cell-renderer-monomer-placer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cell-renderer-monomer-placer.js","sourceRoot":"","sources":["cell-renderer-monomer-placer.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,12 @@
1
+ import '../types/helm';
2
+ import * as org from 'org';
3
+ import PolymerTypes = org.helm.PolymerTypes;
4
+ import HelmTypes = org.helm.HelmTypes;
5
+ import MonomerTypes = org.helm.MonomerTypes;
6
+ export { PolymerTypes, HelmTypes, MonomerTypes };
7
+ import HELM_POLYMER_TYPE = org.helm.PolymerTypes;
8
+ import HELM_MONOMER_TYPE = org.helm.MonomerTypes;
9
+ export { HELM_POLYMER_TYPE, HELM_MONOMER_TYPE };
1
10
  /** Required HELM library monomer fields:
2
11
  * https://github.com/PistoiaHELM/HELMMonomerSets/blob/master/HELMmonomerSchema.json */
3
12
  export declare const enum HELM_REQUIRED_FIELD {
@@ -13,7 +22,7 @@ export declare const enum HELM_REQUIRED_FIELD {
13
22
  CREATE_DATE = "createDate"
14
23
  }
15
24
  export declare const enum HELM_RGROUP_FIELDS {
16
- CAP_GROUP_SMILES = "capGroupSMILES",
25
+ CAP_GROUP_SMILES = "capGroupSmiles",
17
26
  CAP_GROUP_SMILES_UPPERCASE = "capGroupSMILES",
18
27
  ALTERNATE_ID = "alternateId",
19
28
  CAP_GROUP_NAME = "capGroupName",
@@ -36,15 +45,6 @@ export declare const enum HELM_FIELDS {
36
45
  POLYMER_TYPE = "polymerType",
37
46
  SYMBOL = "symbol"
38
47
  }
39
- export declare const enum HELM_POLYMER_TYPE {
40
- PEPTIDE = "PEPTIDE",
41
- RNA = "RNA"
42
- }
43
- export declare const enum HELM_MONOMER_TYPE {
44
- BACKBONE = "Backbone",
45
- TERMINAL = "Terminal",
46
- BRANCH = "Branch"
47
- }
48
48
  export declare const HELM_CORE_FIELDS: HELM_FIELDS[];
49
49
  export declare const SDF_MONOMER_NAME = "MonomerName";
50
50
  export declare const jsonSdfMonomerLibDict: {
@@ -1 +1 @@
1
- {"version":3,"file":"const.d.ts","sourceRoot":"","sources":["const.ts"],"names":[],"mappings":"AAIA;uFACuF;AACvF,0BAAkB,mBAAmB;IACnC,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,EAAE,OAAO;IACT,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,YAAY,gBAAgB;IAC5B,YAAY,gBAAgB;IAC5B,WAAW,eAAe;CAC3B;AAGD,0BAAkB,kBAAkB;IAClC,gBAAgB,mBAAmB;IAEnC,0BAA0B,mBAAmB;IAC7C,YAAY,gBAAgB;IAC5B,cAAc,iBAAiB;IAC/B,KAAK,UAAU;CAChB;AAED,0BAAkB,oBAAoB;IACpC,cAAc,kBAAkB;IAChC,IAAI,SAAS;CACd;AAGD,0BAAkB,WAAW;IAC3B,YAAY,gBAAgB;IAC5B,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,cAAc,kBAAkB;IAChC,OAAO,YAAY;IACnB,WAAW,eAAe;IAC1B,EAAE,OAAO;IACT,YAAY,gBAAgB;IAC5B,MAAM,WAAW;CAClB;AAGD,0BAAkB,iBAAiB;IACjC,OAAO,YAAY;IACnB,GAAG,QAAQ;CACZ;AAED,0BAAkB,iBAAiB;IACjC,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AAGD,eAAO,MAAM,gBAAgB,eAO5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAG9C,eAAO,MAAM,qBAAqB;;;;;;;;;;;;CAYjC,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;CAYzB,CAAC;AAEF,eAAO,MAAM,kBAAkB,MAAQ,CAAC;AACxC,eAAO,MAAM,kBAAkB,OAAQ,CAAC;AAExC,eAAO,MAAM,aAAa,MAAM,CAAC;AACjC,eAAO,MAAM,kBAAkB,MAAM,CAAC;AACtC,eAAO,MAAM,gBAAgB,MAAM,CAAC;AACpC,eAAO,MAAM,oBAAoB,QAGhC,CAAC"}
1
+ {"version":3,"file":"const.d.ts","sourceRoot":"","sources":["const.ts"],"names":[],"mappings":"AAIA,OAAO,eAAe,CAAC;AACvB,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;AAC5C,OAAO,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;AACtC,OAAO,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;AAE5C,OAAO,EAAC,YAAY,EAAE,SAAS,EAAE,YAAY,EAAC,CAAC;AAE/C,OAAO,iBAAiB,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;AACjD,OAAO,iBAAiB,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;AAEjD,OAAO,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,CAAC;AAE9C;uFACuF;AACvF,0BAAkB,mBAAmB;IACnC,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,EAAE,OAAO;IACT,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,YAAY,gBAAgB;IAC5B,YAAY,gBAAgB;IAC5B,WAAW,eAAe;CAC3B;AAGD,0BAAkB,kBAAkB;IAClC,gBAAgB,mBAAmB;IAEnC,0BAA0B,mBAAmB;IAC7C,YAAY,gBAAgB;IAC5B,cAAc,iBAAiB;IAC/B,KAAK,UAAU;CAChB;AAED,0BAAkB,oBAAoB;IACpC,cAAc,kBAAkB;IAChC,IAAI,SAAS;CACd;AAGD,0BAAkB,WAAW;IAC3B,YAAY,gBAAgB;IAC5B,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,cAAc,kBAAkB;IAChC,OAAO,YAAY;IACnB,WAAW,eAAe;IAC1B,EAAE,OAAO;IACT,YAAY,gBAAgB;IAC5B,MAAM,WAAW;CAClB;AAGD,eAAO,MAAM,gBAAgB,eAO5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAG9C,eAAO,MAAM,qBAAqB;;;;;;;;;;;;CAYjC,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;CAYzB,CAAC;AAEF,eAAO,MAAM,kBAAkB,MAAQ,CAAC;AACxC,eAAO,MAAM,kBAAkB,OAAQ,CAAC;AAExC,eAAO,MAAM,aAAa,MAAM,CAAC;AACjC,eAAO,MAAM,kBAAkB,MAAM,CAAC;AACtC,eAAO,MAAM,gBAAgB,MAAM,CAAC;AACpC,eAAO,MAAM,oBAAoB,QAGhC,CAAC"}
@@ -1,3 +1,4 @@
1
+ import '../types/helm';
1
2
  // core fields of HELM library object used in toAtomicLevel function
2
3
  export const HELM_CORE_FIELDS = [
3
4
  "symbol" /* HELM_FIELDS.SYMBOL */,