molstar 3.8.2 → 3.9.0

package/lib/mol-util/debug.d.ts

@@ -13,6 +13,11 @@ declare let isProductionMode: boolean;
  * mostly used in `mol-gl` and in valence-model calculation
  */
 declare let isDebugMode: boolean;
-export { isProductionMode, isDebugMode };
+/**
+ * set to true to gather timings, mostly used in `mol-gl`
+ */
+declare let isTimingMode: boolean;
+export { isProductionMode, isDebugMode, isTimingMode };
 export declare function setProductionMode(value?: boolean): void;
 export declare function setDebugMode(value?: boolean): void;
+export declare function setTimingMode(value?: boolean): void;

package/lib/mol-util/debug.js

@@ -28,7 +28,11 @@ var isDebugMode = function getIsDebug() {
         return false;
     }
 }();
-export { isProductionMode, isDebugMode };
+/**
+ * set to true to gather timings, mostly used in `mol-gl`
+ */
+var isTimingMode = false;
+export { isProductionMode, isDebugMode, isTimingMode };
 export function setProductionMode(value) {
     if (typeof value !== 'undefined')
         isProductionMode = value;
@@ -37,3 +41,7 @@ export function setDebugMode(value) {
     if (typeof value !== 'undefined')
         isDebugMode = value;
 }
+export function setTimingMode(value) {
+    if (typeof value !== 'undefined')
+        isTimingMode = value;
+}

package/lib/mol-util/input/input-observer.js

@@ -149,10 +149,10 @@ var InputObserver;
         function getModifierKeys() {
             return __assign({}, modifierKeys);
         }
-        var dragging = 0 /* Stopped */;
+        var dragging = 0 /* DraggingState.Stopped */;
         var disposed = false;
-        var buttons = ButtonsType.create(0 /* None */);
-        var button = 0 /* None */;
+        var buttons = ButtonsType.create(0 /* ButtonsType.Flag.None */);
+        var button = 0 /* ButtonsType.Flag.None */;
         var isInside = false;
         var events = createEvents();
         var drag = events.drag, interactionEnd = events.interactionEnd, wheel = events.wheel, pinch = events.pinch, gesture = events.gesture, click = events.click, move = events.move, leave = events.leave, enter = events.enter, resize = events.resize, modifiers = events.modifiers, key = events.key;
@@ -297,12 +297,12 @@ var InputObserver;
         function onTouchStart(ev) {
             ev.preventDefault();
             if (ev.touches.length === 1) {
-                buttons = button = 1 /* Primary */;
+                buttons = button = 1 /* ButtonsType.Flag.Primary */;
                 onPointerDown(ev.touches[0]);
             }
             else if (ev.touches.length === 2) {
-                buttons = 2 /* Secondary */ & 4 /* Auxilary */;
-                button = 2 /* Secondary */;
+                buttons = 2 /* ButtonsType.Flag.Secondary */ & 4 /* ButtonsType.Flag.Auxilary */;
+                button = 2 /* ButtonsType.Flag.Secondary */;
                 onPointerDown(getCenterTouch(ev));
                 var touchDistance = getTouchDistance(ev);
                 lastTouchDistance = touchDistance;
@@ -318,7 +318,7 @@ var InputObserver;
                 });
             }
             else if (ev.touches.length === 3) {
-                buttons = button = 8 /* Forth */;
+                buttons = button = 8 /* ButtonsType.Flag.Forth */;
                 onPointerDown(getCenterTouch(ev));
             }
         }
