molstar 4.2.0 → 4.4.0

package/lib/commonjs/mol-canvas3d/passes/draw.js

@@ -18,6 +18,7 @@ const postprocessing_1 = require("./postprocessing");
 const marking_1 = require("./marking");
 const util_1 = require("../../mol-gl/compute/util");
 const debug_1 = require("../../mol-util/debug");
+const dof_1 = require("./dof");
 const bloom_1 = require("./bloom");
 class DrawPass {
     setTransparency(transparency) {
@@ -61,6 +62,7 @@ class DrawPass {
         this.postprocessing = new postprocessing_1.PostprocessingPass(webgl, assetManager, this);
         this.antialiasing = new postprocessing_1.AntialiasingPass(webgl, width, height);
         this.bloom = new bloom_1.BloomPass(webgl, width, height);
+        this.dof = new dof_1.DofPass(webgl, width, height);
         this.copyFboTarget = (0, util_1.createCopyRenderable)(webgl, this.colorTarget.texture);
         this.copyFboPostprocessing = (0, util_1.createCopyRenderable)(webgl, this.postprocessing.target.texture);
         this.setTransparency(transparency);
@@ -93,6 +95,7 @@ class DrawPass {
         this.marking.setSize(width, height);
         this.postprocessing.setSize(width, height);
         this.antialiasing.setSize(width, height);
+        this.dof.setSize(width, height);
         this.bloom.setSize(width, height);
     }
     _renderDpoit(renderer, camera, scene, iterations, transparentBackground, postprocessingProps) {
@@ -105,7 +108,7 @@ class DrawPass {
             renderer.renderDpoitOpaque(scene.primitives, camera, null);
         }
         if (postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)) {
-            if (postprocessing_1.PostprocessingPass.isTransparentOutlineEnabled(postprocessingProps)) {
+            if (postprocessing_1.PostprocessingPass.isTransparentOutlineEnabled(postprocessingProps) || dof_1.DofPass.isEnabled(postprocessingProps)) {
                 this.depthTargetTransparent.bind();
                 renderer.clearDepth(true);
                 if (scene.opacityAverage < 1) {
@@ -150,7 +153,7 @@ class DrawPass {
             renderer.renderWboitOpaque(scene.primitives, camera, null);
         }
         if (postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)) {
-            if (postprocessing_1.PostprocessingPass.isTransparentOutlineEnabled(postprocessingProps)) {
+            if (postprocessing_1.PostprocessingPass.isTransparentOutlineEnabled(postprocessingProps) || dof_1.DofPass.isEnabled(postprocessingProps)) {
                 this.depthTargetTransparent.bind();
                 renderer.clearDepth(true);
                 if (scene.opacityAverage < 1) {
@@ -211,7 +214,7 @@ class DrawPass {
                 else {
                     (_a = this.colorTarget.depthRenderbuffer) === null || _a === void 0 ? void 0 : _a.detachFramebuffer(this.postprocessing.target.framebuffer);
                 }
-                if (postprocessing_1.PostprocessingPass.isTransparentOutlineEnabled(postprocessingProps)) {
+                if (postprocessing_1.PostprocessingPass.isTransparentOutlineEnabled(postprocessingProps) || dof_1.DofPass.isEnabled(postprocessingProps)) {
                     this.depthTargetTransparent.bind();
                     renderer.clearDepth(true);
                     if (scene.opacityAverage < 1) {
@@ -251,11 +254,12 @@ class DrawPass {
         }
     }
     _render(renderer, camera, scene, helper, toDrawingBuffer, transparentBackground, props) {
-        var _a;
+        var _a, _b;
         const volumeRendering = scene.volumes.renderables.length > 0;
         const postprocessingEnabled = postprocessing_1.PostprocessingPass.isEnabled(props.postprocessing);
         const antialiasingEnabled = postprocessing_1.AntialiasingPass.isEnabled(props.postprocessing);
         const markingEnabled = marking_1.MarkingPass.isEnabled(props.marking);
+        const dofEnabled = dof_1.DofPass.isEnabled(props.postprocessing);
         const { x, y, width, height } = camera.viewport;
         renderer.setViewport(x, y, width, height);
         renderer.update(camera, scene);
@@ -308,13 +312,29 @@ class DrawPass {
             renderer.update(helper.camera.camera, helper.camera.scene);
             renderer.renderBlended(helper.camera.scene, helper.camera.camera);
         }
+        let needsTargetCopy = false;
         if (antialiasingEnabled) {
             const input = postprocessing_1.PostprocessingPass.isEnabled(props.postprocessing)
                 ? this.postprocessing.target.texture
                 : this.colorTarget.texture;
-            this.antialiasing.render(camera, input, toDrawingBuffer, props.postprocessing);
+            this.antialiasing.render(camera, input, toDrawingBuffer && !dofEnabled, props.postprocessing);
         }
-        else if (toDrawingBuffer) {
+        else if (toDrawingBuffer && !dof_1.DofPass.isEnabled(props.postprocessing)) {
+            needsTargetCopy = true;
+        }
+        if (props.postprocessing.dof.name === 'on') {
+            const input = postprocessing_1.AntialiasingPass.isEnabled(props.postprocessing)
+                ? this.antialiasing.target.texture
+                : postprocessing_1.PostprocessingPass.isEnabled(props.postprocessing)
+                    ? this.postprocessing.target.texture
+                    : this.colorTarget.texture;
+            this.dof.update(camera, input, ((_a = this.depthTargetOpaque) === null || _a === void 0 ? void 0 : _a.texture) || this.depthTextureOpaque, this.depthTextureTransparent, props.postprocessing.dof.params, scene.boundingSphereVisible);
+            this.dof.render(camera.viewport, toDrawingBuffer ? undefined : this.getColorTarget(props.postprocessing));
+        }
+        else if (toDrawingBuffer && !postprocessing_1.AntialiasingPass.isEnabled(props.postprocessing)) {
+            needsTargetCopy = true;
+        }
+        if (needsTargetCopy) {
             this.drawTarget.bind();
             this.webgl.state.disable(this.webgl.gl.DEPTH_TEST);
             if (postprocessingEnabled) {
@@ -333,7 +353,7 @@ class DrawPass {
                 renderer.renderEmissive(scene.primitives, camera, null);
             }
             if (!emissiveBloom || scene.emissiveAverage > 0) {
-                this.bloom.update(this.colorTarget.texture, this.bloom.emissiveTarget.texture, ((_a = this.depthTargetOpaque) === null || _a === void 0 ? void 0 : _a.texture) || this.depthTextureOpaque, props.postprocessing.bloom.params);
+                this.bloom.update(this.colorTarget.texture, this.bloom.emissiveTarget.texture, ((_b = this.depthTargetOpaque) === null || _b === void 0 ? void 0 : _b.texture) || this.depthTextureOpaque, props.postprocessing.bloom.params);
                 this.bloom.render(camera.viewport, toDrawingBuffer ? undefined : this.getColorTarget(props.postprocessing));
             }
         }
@@ -367,7 +387,10 @@ class DrawPass {
             this.webgl.timer.markEnd('DrawPass.render');
     }
     getColorTarget(postprocessingProps) {
-        if (postprocessing_1.AntialiasingPass.isEnabled(postprocessingProps)) {
+        if (dof_1.DofPass.isEnabled(postprocessingProps)) {
+            return this.dof.target;
+        }
+        else if (postprocessing_1.AntialiasingPass.isEnabled(postprocessingProps)) {
             return this.antialiasing.target;
         }
         else if (postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)) {

package/lib/commonjs/mol-canvas3d/passes/image.d.ts

@@ -19,6 +19,7 @@ export declare const ImageParams: {
         mode: string;
         sampleLevel: number;
         reduceFlicker: boolean;
+        reuseOcclusion: boolean;
     }>>;
     postprocessing: PD.Group<PD.Normalize<{
         occlusion: PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
@@ -27,6 +28,7 @@ export declare const ImageParams: {
             radius: any;
             bias: any;
             blurKernelSize: any;
+            blurDepthBias: any;
             resolutionScale: any;
             color: any;
         }>, "on">;
@@ -42,6 +44,14 @@ export declare const ImageParams: {
             color: any;
             includeTransparent: any;
         }>, "on">;
+        dof: PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
+            blurSize: any;
+            blurSpread: any;
+            inFocus: any;
+            PPM: any;
+            center: any;
+            mode: any;
+        }>, "on">;
         antialiasing: PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
             edgeThreshold: any;
             maxSearchSteps: any;

package/lib/commonjs/mol-canvas3d/passes/multi-sample.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -18,6 +18,7 @@ export declare const MultiSampleParams: {
     mode: PD.Select<string>;
     sampleLevel: PD.Numeric;
     reduceFlicker: PD.BooleanParam;
+    reuseOcclusion: PD.BooleanParam;
 };
 export type MultiSampleProps = PD.Values<typeof MultiSampleParams>;
 type Props = {

package/lib/commonjs/mol-canvas3d/passes/multi-sample.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -40,6 +40,7 @@ exports.MultiSampleParams = {
     mode: param_definition_1.ParamDefinition.Select('temporal', [['off', 'Off'], ['on', 'On'], ['temporal', 'Temporal']]),
     sampleLevel: param_definition_1.ParamDefinition.Numeric(2, { min: 0, max: 5, step: 1 }, { description: 'Take level^2 samples.' }),
     reduceFlicker: param_definition_1.ParamDefinition.Boolean(true, { description: 'Reduce flicker in "temporal" mode.' }),
+    reuseOcclusion: param_definition_1.ParamDefinition.Boolean(true, { description: 'Reuse occlusion data. It is faster but has some artefacts.' }),
 };
 class MultiSamplePass {
     static isEnabled(props) {
@@ -117,7 +118,7 @@ class MultiSamplePass {
             const sampleWeight = baseSampleWeight + roundingRange * uniformCenteredDistribution;
             mol_util_1.ValueCell.update(compose.values.uWeight, sampleWeight);
             // render scene
-            if (i === 0) {
+            if (i === 0 || !props.multiSample.reuseOcclusion) {
                 drawPass.postprocessing.setOcclusionOffset(0, 0);
             }
             else {
@@ -196,7 +197,7 @@ class MultiSamplePass {
                 camera_1.Camera.setViewOffset(camera.viewOffset, width, height, offset[0], offset[1], width, height);
                 camera.update();
                 // render scene
-                if (sampleIndex === 0) {
+                if (sampleIndex === 0 || !props.multiSample.reuseOcclusion) {
                     drawPass.postprocessing.setOcclusionOffset(0, 0);
                 }
                 else {

package/lib/commonjs/mol-canvas3d/passes/postprocessing.d.ts

@@ -45,6 +45,7 @@ export declare const PostprocessingParams: {
         radius: number;
         bias: number;
         blurKernelSize: number;
+        blurDepthBias: number;
         resolutionScale: number;
         color: Color;
     }>, "on">>;
@@ -60,6 +61,14 @@ export declare const PostprocessingParams: {
         color: Color;
         includeTransparent: boolean;
     }>, "on">>;
+    dof: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
+        blurSize: number;
+        blurSpread: number;
+        inFocus: number;
+        PPM: number;
+        center: string;
+        mode: string;
+    }>, "on">>;
     antialiasing: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
         edgeThreshold: number;
         maxSearchSteps: number;

package/lib/commonjs/mol-canvas3d/passes/postprocessing.js

@@ -7,7 +7,8 @@
  * @author Ludovic Autin <ludovic.autin@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AntialiasingPass = exports.PostprocessingPass = exports.PostprocessingParams = exports.getOutlinesRenderable = exports.OutlinesSchema = void 0;
+exports.AntialiasingPass = exports.PostprocessingPass = exports.PostprocessingParams = exports.OutlinesSchema = void 0;
+exports.getOutlinesRenderable = getOutlinesRenderable;
 const util_1 = require("../../mol-gl/compute/util");
 const schema_1 = require("../../mol-gl/renderable/schema");
 const shader_code_1 = require("../../mol-gl/shader-code");
@@ -28,6 +29,7 @@ const debug_1 = require("../../mol-util/debug");
 const background_1 = require("./background");
 const shadows_frag_1 = require("../../mol-gl/shader/shadows.frag");
 const cas_1 = require("./cas");
+const dof_1 = require("./dof");
 const bloom_1 = require("./bloom");
 exports.OutlinesSchema = {
     ...util_1.QuadSchema,
@@ -61,7 +63,6 @@ function getOutlinesRenderable(ctx, depthTextureOpaque, depthTextureTransparent,
     const renderItem = (0, render_item_1.createComputeRenderItem)(ctx, 'triangles', shaderCode, schema, values);
     return (0, renderable_1.createComputeRenderable)(renderItem, values);
 }
-exports.getOutlinesRenderable = getOutlinesRenderable;
 const ShadowsSchema = {
     ...util_1.QuadSchema,
     tDepth: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'),
@@ -158,6 +159,7 @@ const SsaoBlurSchema = {
     uTexSize: (0, schema_1.UniformSpec)('v2'),
     uKernel: (0, schema_1.UniformSpec)('f[]'),
     dOcclusionKernelSize: (0, schema_1.DefineSpec)('number'),
+    uBlurDepthBias: (0, schema_1.UniformSpec)('f'),
     uBlurDirectionX: (0, schema_1.UniformSpec)('f'),
     uBlurDirectionY: (0, schema_1.UniformSpec)('f'),
     uInvProjection: (0, schema_1.UniformSpec)('m4'),
@@ -173,6 +175,7 @@ function getSsaoBlurRenderable(ctx, ssaoDepthTexture, direction) {
         uTexSize: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(ssaoDepthTexture.getWidth(), ssaoDepthTexture.getHeight())),
         uKernel: mol_util_1.ValueCell.create(getBlurKernel(15)),
         dOcclusionKernelSize: mol_util_1.ValueCell.create(15),
+        uBlurDepthBias: mol_util_1.ValueCell.create(0.5),
         uBlurDirectionX: mol_util_1.ValueCell.create(direction === 'horizontal' ? 1 : 0),
         uBlurDirectionY: mol_util_1.ValueCell.create(direction === 'vertical' ? 1 : 0),
         uInvProjection: mol_util_1.ValueCell.create(linear_algebra_1.Mat4.identity()),
@@ -295,6 +298,7 @@ exports.PostprocessingParams = {
             radius: param_definition_1.ParamDefinition.Numeric(5, { min: 0, max: 20, step: 0.1 }, { description: 'Final occlusion radius is 2^x', hideIf: p => (p === null || p === void 0 ? void 0 : p.multiScale.name) === 'on' }),
             bias: param_definition_1.ParamDefinition.Numeric(0.8, { min: 0, max: 3, step: 0.1 }),
             blurKernelSize: param_definition_1.ParamDefinition.Numeric(15, { min: 1, max: 25, step: 2 }),
+            blurDepthBias: param_definition_1.ParamDefinition.Numeric(0.5, { min: 0, max: 1, step: 0.01 }),
             resolutionScale: param_definition_1.ParamDefinition.Numeric(1, { min: 0.1, max: 1, step: 0.05 }, { description: 'Adjust resolution of occlusion calculation' }),
             color: param_definition_1.ParamDefinition.Color((0, color_1.Color)(0x000000)),
         }),
@@ -318,6 +322,10 @@ exports.PostprocessingParams = {
         }),
         off: param_definition_1.ParamDefinition.Group({})
     }, { cycle: true, description: 'Draw outline around 3D objects' }),
+    dof: param_definition_1.ParamDefinition.MappedStatic('off', {
+        on: param_definition_1.ParamDefinition.Group(dof_1.DofParams),
+        off: param_definition_1.ParamDefinition.Group({})
+    }, { cycle: true, description: 'DOF' }),
     antialiasing: param_definition_1.ParamDefinition.MappedStatic('smaa', {
         fxaa: param_definition_1.ParamDefinition.Group(fxaa_1.FxaaParams),
         smaa: param_definition_1.ParamDefinition.Group(smaa_1.SmaaParams),
@@ -479,6 +487,8 @@ class PostprocessingPass {
             mol_util_1.ValueCell.updateIfChanged(this.ssaoBlurSecondPassRenderable.values.uFar, camera.far);
             mol_util_1.ValueCell.update(this.ssaoBlurFirstPassRenderable.values.uInvProjection, invProjection);
             mol_util_1.ValueCell.update(this.ssaoBlurSecondPassRenderable.values.uInvProjection, invProjection);
+            mol_util_1.ValueCell.update(this.ssaoBlurFirstPassRenderable.values.uBlurDepthBias, props.occlusion.params.blurDepthBias);
+            mol_util_1.ValueCell.update(this.ssaoBlurSecondPassRenderable.values.uBlurDepthBias, props.occlusion.params.blurDepthBias);
             if (this.ssaoBlurFirstPassRenderable.values.dOrthographic.ref.value !== orthographic) {
                 needsUpdateSsaoBlur = true;
                 mol_util_1.ValueCell.update(this.ssaoBlurFirstPassRenderable.values.dOrthographic, orthographic);

package/lib/commonjs/mol-canvas3d/util.js

@@ -5,14 +5,15 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.canvasToBlob = exports.resizeCanvas = exports.setCanvasSize = void 0;
+exports.setCanvasSize = setCanvasSize;
+exports.resizeCanvas = resizeCanvas;
+exports.canvasToBlob = canvasToBlob;
 /** Set canvas size taking `devicePixelRatio` into account */
 function setCanvasSize(canvas, width, height, scale = 1) {
     canvas.width = Math.round(window.devicePixelRatio * scale * width);
     canvas.height = Math.round(window.devicePixelRatio * scale * height);
     Object.assign(canvas.style, { width: `${width}px`, height: `${height}px` });
 }
-exports.setCanvasSize = setCanvasSize;
 /** Resize canvas to container element taking `devicePixelRatio` into account */
 function resizeCanvas(canvas, container, scale = 1) {
     let width = window.innerWidth;
@@ -24,7 +25,6 @@ function resizeCanvas(canvas, container, scale = 1) {
     }
     setCanvasSize(canvas, width, height, scale);
 }
-exports.resizeCanvas = resizeCanvas;
 function _canvasToBlob(canvas, callback, type, quality) {
     const bin = atob(canvas.toDataURL(type, quality).split(',')[1]);
     const len = bin.length;
@@ -59,4 +59,3 @@ async function canvasToBlob(canvas, type, quality) {
         }
     });
 }
-exports.canvasToBlob = canvasToBlob;

package/lib/commonjs/mol-data/db/column-helpers.js

@@ -5,34 +5,34 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typedArrayWindow = exports.isTypedArray = exports.createAndFillArray = exports.fillArrayValues = exports.createArray = exports.getArrayBounds = void 0;
+exports.getArrayBounds = getArrayBounds;
+exports.createArray = createArray;
+exports.fillArrayValues = fillArrayValues;
+exports.createAndFillArray = createAndFillArray;
+exports.isTypedArray = isTypedArray;
+exports.typedArrayWindow = typedArrayWindow;
 function getArrayBounds(rowCount, params) {
     const start = params && typeof params.start !== 'undefined' ? Math.max(Math.min(params.start, rowCount - 1), 0) : 0;
     const end = params && typeof params.end !== 'undefined' ? Math.min(params.end, rowCount) : rowCount;
     return { start, end };
 }
-exports.getArrayBounds = getArrayBounds;
 function createArray(rowCount, params) {
     const c = params && typeof params.array !== 'undefined' ? params.array : Array;
     const { start, end } = getArrayBounds(rowCount, params);
     return { array: new c(end - start), start, end };
 }
-exports.createArray = createArray;
 function fillArrayValues(value, target, start) {
     for (let i = 0, _e = target.length; i < _e; i++)
         target[i] = value(start + i);
     return target;
 }
-exports.fillArrayValues = fillArrayValues;
 function createAndFillArray(rowCount, value, params) {
     const { array, start } = createArray(rowCount, params);
     return fillArrayValues(value, array, start);
 }
-exports.createAndFillArray = createAndFillArray;
 function isTypedArray(data) {
     return !!data.buffer && typeof data.byteLength === 'number' && typeof data.BYTES_PER_ELEMENT === 'number';
 }
-exports.isTypedArray = isTypedArray;
 function typedArrayWindow(data, params) {
     const { constructor, buffer, length, byteOffset, BYTES_PER_ELEMENT } = data;
     const { start, end } = getArrayBounds(length, params);
@@ -40,4 +40,3 @@ function typedArrayWindow(data, params) {
         return data;
     return new constructor(buffer, byteOffset + BYTES_PER_ELEMENT * start, Math.min(length, end - start));
 }
-exports.typedArrayWindow = typedArrayWindow;

package/lib/commonjs/mol-data/db/column.d.ts

@@ -137,7 +137,7 @@ declare namespace Column {
     function view<T>(column: Column<T>, indices: ArrayLike<number>, checkIndentity?: boolean): Column<T>;
     /** A map of the 1st occurence of each value. */
     function createFirstIndexMap<T>(column: Column<T>): Map<T, number>;
-    function createIndexer<T, R extends number = number>(column: Column<T>): (e: T) => R;
+    function createIndexer<T, R extends number = number>(column: Column<T>): ((e: T) => R);
     function mapToArray<T, S>(column: Column<T>, f: (v: T) => S, ctor?: ArrayCtor<S>): ArrayLike<S>;
     function areEqual<T>(a: Column<T>, b: Column<T>): boolean;
     function indicesOf<T>(c: Column<T>, test: (e: T) => boolean): number[];

package/lib/commonjs/mol-data/generic/hash-set.js

@@ -5,7 +5,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HashSet = void 0;
+exports.HashSet = HashSet;
 class HashSetImpl {
     add(a) {
         const hash = this.getHash(a);
@@ -47,4 +47,3 @@ class HashSetImpl {
 function HashSet(getHash, areEqual) {
     return new HashSetImpl(getHash, areEqual);
 }
-exports.HashSet = HashSet;

package/lib/commonjs/mol-data/generic/linked-list.js

@@ -5,11 +5,10 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LinkedList = void 0;
+exports.LinkedList = LinkedList;
 function LinkedList() {
     return new LinkedListImpl();
 }
-exports.LinkedList = LinkedList;
 function createListNode(value) {
     return { previous: null, next: null, inList: true, value };
 }

package/lib/commonjs/mol-data/int/impl/interval.js

@@ -5,31 +5,38 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.intersectionSize = exports.intersect = exports.findRange = exports.findPredecessorIndexInInterval = exports.findPredecessorIndex = exports.isSubInterval = exports.areIntersecting = exports.areEqual = exports.getAt = exports.indexOf = exports.has = exports.toString = exports.hashCode = exports.size = exports.max = exports.min = exports.end = exports.start = exports.is = exports.ofLength = exports.ofBounds = exports.ofRange = exports.Empty = void 0;
+exports.areEqual = exports.toString = exports.hashCode = exports.size = exports.min = exports.end = exports.start = exports.is = exports.Empty = void 0;
+exports.ofRange = ofRange;
+exports.ofBounds = ofBounds;
+exports.ofLength = ofLength;
+exports.max = max;
+exports.has = has;
+exports.indexOf = indexOf;
+exports.getAt = getAt;
+exports.areIntersecting = areIntersecting;
+exports.isSubInterval = isSubInterval;
+exports.findPredecessorIndex = findPredecessorIndex;
+exports.findPredecessorIndexInInterval = findPredecessorIndexInInterval;
+exports.findRange = findRange;
+exports.intersect = intersect;
+exports.intersectionSize = intersectionSize;
 const tuple_1 = require("../tuple");
 exports.Empty = tuple_1.IntTuple.Zero;
 function ofRange(min, max) { return max < min ? tuple_1.IntTuple.create(min, min) : tuple_1.IntTuple.create(min, max + 1); }
-exports.ofRange = ofRange;
 function ofBounds(start, end) { return end <= start ? tuple_1.IntTuple.create(start, start) : tuple_1.IntTuple.create(start, end); }
-exports.ofBounds = ofBounds;
 function ofLength(length) { return length < 0 ? tuple_1.IntTuple.create(0, 0) : tuple_1.IntTuple.create(0, length); }
-exports.ofLength = ofLength;
 exports.is = tuple_1.IntTuple.is;
 exports.start = tuple_1.IntTuple.fst;
 exports.end = tuple_1.IntTuple.snd;
 exports.min = tuple_1.IntTuple.fst;
 function max(i) { return tuple_1.IntTuple.snd(i) - 1; }
-exports.max = max;
 exports.size = tuple_1.IntTuple.diff;
 exports.hashCode = tuple_1.IntTuple.hashCode;
 exports.toString = tuple_1.IntTuple.toString;
 function has(int, v) { return tuple_1.IntTuple.fst(int) <= v && v < tuple_1.IntTuple.snd(int); }
-exports.has = has;
 /** Returns the index of `x` in `set` or -1 if not found. */
 function indexOf(int, x) { const m = (0, exports.start)(int); return x >= m && x < (0, exports.end)(int) ? x - m : -1; }
-exports.indexOf = indexOf;
 function getAt(int, i) { return tuple_1.IntTuple.fst(int) + i; }
-exports.getAt = getAt;
 exports.areEqual = tuple_1.IntTuple.areEqual;
 function areIntersecting(a, b) {
     const sa = (0, exports.size)(a), sb = (0, exports.size)(b);
@@ -37,7 +44,6 @@ function areIntersecting(a, b) {
         return true;
     return sa > 0 && sb > 0 && max(a) >= (0, exports.min)(b) && (0, exports.min)(a) <= max(b);
 }
-exports.areIntersecting = areIntersecting;
 function isSubInterval(a, b) {
     if (!(0, exports.size)(a))
         return (0, exports.size)(b) === 0;
@@ -45,7 +51,6 @@ function isSubInterval(a, b) {
         return true;
     return (0, exports.start)(a) <= (0, exports.start)(b) && (0, exports.end)(a) >= (0, exports.end)(b);
 }
-exports.isSubInterval = isSubInterval;
 function findPredecessorIndex(int, v) {
     const s = (0, exports.start)(int);
     if (v <= s)
@@ -55,7 +60,6 @@ function findPredecessorIndex(int, v) {
         return e - s;
     return v - s;
 }
-exports.findPredecessorIndex = findPredecessorIndex;
 function findPredecessorIndexInInterval(int, v, bounds) {
     const bS = (0, exports.start)(bounds);
     const s = (0, exports.start)(int);
@@ -66,18 +70,14 @@ function findPredecessorIndexInInterval(int, v, bounds) {
         return bE;
     return v - s;
 }
-exports.findPredecessorIndexInInterval = findPredecessorIndexInInterval;
 function findRange(int, min, max) {
     return ofBounds(findPredecessorIndex(int, min), findPredecessorIndex(int, max + 1));
 }
-exports.findRange = findRange;
 function intersect(a, b) {
     if (!areIntersecting(a, b))
         return exports.Empty;
     return ofBounds(Math.max((0, exports.start)(a), (0, exports.start)(b)), Math.min((0, exports.end)(a), (0, exports.end)(b)));
 }
-exports.intersect = intersect;
 function intersectionSize(a, b) {
     return (0, exports.size)(findRange(a, (0, exports.min)(b), max(b)));
 }
-exports.intersectionSize = intersectionSize;

package/lib/commonjs/mol-data/int/impl/ordered-set.js

@@ -5,7 +5,31 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.indexedIntersect = exports.forEachSegment = exports.forEach = exports.subtract = exports.intersect = exports.union = exports.intersectionSize = exports.findRange = exports.findPredecessorIndexInInterval = exports.findPredecessorIndex = exports.isSubset = exports.areIntersecting = exports.areEqual = exports.toString = exports.hashCode = exports.end = exports.start = exports.max = exports.min = exports.getAt = exports.indexOf = exports.has = exports.size = exports.ofSortedArray = exports.ofBounds = exports.ofRange = exports.ofSingleton = exports.Empty = void 0;
+exports.ofBounds = exports.ofRange = exports.ofSingleton = exports.Empty = void 0;
+exports.ofSortedArray = ofSortedArray;
+exports.size = size;
+exports.has = has;
+exports.indexOf = indexOf;
+exports.getAt = getAt;
+exports.min = min;
+exports.max = max;
+exports.start = start;
+exports.end = end;
+exports.hashCode = hashCode;
+exports.toString = toString;
+exports.areEqual = areEqual;
+exports.areIntersecting = areIntersecting;
+exports.isSubset = isSubset;
+exports.findPredecessorIndex = findPredecessorIndex;
+exports.findPredecessorIndexInInterval = findPredecessorIndexInInterval;
+exports.findRange = findRange;
+exports.intersectionSize = intersectionSize;
+exports.union = union;
+exports.intersect = intersect;
+exports.subtract = subtract;
+exports.forEach = forEach;
+exports.forEachSegment = forEachSegment;
+exports.indexedIntersect = indexedIntersect;
 const sorted_array_1 = require("../sorted-array");
 const interval_1 = require("../interval");
 exports.Empty = interval_1.Interval.Empty;
@@ -20,29 +44,18 @@ function ofSortedArray(xs) {
         return interval_1.Interval.ofRange(xs[0], xs[xs.length - 1]);
     return xs;
 }
-exports.ofSortedArray = ofSortedArray;
 function size(set) { return interval_1.Interval.is(set) ? interval_1.Interval.size(set) : sorted_array_1.SortedArray.size(set); }
-exports.size = size;
 function has(set, x) { return interval_1.Interval.is(set) ? interval_1.Interval.has(set, x) : sorted_array_1.SortedArray.has(set, x); }
-exports.has = has;
 /** Returns the index of `x` in `set` or -1 if not found. */
 function indexOf(set, x) { return interval_1.Interval.is(set) ? interval_1.Interval.indexOf(set, x) : sorted_array_1.SortedArray.indexOf(set, x); }
-exports.indexOf = indexOf;
 function getAt(set, i) { return interval_1.Interval.is(set) ? interval_1.Interval.getAt(set, i) : set[i]; }
-exports.getAt = getAt;
 function min(set) { return interval_1.Interval.is(set) ? interval_1.Interval.min(set) : sorted_array_1.SortedArray.min(set); }
-exports.min = min;
 function max(set) { return interval_1.Interval.is(set) ? interval_1.Interval.max(set) : sorted_array_1.SortedArray.max(set); }
-exports.max = max;
 function start(set) { return interval_1.Interval.is(set) ? interval_1.Interval.start(set) : sorted_array_1.SortedArray.start(set); }
-exports.start = start;
 function end(set) { return interval_1.Interval.is(set) ? interval_1.Interval.end(set) : sorted_array_1.SortedArray.end(set); }
-exports.end = end;
 function hashCode(set) { return interval_1.Interval.is(set) ? interval_1.Interval.hashCode(set) : sorted_array_1.SortedArray.hashCode(set); }
-exports.hashCode = hashCode;
 // TODO: possibly add more hash functions to allow for multilevel hashing.
 function toString(set) { return interval_1.Interval.is(set) ? interval_1.Interval.toString(set) : sorted_array_1.SortedArray.toString(set); }
-exports.toString = toString;
 function areEqual(a, b) {
     if (interval_1.Interval.is(a)) {
         if (interval_1.Interval.is(b))
@@ -53,7 +66,6 @@ function areEqual(a, b) {
         return areEqualIS(b, a);
     return sorted_array_1.SortedArray.areEqual(a, b);
 }
-exports.areEqual = areEqual;
 function areIntersecting(a, b) {
     if (interval_1.Interval.is(a)) {
         if (interval_1.Interval.is(b))
@@ -64,7 +76,6 @@ function areIntersecting(a, b) {
         return areIntersectingSI(a, b);
     return sorted_array_1.SortedArray.areIntersecting(a, b);
 }
-exports.areIntersecting = areIntersecting;
 /** Check if the 2nd argument is a subset of the 1st */
 function isSubset(a, b) {
     if (interval_1.Interval.is(a)) {
@@ -76,19 +87,15 @@ function isSubset(a, b) {
         return isSubsetSI(a, b);
     return sorted_array_1.SortedArray.isSubset(a, b);
 }
-exports.isSubset = isSubset;
 function findPredecessorIndex(set, x) {
     return interval_1.Interval.is(set) ? interval_1.Interval.findPredecessorIndex(set, x) : sorted_array_1.SortedArray.findPredecessorIndex(set, x);
 }
-exports.findPredecessorIndex = findPredecessorIndex;
 function findPredecessorIndexInInterval(set, x, bounds) {
     return interval_1.Interval.is(set) ? interval_1.Interval.findPredecessorIndexInInterval(set, x, bounds) : sorted_array_1.SortedArray.findPredecessorIndexInInterval(set, x, bounds);
 }
-exports.findPredecessorIndexInInterval = findPredecessorIndexInInterval;
 function findRange(set, min, max) {
     return interval_1.Interval.is(set) ? interval_1.Interval.findRange(set, min, max) : sorted_array_1.SortedArray.findRange(set, min, max);
 }
-exports.findRange = findRange;
 function intersectionSize(a, b) {
     if (interval_1.Interval.is(a)) {
         if (interval_1.Interval.is(b))
@@ -99,7 +106,6 @@ function intersectionSize(a, b) {
         return intersectionSizeSI(a, b);
     return sorted_array_1.SortedArray.intersectionSize(a, b);
 }
-exports.intersectionSize = intersectionSize;
 function union(a, b) {
     if (interval_1.Interval.is(a)) {
         if (interval_1.Interval.is(b))
@@ -110,7 +116,6 @@ function union(a, b) {
         return unionSI(a, b);
     return ofSortedArray(sorted_array_1.SortedArray.union(a, b));
 }
-exports.union = union;
 function intersect(a, b) {
     if (interval_1.Interval.is(a)) {
         if (interval_1.Interval.is(b))
@@ -121,7 +126,6 @@ function intersect(a, b) {
         return intersectSI(a, b);
     return ofSortedArray(sorted_array_1.SortedArray.intersect(a, b));
 }
-exports.intersect = intersect;
 function subtract(a, b) {
     if (interval_1.Interval.is(a)) {
         if (interval_1.Interval.is(b))
@@ -132,7 +136,6 @@ function subtract(a, b) {
         return subtractSI(a, b);
     return ofSortedArray(sorted_array_1.SortedArray.subtract(a, b));
 }
-exports.subtract = subtract;
 function areEqualIS(a, b) { return interval_1.Interval.size(a) === sorted_array_1.SortedArray.size(b) && interval_1.Interval.start(a) === sorted_array_1.SortedArray.start(b) && interval_1.Interval.end(a) === sorted_array_1.SortedArray.end(b); }
 function areIntersectingSI(a, b) {
     return a.length !== 0 && interval_1.Interval.size(sorted_array_1.SortedArray.findRange(a, interval_1.Interval.min(b), interval_1.Interval.max(b))) !== 0;
@@ -338,7 +341,6 @@ function forEach(set, f, ctx) {
     }
     return ctx;
 }
-exports.forEach = forEach;
 function forEachSegment(set, segment, f, ctx) {
     if (interval_1.Interval.is(set)) {
         let sI = 0;
@@ -366,7 +368,6 @@ function forEachSegment(set, segment, f, ctx) {
     }
     return ctx;
 }
-exports.forEachSegment = forEachSegment;
 function indexedIntersect(idxA, a, b) {
     if (a === b)
         return idxA;
@@ -419,4 +420,3 @@ function indexedIntersect(idxA, a, b) {
     }
     return ofSortedArray(indices);
 }
-exports.indexedIntersect = indexedIntersect;