molstar 2.3.6 → 2.4.0

package/lib/mol-repr/structure/visual/polymer-tube-mesh.d.ts

@@ -23,7 +23,7 @@ export declare const PolymerTubeParams: {
     detail: PD.Numeric;
     linearSegments: PD.Numeric;
     radialSegments: PD.Numeric;
-    unitKinds: PD.MultiSelect<"spheres" | "atomic" | "gaussians">;
+    unitKinds: PD.MultiSelect<"atomic" | "spheres" | "gaussians">;
     includeParent: PD.BooleanParam;
     doubleSided: PD.BooleanParam;
     flipSided: PD.BooleanParam;

package/lib/mol-repr/structure/visual/util/color.d.ts

@@ -10,10 +10,10 @@ import { Texture } from '../../../../mol-gl/webgl/texture';
 import { Theme } from '../../../../mol-theme/theme';
 import { ParamDefinition as PD } from '../../../../mol-util/param-definition';
 export declare const ColorSmoothingParams: {
-    smoothColors: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "auto"> | PD.NamedParams<PD.Normalize<{
+    smoothColors: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
         resolutionFactor: number;
         sampleStride: number;
-    }>, "on"> | PD.NamedParams<PD.Normalize<unknown>, "off">>;
+    }>, "on"> | PD.NamedParams<PD.Normalize<unknown>, "auto">>;
 };
 export declare type ColorSmoothingParams = typeof ColorSmoothingParams;
 export declare function getColorSmoothingProps(props: PD.Values<ColorSmoothingParams>, theme: Theme, resolution?: number): {

package/lib/mol-repr/structure/visual/util/common.d.ts

@@ -29,7 +29,7 @@ export declare const UnitKindInfo: {
     gaussians: {};
 };
 export declare type UnitKind = keyof typeof UnitKindInfo;
-export declare const UnitKindOptions: ["spheres" | "atomic" | "gaussians", string][];
+export declare const UnitKindOptions: ["atomic" | "spheres" | "gaussians", string][];
 export declare function includesUnitKind(unitKinds: UnitKind[], unit: Unit): boolean;
 export declare function getVolumeSliceInfo(box: Box3D, resolution: number, maxCells?: number): {
     area: number;

package/lib/mol-repr/visual.d.ts

@@ -16,6 +16,7 @@ import { Overpaint } from '../mol-theme/overpaint';
 import { Interval } from '../mol-data/int';
 import { Transparency } from '../mol-theme/transparency';
 import { Clipping } from '../mol-theme/clipping';
+import { Geometry } from '../mol-geo/geometry/geometry';
 export interface VisualContext {
     readonly runtime: RuntimeContext;
     readonly webgl?: WebGLContext;
@@ -25,6 +26,7 @@ interface Visual<D, P extends PD.Params> {
     /** Number of addressable groups in all instances of the visual */
     readonly groupCount: number;
     readonly renderObject: GraphicsRenderObject | undefined;
+    readonly geometryVersion: number;
     createOrUpdate: (ctx: VisualContext, theme: Theme, props: PD.Values<P>, data?: D) => Promise<void> | void;
     getLoci: (pickingId: PickingId) => Loci;
     mark: (loci: Loci, action: MarkerAction) => boolean;
@@ -33,26 +35,32 @@ interface Visual<D, P extends PD.Params> {
     setPickable: (pickable: boolean) => void;
     setColorOnly: (colorOnly: boolean) => void;
     setTransform: (matrix?: Mat4, instanceMatrices?: Float32Array | null) => void;
-    setOverpaint: (overpaint: Overpaint) => void;
-    setTransparency: (transparency: Transparency) => void;
+    setOverpaint: (overpaint: Overpaint, webgl?: WebGLContext) => void;
+    setTransparency: (transparency: Transparency, webgl?: WebGLContext) => void;
     setClipping: (clipping: Clipping) => void;
     destroy: () => void;
     mustRecreate?: (data: D, props: PD.Values<P>, webgl?: WebGLContext) => boolean;
 }
 declare namespace Visual {
-    type LociApply = (loci: Loci, apply: (interval: Interval) => boolean, isMarking: boolean) => boolean;
-    function setVisibility(renderObject: GraphicsRenderObject | undefined, visible: boolean): void;
-    function setAlphaFactor(renderObject: GraphicsRenderObject | undefined, alphaFactor: number): void;
-    function setPickable(renderObject: GraphicsRenderObject | undefined, pickable: boolean): void;
-    function setColorOnly(renderObject: GraphicsRenderObject | undefined, colorOnly: boolean): void;
-    type PreviousMark = {
+    export type LociApply = (loci: Loci, apply: (interval: Interval) => boolean, isMarking: boolean) => boolean;
+    export function setVisibility(renderObject: GraphicsRenderObject | undefined, visible: boolean): void;
+    export function setAlphaFactor(renderObject: GraphicsRenderObject | undefined, alphaFactor: number): void;
+    export function setPickable(renderObject: GraphicsRenderObject | undefined, pickable: boolean): void;
+    export function setColorOnly(renderObject: GraphicsRenderObject | undefined, colorOnly: boolean): void;
+    export type PreviousMark = {
         loci: Loci;
         action: MarkerAction;
         status: MarkerInfo['status'];
     };
-    function mark(renderObject: GraphicsRenderObject | undefined, loci: Loci, action: MarkerAction, lociApply: LociApply, previous?: PreviousMark): boolean;
-    function setOverpaint(renderObject: GraphicsRenderObject | undefined, overpaint: Overpaint, lociApply: LociApply, clear: boolean): void;
-    function setTransparency(renderObject: GraphicsRenderObject | undefined, transparency: Transparency, lociApply: LociApply, clear: boolean): void;
-    function setClipping(renderObject: GraphicsRenderObject | undefined, clipping: Clipping, lociApply: LociApply, clear: boolean): void;
-    function setTransform(renderObject: GraphicsRenderObject | undefined, transform?: Mat4, instanceTransforms?: Float32Array | null): void;
+    export function mark(renderObject: GraphicsRenderObject | undefined, loci: Loci, action: MarkerAction, lociApply: LociApply, previous?: PreviousMark): boolean;
+    type SmoothingContext = {
+        geometry: Geometry;
+        props: PD.Values<any>;
+        webgl?: WebGLContext;
+    };
+    export function setOverpaint(renderObject: GraphicsRenderObject | undefined, overpaint: Overpaint, lociApply: LociApply, clear: boolean, smoothing?: SmoothingContext): void;
+    export function setTransparency(renderObject: GraphicsRenderObject | undefined, transparency: Transparency, lociApply: LociApply, clear: boolean, smoothing?: SmoothingContext): void;
+    export function setClipping(renderObject: GraphicsRenderObject | undefined, clipping: Clipping, lociApply: LociApply, clear: boolean): void;
+    export function setTransform(renderObject: GraphicsRenderObject | undefined, transform?: Mat4, instanceTransforms?: Float32Array | null): void;
+    export {};
 }

package/lib/mol-repr/visual.js

@@ -14,6 +14,9 @@ import { Interval } from '../mol-data/int';
 import { createTransparency, clearTransparency, applyTransparencyValue, getTransparencyAverage } from '../mol-geo/geometry/transparency-data';
 import { createClipping, applyClippingGroups, clearClipping } from '../mol-geo/geometry/clipping-data';
 import { getMarkersAverage } from '../mol-geo/geometry/marker-data';
+import { getColorSmoothingProps, hasColorSmoothingProp } from '../mol-geo/geometry/base';
+import { applyMeshOverpaintSmoothing, applyMeshTransparencySmoothing } from '../mol-geo/geometry/mesh/color-smoothing';
+import { applyTextureMeshOverpaintSmoothing, applyTextureMeshTransparencySmoothing } from '../mol-geo/geometry/texture-mesh/color-smoothing';
 export { Visual };
 var Visual;
 (function (Visual) {
@@ -104,10 +107,10 @@ var Visual;
         return changed;
     }
     Visual.mark = mark;
-    function setOverpaint(renderObject, overpaint, lociApply, clear) {
+    function setOverpaint(renderObject, overpaint, lociApply, clear, smoothing) {
         if (!renderObject)
             return;
-        var _a = renderObject.values, tOverpaint = _a.tOverpaint, uGroupCount = _a.uGroupCount, instanceCount = _a.instanceCount;
+        var _a = renderObject.values, tOverpaint = _a.tOverpaint, dOverpaintType = _a.dOverpaintType, uGroupCount = _a.uGroupCount, instanceCount = _a.instanceCount;
         var count = uGroupCount.ref.value * instanceCount.ref.value;
         // ensure texture has right size
         createOverpaint(overpaint.layers.length ? count : 0, renderObject.values);
@@ -116,7 +119,7 @@ var Visual;
         if (clear)
             clearOverpaint(array, 0, count);
         var _loop_1 = function (i, il) {
-            var _b = overpaint.layers[i], loci = _b.loci, color = _b.color, clear_1 = _b.clear;
+            var _d = overpaint.layers[i], loci = _d.loci, color = _d.color, clear_1 = _d.clear;
             var apply = function (interval) {
                 var start = Interval.start(interval);
                 var end = Interval.end(interval);
@@ -130,12 +133,34 @@ var Visual;
             _loop_1(i, il);
         }
         ValueCell.update(tOverpaint, tOverpaint.ref.value);
+        ValueCell.updateIfChanged(dOverpaintType, 'groupInstance');
+        if (overpaint.layers.length === 0)
+            return;
+        if (smoothing && hasColorSmoothingProp(smoothing.props)) {
+            var geometry = smoothing.geometry, props = smoothing.props, webgl = smoothing.webgl;
+            if (geometry.kind === 'mesh') {
+                var _b = geometry.meta, resolution = _b.resolution, overpaintTexture = _b.overpaintTexture;
+                var csp = getColorSmoothingProps(props.smoothColors, true, resolution);
+                if (csp) {
+                    applyMeshOverpaintSmoothing(renderObject.values, csp.resolution, csp.stride, webgl, overpaintTexture);
+                    geometry.meta.overpaintTexture = renderObject.values.tOverpaintGrid.ref.value;
+                }
+            }
+            else if (webgl && geometry.kind === 'texture-mesh') {
+                var _c = geometry.meta, resolution = _c.resolution, overpaintTexture = _c.overpaintTexture;
+                var csp = getColorSmoothingProps(props.smoothColors, true, resolution);
+                if (csp) {
+                    applyTextureMeshOverpaintSmoothing(renderObject.values, csp.resolution, csp.stride, webgl, overpaintTexture);
+                    geometry.meta.overpaintTexture = renderObject.values.tOverpaintGrid.ref.value;
+                }
+            }
+        }
     }
     Visual.setOverpaint = setOverpaint;
-    function setTransparency(renderObject, transparency, lociApply, clear) {
+    function setTransparency(renderObject, transparency, lociApply, clear, smoothing) {
         if (!renderObject)
             return;
-        var _a = renderObject.values, tTransparency = _a.tTransparency, transparencyAverage = _a.transparencyAverage, uGroupCount = _a.uGroupCount, instanceCount = _a.instanceCount;
+        var _a = renderObject.values, tTransparency = _a.tTransparency, dTransparencyType = _a.dTransparencyType, transparencyAverage = _a.transparencyAverage, uGroupCount = _a.uGroupCount, instanceCount = _a.instanceCount;
         var count = uGroupCount.ref.value * instanceCount.ref.value;
         // ensure texture has right size and variant
         createTransparency(transparency.layers.length ? count : 0, renderObject.values);
@@ -144,7 +169,7 @@ var Visual;
         if (clear)
             clearTransparency(array, 0, count);
         var _loop_2 = function (i, il) {
-            var _b = transparency.layers[i], loci = _b.loci, value = _b.value;
+            var _d = transparency.layers[i], loci = _d.loci, value = _d.value;
             var apply = function (interval) {
                 var start = Interval.start(interval);
                 var end = Interval.end(interval);
@@ -157,6 +182,28 @@ var Visual;
         }
         ValueCell.update(tTransparency, tTransparency.ref.value);
         ValueCell.updateIfChanged(transparencyAverage, getTransparencyAverage(array, count));
+        ValueCell.updateIfChanged(dTransparencyType, 'groupInstance');
+        if (transparency.layers.length === 0)
+            return;
+        if (smoothing && hasColorSmoothingProp(smoothing.props)) {
+            var geometry = smoothing.geometry, props = smoothing.props, webgl = smoothing.webgl;
+            if (geometry.kind === 'mesh') {
+                var _b = geometry.meta, resolution = _b.resolution, transparencyTexture = _b.transparencyTexture;
+                var csp = getColorSmoothingProps(props.smoothColors, true, resolution);
+                if (csp) {
+                    applyMeshTransparencySmoothing(renderObject.values, csp.resolution, csp.stride, webgl, transparencyTexture);
+                    geometry.meta.transparencyTexture = renderObject.values.tTransparencyGrid.ref.value;
+                }
+            }
+            else if (webgl && geometry.kind === 'texture-mesh') {
+                var _c = geometry.meta, resolution = _c.resolution, transparencyTexture = _c.transparencyTexture;
+                var csp = getColorSmoothingProps(props.smoothColors, true, resolution);
+                if (csp) {
+                    applyTextureMeshTransparencySmoothing(renderObject.values, csp.resolution, csp.stride, webgl, transparencyTexture);
+                    geometry.meta.transparencyTexture = renderObject.values.tTransparencyGrid.ref.value;
+                }
+            }
+        }
     }
     Visual.setTransparency = setTransparency;
     function setClipping(renderObject, clipping, lociApply, clear) {

package/lib/mol-repr/visual.js.map

@@ -1 +1 @@
-{"version":3,"file":"visual.js","sourceRoot":"","sources":["../../src/mol-repr/visual.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"visual.js","sourceRoot":"","sources":["../../src/mol-repr/visual.ts"],"names":[],"mappings":"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"}

package/lib/mol-repr/volume/registry.js

@@ -15,7 +15,7 @@ var VolumeRepresentationRegistry = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         objectForEach(VolumeRepresentationRegistry.BuiltIn, function (p, k) {
             if (p.name !== k)
-                throw new Error("Fix BuiltInVolumeRepresentations to have matching names. " + p.name + " " + k);
+                throw new Error("Fix BuiltInVolumeRepresentations to have matching names. ".concat(p.name, " ").concat(k));
             _this.add(p);
         });
         return _this;

package/lib/mol-repr/volume/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/mol-repr/volume/registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAEH,OAAO,EAAE,sBAAsB,EAA0C,MAAM,mBAAmB,CAAC;AAEnG,OAAO,EAAE,gCAAgC,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAErE;IAAkD,gDAAoD;IAClG;QAAA,YACI,iBAAO,SAKV;QAJG,aAAa,CAAC,4BAA4B,CAAC,OAAO,EAAE,UAAC,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,8DAA4D,CAAC,CAAC,IAAI,SAAI,CAAG,CAAC,CAAC;YAC7G,KAAI,CAAC,GAAG,CAAC,CAAQ,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;;IACP,CAAC;IACL,mCAAC;AAAD,CAAC,AARD,CAAkD,sBAAsB,GAQvE;;AAED,WAAiB,4BAA4B;IAC5B,oCAAO,GAAG;QACnB,YAAY,EAAE,gCAAgC;QAC9C,OAAO,EAAE,2BAA2B;QACpC,eAAe,EAAE,kCAAkC;KACtD,CAAC;AAKN,CAAC,EAVgB,4BAA4B,KAA5B,4BAA4B,QAU5C"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/mol-repr/volume/registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAEH,OAAO,EAAE,sBAAsB,EAA0C,MAAM,mBAAmB,CAAC;AAEnG,OAAO,EAAE,gCAAgC,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAErE;IAAkD,gDAAoD;IAClG;QAAA,YACI,iBAAO,SAKV;QAJG,aAAa,CAAC,4BAA4B,CAAC,OAAO,EAAE,UAAC,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,mEAA4D,CAAC,CAAC,IAAI,cAAI,CAAC,CAAE,CAAC,CAAC;YAC7G,KAAI,CAAC,GAAG,CAAC,CAAQ,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;;IACP,CAAC;IACL,mCAAC;AAAD,CAAC,AARD,CAAkD,sBAAsB,GAQvE;;AAED,WAAiB,4BAA4B;IAC5B,oCAAO,GAAG;QACnB,YAAY,EAAE,gCAAgC;QAC9C,OAAO,EAAE,2BAA2B;QACpC,eAAe,EAAE,kCAAkC;KACtD,CAAC;AAKN,CAAC,EAVgB,4BAA4B,KAA5B,4BAA4B,QAU5C"}

package/lib/mol-repr/volume/representation.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */

package/lib/mol-repr/volume/representation.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -42,6 +42,7 @@ export function VolumeVisual(builder, materialId) {
     var currentTheme = Theme.createEmpty();
     var currentVolume;
     var geometry;
+    var geometryVersion = -1;
     var locationIt;
     var positionIt;
     function prepareUpdate(theme, props, volume) {
@@ -113,8 +114,10 @@ export function VolumeVisual(builder, materialId) {
         currentProps = newProps;
         currentTheme = newTheme;
         currentVolume = newVolume;
-        if (newGeometry)
+        if (newGeometry) {
             geometry = newGeometry;
+            geometryVersion += 1;
+        }
     }
     function lociApply(loci, apply) {
         if (isEveryLoci(loci)) {
@@ -127,6 +130,7 @@ export function VolumeVisual(builder, materialId) {
     return {
         get groupCount() { return locationIt ? locationIt.count : 0; },
         get renderObject() { return renderObject; },
+        get geometryVersion() { return geometryVersion; },
         createOrUpdate: function (ctx, theme, props, volume) {
             if (props === void 0) { props = {}; }
             return __awaiter(this, void 0, void 0, function () {
@@ -191,6 +195,7 @@ export function VolumeRepresentation(label, ctx, getParams, visualCtor, getLoci)
     var version = 0;
     var webgl = ctx.webgl;
     var updated = new Subject();
+    var geometryState = new Representation.GeometryState();
     var materialId = getNextMaterialId();
     var renderObjects = [];
     var _state = Representation.createState();
@@ -232,8 +237,11 @@ export function VolumeRepresentation(label, ctx, getParams, visualCtor, getLoci)
                     case 2:
                         // update list of renderObjects
                         renderObjects.length = 0;
-                        if (visual && visual.renderObject)
+                        if (visual && visual.renderObject) {
                             renderObjects.push(visual.renderObject);
+                            geometryState.add(visual.renderObject.id, visual.geometryVersion);
+                        }
+                        geometryState.snapshot();
                         // increment version
                         updated.next(version++);
                         return [2 /*return*/];
@@ -275,6 +283,7 @@ export function VolumeRepresentation(label, ctx, getParams, visualCtor, getLoci)
         get params() { return _params; },
         get state() { return _state; },
         get theme() { return _theme; },
+        get geometryVersion() { return geometryState.version; },
         renderObjects: renderObjects,
         updated: updated,
         createOrUpdate: createOrUpdate,

package/lib/mol-repr/volume/representation.js.map

@@ -1 +1 @@
-{"version":3,"file":"representation.js","sourceRoot":"","sources":["../../../src/mol-repr/volume/representation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"representation.js","sourceRoot":"","sources":["../../../src/mol-repr/volume/representation.ts"],"names":[],"mappings":"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"}

package/lib/mol-script/language/expression-formatter.js

@@ -17,7 +17,7 @@ var Writer = /** @class */ (function () {
         this.localPrefix = '  ';
     };
     Writer.prototype.newline = function () {
-        this.value.push("\n" + this._prefix + this.localPrefix);
+        this.value.push("\n".concat(this._prefix).concat(this.localPrefix));
         this.currentLineLength = 0;
     };
     Writer.prototype.push = function () {
@@ -61,13 +61,13 @@ var Writer = /** @class */ (function () {
 function _format(e, writer) {
     if (isLiteral(e)) {
         if (typeof e === 'string' && (/\s/.test(e) || !e.length))
-            writer.append("`" + e + "`");
+            writer.append("`".concat(e, "`"));
         else
-            writer.append("" + e);
+            writer.append("".concat(e));
         return;
     }
     if (isSymbol(e)) {
-        writer.append("" + e.name);
+        writer.append("".concat(e.name));
         return;
     }
     writer.push();
@@ -103,7 +103,7 @@ function _format(e, writer) {
     }
     if (keys.length === 1 && isLiteral(e.args[keys[0]])) {
         writer.whitespace();
-        writer.append(":" + keys[0]);
+        writer.append(":".concat(keys[0]));
         writer.whitespace();
         _format(e.args[keys[0]], writer);
         writer.pop();
@@ -112,7 +112,7 @@ function _format(e, writer) {
     for (var _b = 0, keys_1 = keys; _b < keys_1.length; _b++) {
         var a = keys_1[_b];
         writer.newline();
-        writer.append(":" + a);
+        writer.append(":".concat(a));
         writer.whitespace();
         _format(e.args[a], writer);
     }

package/lib/mol-script/language/expression-formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"expression-formatter.js","sourceRoot":"","sources":["../../../src/mol-script/language/expression-formatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expression-formatter.js","sourceRoot":"","sources":["../../../src/mol-script/language/expression-formatter.ts"],"names":[],"mappings":"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"}

package/lib/mol-script/language/helpers.js

@@ -18,17 +18,17 @@ export function symbolList(table) {
 function formatKey(key) {
     var regex = /([a-z])([A-Z])([a-z]|$)/g;
     // do this twice because 'xXxX'
-    return key.replace(regex, function (s, a, b, c) { return a + "-" + b.toLocaleLowerCase() + c; }).replace(regex, function (s, a, b, c) { return a + "-" + b.toLocaleLowerCase() + c; });
+    return key.replace(regex, function (s, a, b, c) { return "".concat(a, "-").concat(b.toLocaleLowerCase()).concat(c); }).replace(regex, function (s, a, b, c) { return "".concat(a, "-").concat(b.toLocaleLowerCase()).concat(c); });
 }
 function _normalizeTable(namespace, key, obj) {
     if (isSymbol(obj)) {
         obj.info.namespace = namespace;
         obj.info.name = obj.info.name || formatKey(key);
-        obj.id = obj.info.namespace + "." + obj.info.name;
+        obj.id = "".concat(obj.info.namespace, ".").concat(obj.info.name);
         return;
     }
-    var currentNs = "" + (obj['@namespace'] || formatKey(key));
-    var newNs = namespace ? namespace + "." + currentNs : currentNs;
+    var currentNs = "".concat(obj['@namespace'] || formatKey(key));
+    var newNs = namespace ? "".concat(namespace, ".").concat(currentNs) : currentNs;
     for (var _i = 0, _a = Object.keys(obj); _i < _a.length; _i++) {
         var childKey = _a[_i];
         if (typeof obj[childKey] !== 'object' && !isSymbol(obj[childKey]))

package/lib/mol-script/language/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/mol-script/language/helpers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAa,QAAQ,EAAE,MAAM,UAAU,CAAC;AAExD,MAAM,UAAU,MAAM,CAA4C,IAAO,EAAE,IAAO,EAAE,WAAoB;IACpG,OAAO,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAU;IACrC,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAU;IACjC,IAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,GAAW;IAC1B,IAAM,KAAK,GAAG,0BAA0B,CAAC;IACzC,+BAA+B;IAC/B,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,UAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAK,OAAG,CAAC,SAAI,CAAC,CAAC,iBAAiB,EAAE,GAAG,CAAG,EAAnC,CAAmC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,UAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAK,OAAG,CAAC,SAAI,CAAC,CAAC,iBAAiB,EAAE,GAAG,CAAG,EAAnC,CAAmC,CAAC,CAAC;AACvJ,CAAC;AAED,SAAS,eAAe,CAAC,SAAiB,EAAE,GAAW,EAAE,GAAQ;IAC7D,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;QACf,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;QAChD,GAAG,CAAC,EAAE,GAAM,GAAG,CAAC,IAAI,CAAC,SAAS,SAAI,GAAG,CAAC,IAAI,CAAC,IAAM,CAAC;QAClD,OAAO;KACV;IACD,IAAM,SAAS,GAAG,MAAG,GAAG,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAE,CAAC;IAC3D,IAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAI,SAAS,SAAI,SAAW,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,KAAuB,UAAgB,EAAhB,KAAA,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,EAAE;QAApC,IAAM,QAAQ,SAAA;QACf,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAAE,SAAS;QAC5E,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;KACnD;AACL,CAAC;AAED,SAAS,WAAW,CAAC,GAAQ,EAAE,IAAe;IAC1C,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;QACf,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,OAAO;KACV;IACD,KAAuB,UAAgB,EAAhB,KAAA,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,EAAE;QAApC,IAAM,QAAQ,SAAA;QACf,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAAE,SAAS;QAC5E,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;KACpC;AACL,CAAC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/mol-script/language/helpers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAa,QAAQ,EAAE,MAAM,UAAU,CAAC;AAExD,MAAM,UAAU,MAAM,CAA4C,IAAO,EAAE,IAAO,EAAE,WAAoB;IACpG,OAAO,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAU;IACrC,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAU;IACjC,IAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,GAAW;IAC1B,IAAM,KAAK,GAAG,0BAA0B,CAAC;IACzC,+BAA+B;IAC/B,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,UAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAK,OAAA,UAAG,CAAC,cAAI,CAAC,CAAC,iBAAiB,EAAE,SAAG,CAAC,CAAE,EAAnC,CAAmC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,UAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAK,OAAA,UAAG,CAAC,cAAI,CAAC,CAAC,iBAAiB,EAAE,SAAG,CAAC,CAAE,EAAnC,CAAmC,CAAC,CAAC;AACvJ,CAAC;AAED,SAAS,eAAe,CAAC,SAAiB,EAAE,GAAW,EAAE,GAAQ;IAC7D,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;QACf,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;QAChD,GAAG,CAAC,EAAE,GAAG,UAAG,GAAG,CAAC,IAAI,CAAC,SAAS,cAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;QAClD,OAAO;KACV;IACD,IAAM,SAAS,GAAG,UAAG,GAAG,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAE,CAAC;IAC3D,IAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,UAAG,SAAS,cAAI,SAAS,CAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,KAAuB,UAAgB,EAAhB,KAAA,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,EAAE;QAApC,IAAM,QAAQ,SAAA;QACf,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAAE,SAAS;QAC5E,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;KACnD;AACL,CAAC;AAED,SAAS,WAAW,CAAC,GAAQ,EAAE,IAAe;IAC1C,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;QACf,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,OAAO;KACV;IACD,KAAuB,UAAgB,EAAhB,KAAA,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAhB,cAAgB,EAAhB,IAAgB,EAAE;QAApC,IAAM,QAAQ,SAAA;QACf,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAAE,SAAS;QAC5E,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;KACpC;AACL,CAAC"}

package/lib/mol-script/language/parser.js

@@ -97,7 +97,7 @@ var Language;
                     i++;
                 }
                 if (i >= _i)
-                    throw new Error("There must be a value foolowed a named arg ':" + name_1 + "'.");
+                    throw new Error("There must be a value foolowed a named arg ':".concat(name_1, "'."));
                 args[name_1] = visitExpr(nodes[i]);
                 if (isNaN(+name_1))
                     allNumeric = false;

package/lib/mol-script/language/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/mol-script/language/parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/mol-script/language/parser.ts"],"names":[],"mappings":"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"}

package/lib/mol-script/language/symbol-table/structure-query.js

@@ -30,10 +30,10 @@ var type = {
     '@header': 'Types',
     elementSymbol: symbol(Arguments.Dictionary({ 0: Argument(Type.Str) }), Types.ElementSymbol, 'Create element symbol representation from a string value.'),
     atomName: symbol(Arguments.Dictionary({ 0: Argument(Type.AnyValue) }), Types.AtomName, 'Convert a value to an atom name.'),
-    entityType: symbol(Arguments.Dictionary({ 0: Argument(Types.EntityType) }), Types.EntityType, "Create normalized representation of entity type: " + Type.oneOfValues(Types.EntityType).join(', ') + "."),
-    bondFlags: symbol(Arguments.List(Types.BondFlag), Types.BondFlags, "Create bond flags representation from a list of strings. Allowed flags: " + Type.oneOfValues(Types.BondFlag).join(', ') + "."),
+    entityType: symbol(Arguments.Dictionary({ 0: Argument(Types.EntityType) }), Types.EntityType, "Create normalized representation of entity type: ".concat(Type.oneOfValues(Types.EntityType).join(', '), ".")),
+    bondFlags: symbol(Arguments.List(Types.BondFlag), Types.BondFlags, "Create bond flags representation from a list of strings. Allowed flags: ".concat(Type.oneOfValues(Types.BondFlag).join(', '), ".")),
     ringFingerprint: symbol(Arguments.List(Types.ElementSymbol, { nonEmpty: true }), Types.RingFingerprint, 'Create ring fingerprint from the supplied atom element list.'),
-    secondaryStructureFlags: symbol(Arguments.List(Types.SecondaryStructureFlag), Types.SecondaryStructureFlags, "Create secondary structure flags representation from a list of strings. Allowed flags: " + Type.oneOfValues(Types.SecondaryStructureFlag).join(', ') + "."),
+    secondaryStructureFlags: symbol(Arguments.List(Types.SecondaryStructureFlag), Types.SecondaryStructureFlags, "Create secondary structure flags representation from a list of strings. Allowed flags: ".concat(Type.oneOfValues(Types.SecondaryStructureFlag).join(', '), ".")),
     authResidueId: symbol(Arguments.Dictionary({
         0: Argument(Type.Str, { description: 'auth_asym_id' }),
         1: Argument(Type.Num, { description: 'auth_seq_id' }),