@@ -326,7 +326,7 @@ var InputObserver;
             endDrag();
         }
         function onTouchMove(ev) {
-            button = 0 /* None */;
+            button = 0 /* ButtonsType.Flag.None */;
             if (noPinchZoom) {
                 ev.preventDefault();
                 ev.stopPropagation();
@@ -336,18 +336,18 @@ var InputObserver;
                 }
             }
             if (ev.touches.length === 1) {
-                buttons = 1 /* Primary */;
+                buttons = 1 /* ButtonsType.Flag.Primary */;
                 onPointerMove(ev.touches[0]);
             }
             else if (ev.touches.length === 2) {
                 var touchDistance = getTouchDistance(ev);
                 var touchDelta = lastTouchDistance - touchDistance;
                 if (Math.abs(touchDelta) < 4) {
-                    buttons = 2 /* Secondary */;
+                    buttons = 2 /* ButtonsType.Flag.Secondary */;
                     onPointerMove(getCenterTouch(ev));
                 }
                 else {
-                    buttons = 4 /* Auxilary */;
+                    buttons = 4 /* ButtonsType.Flag.Auxilary */;
                     updateModifierKeys(ev);
                     var fraction = lastTouchDistance / touchDistance;
                     pinch.next({
@@ -365,7 +365,7 @@ var InputObserver;
                 lastTouchDistance = touchDistance;
             }
             else if (ev.touches.length === 3) {
-                buttons = 8 /* Forth */;
+                buttons = 8 /* ButtonsType.Flag.Forth */;
                 onPointerMove(getCenterTouch(ev));
             }
         }
@@ -373,7 +373,7 @@ var InputObserver;
             updateModifierKeys(ev);
             buttons = getButtons(ev);
             button = getButton(ev);
-            if (noMiddleClickScroll && buttons === 4 /* Auxilary */) {
+            if (noMiddleClickScroll && buttons === 4 /* ButtonsType.Flag.Auxilary */) {
                 ev.preventDefault;
             }
             onPointerDown(ev);
@@ -381,7 +381,7 @@ var InputObserver;
         function onMouseMove(ev) {
             updateModifierKeys(ev);
             buttons = getButtons(ev);
-            button = 0 /* None */;
+            button = 0 /* ButtonsType.Flag.None */;
             onPointerMove(ev);
         }
         function onMouseUp(ev) {
@@ -400,11 +400,11 @@ var InputObserver;
             eventOffset(pointerStart, ev);
             Vec2.copy(pointerDown, pointerStart);
             if (insideBounds(pointerStart)) {
-                dragging = 1 /* Started */;
+                dragging = 1 /* DraggingState.Started */;
             }
         }
         function onPointerUp(ev) {
-            dragging = 0 /* Stopped */;
+            dragging = 0 /* DraggingState.Stopped */;
             if (!mask(ev.clientX, ev.clientY))
                 return;
             eventOffset(pointerEnd, ev);
@@ -421,7 +421,7 @@ var InputObserver;
             var x = pointerEnd[0], y = pointerEnd[1];
             var inside = insideBounds(pointerEnd);
             move.next({ x: x, y: y, pageX: pageX, pageY: pageY, buttons: buttons, button: button, modifiers: getModifierKeys(), inside: inside });
-            if (dragging === 0 /* Stopped */)
+            if (dragging === 0 /* DraggingState.Stopped */)
                 return;
             if (noTextSelect) {
                 (_a = ev.preventDefault) === null || _a === void 0 ? void 0 : _a.call(ev);
@@ -429,13 +429,13 @@ var InputObserver;
             Vec2.div(pointerDelta, Vec2.sub(pointerDelta, pointerEnd, pointerStart), getClientSize(rectSize));
             if (Vec2.magnitude(pointerDelta) < EPSILON)
                 return;
-            var isStart = dragging === 1 /* Started */;
+            var isStart = dragging === 1 /* DraggingState.Started */;
             if (isStart && !mask(ev.clientX, ev.clientY))
                 return;
             var dx = pointerDelta[0], dy = pointerDelta[1];
             drag.next({ x: x, y: y, dx: dx, dy: dy, pageX: pageX, pageY: pageY, buttons: buttons, button: button, modifiers: getModifierKeys(), isStart: isStart });
             Vec2.copy(pointerStart, pointerEnd);
-            dragging = 2 /* Moving */;
+            dragging = 2 /* DraggingState.Moving */;
         }
         function onMouseWheel(ev) {
             if (!mask(ev.clientX, ev.clientY))
@@ -447,7 +447,7 @@ var InputObserver;
                 ev.preventDefault();
             }
             var normalized = normalizeWheel(ev);
-            buttons = button = 4 /* Auxilary */;
+            buttons = button = 4 /* ButtonsType.Flag.Auxilary */;
             if (normalized.dx || normalized.dy || normalized.dz) {
                 wheel.next(__assign(__assign({ x: x, y: y, pageX: pageX, pageY: pageY }, normalized), { buttons: buttons, button: button, modifiers: getModifierKeys() }));
             }

package/lib/mol-util/string-builder.js

@@ -56,7 +56,7 @@ var StringBuilder;
     var __paddingSpaces = [];
     (function () {
         var s = '';
-        for (var i = 0; i < 512 /* Count */; i++) {
+        for (var i = 0; i < 512 /* PaddingSpaces.Count */; i++) {
             __paddingSpaces[i] = s;
             s = s + ' ';
         }

package/lib/servers/model/preprocess/converter.js

@@ -17,7 +17,7 @@ function getCategoryInstanceProvider(cat, fields) {
 function classify(name, field) {
     var type = getCifFieldType(field);
     if (type['@type'] === 'str') {
-        return { name: name, type: 0 /* Str */, value: field.str, valueKind: field.valueKind };
+        return { name: name, type: 0 /* CifWriter.Field.Type.Str */, value: field.str, valueKind: field.valueKind };
     }
     else if (type['@type'] === 'float') {
         return CifWriter.Field.float(name, field.float, { valueKind: field.valueKind, typedArray: Float64Array });

package/lib/servers/model/server/query.js

@@ -313,7 +313,7 @@ export function abortingObserver(p) {
 }
 function string(name, str, isSpecified) {
     if (isSpecified) {
-        return CifField.str(name, function (i, d) { return str(d, i); }, { valueKind: function (i, d) { return isSpecified(d) ? 0 /* Present */ : 1 /* NotPresent */; } });
+        return CifField.str(name, function (i, d) { return str(d, i); }, { valueKind: function (i, d) { return isSpecified(d) ? 0 /* Column.ValueKind.Present */ : 1 /* Column.ValueKind.NotPresent */; } });
     }
     return CifField.str(name, function (i, d) { return str(d, i); });
 }

package/lib/servers/model/utils/fetch-retry.js

@@ -15,13 +15,14 @@ function isRetriableNetworkError(error) {
 }
 export function fetchRetry(url, timeout, retryCount, onRetry) {
     return __awaiter(this, void 0, void 0, function () {
-        var controller, id, result;
+        var controller, id, signal, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     controller = new AbortController();
                     id = setTimeout(function () { return controller.abort(); }, timeout);
-                    return [4 /*yield*/, retryIf(function () { return fetch(url, { signal: controller.signal }); }, {
+                    signal = controller.signal;
+                    return [4 /*yield*/, retryIf(function () { return fetch(url, { signal: signal }); }, {
                             retryThenIf: function (r) { return r.status === 408 /** timeout */ || r.status === 429 /** too many requests */ || (r.status >= 500 && r.status < 600); },
                             // TODO test retryCatchIf
                             retryCatchIf: function (e) { return isRetriableNetworkError(e); },

package/lib/servers/volume/server/algebra/coordinate.js

@@ -15,19 +15,19 @@ export function domain(kind, info) {
     };
 }
 export function cartesian(x, y, z) {
-    return { 0: x, 1: y, 2: z, kind: 0 /* Cartesian */ };
+    return { 0: x, 1: y, 2: z, kind: 0 /* Space.Cartesian */ };
 }
 export function fractional(x, y, z) {
-    return { 0: x, 1: y, 2: z, kind: 1 /* Fractional */ };
+    return { 0: x, 1: y, 2: z, kind: 1 /* Space.Fractional */ };
 }
 export function grid(domain, x, y, z) {
-    return { 0: x, 1: y, 2: z, kind: 2 /* Grid */, domain: domain };
+    return { 0: x, 1: y, 2: z, kind: 2 /* Space.Grid */, domain: domain };
 }
 export function withCoord(a, x, y, z) {
     switch (a.kind) {
-        case 0 /* Cartesian */: return cartesian(x, y, z);
-        case 1 /* Fractional */: return fractional(x, y, z);
-        case 2 /* Grid */: return grid(a.domain, x, y, z);
+        case 0 /* Space.Cartesian */: return cartesian(x, y, z);
+        case 1 /* Space.Fractional */: return fractional(x, y, z);
+        case 2 /* Space.Grid */: return grid(a.domain, x, y, z);
     }
 }
 export function clone(a) {

package/lib/servers/volume/server/query/encode.js

@@ -17,7 +17,7 @@ export function encode(query, output) {
 }
 function string(name, str, isSpecified) {
     if (isSpecified) {
-        return CifWriter.Field.str(name, function (i, d) { return str(d); }, { valueKind: function (i, d) { return isSpecified(d) ? 0 /* Present */ : 1 /* NotPresent */; } });
+        return CifWriter.Field.str(name, function (i, d) { return str(d); }, { valueKind: function (i, d) { return isSpecified(d) ? 0 /* Column.ValueKind.Present */ : 1 /* Column.ValueKind.NotPresent */; } });
     }
     return CifWriter.Field.str(name, function (i, d) { return str(d); });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "molstar",
-  "version": "3.8.2",
+  "version": "3.9.0",
   "description": "A comprehensive macromolecular library.",
   "homepage": "https://github.com/molstar/molstar#readme",
   "repository": {
@@ -102,11 +102,11 @@
     "@types/gl": "^4.1.0",
     "@types/jest": "^27.5.1",
     "@types/react": "^18.0.9",
-    "@types/react-dom": "^18.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
+    "@types/react-dom": "^18.0.5",
+    "@typescript-eslint/eslint-plugin": "^5.27.0",
+    "@typescript-eslint/parser": "^5.27.0",
     "benchmark": "^2.1.4",
-    "concurrently": "^7.2.0",
+    "concurrently": "^7.2.1",
     "cpx2": "^4.2.0",
     "crypto-browserify": "^3.12.0",
     "css-loader": "^6.7.1",
@@ -127,8 +127,8 @@
     "simple-git": "^3.7.1",
     "stream-browserify": "^3.0.0",
     "style-loader": "^3.3.1",
-    "ts-jest": "^28.0.2",
-    "typescript": "^4.6.4",
+    "ts-jest": "^28.0.3",
+    "typescript": "^4.7.2",
     "webpack": "^5.72.1",
     "webpack-cli": "^4.9.2"
   },
@@ -147,7 +147,7 @@
     "express": "^4.18.1",
     "h264-mp4-encoder": "^1.0.12",
     "immer": "^9.0.14",
-    "immutable": "^4.0.0",
+    "immutable": "^4.1.0",
     "node-fetch": "^2.6.7",
     "rxjs": "^7.5.5",
     "swagger-ui-dist": "^4.11.1",