molstar 3.4.0 → 3.6.1

package/lib/mol-gl/shader/lines.frag.d.ts

@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-export declare const lines_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nvoid main(){\n    #include clip_pixel\n\n    bool interior = false;\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";
+export declare const lines_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";

package/lib/mol-gl/shader/lines.frag.js

@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-export var lines_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nvoid main(){\n    #include clip_pixel\n\n    bool interior = false;\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";
+export var lines_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";

package/lib/mol-gl/shader/points.frag.d.ts

@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-export declare const points_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nconst vec2 center = vec2(0.5);\nconst float radius = 0.5;\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    bool interior = false;\n    #include assign_material_color\n\n    #if defined(dPointStyle_circle)\n        float dist = distance(gl_PointCoord, center);\n        if (dist > radius) discard;\n    #elif defined(dPointStyle_fuzzy)\n        float dist = distance(gl_PointCoord, center);\n        float fuzzyAlpha = 1.0 - smoothstep(0.0, radius, dist);\n        if (fuzzyAlpha < 0.0001) discard;\n    #endif\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #if defined(dPointStyle_fuzzy)\n            gl_FragColor.a *= fuzzyAlpha;\n        #endif\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";
+export declare const points_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nconst vec2 center = vec2(0.5);\nconst float radius = 0.5;\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    #if defined(dPointStyle_circle)\n        float dist = distance(gl_PointCoord, center);\n        if (dist > radius) discard;\n    #elif defined(dPointStyle_fuzzy)\n        float dist = distance(gl_PointCoord, center);\n        float fuzzyAlpha = 1.0 - smoothstep(0.0, radius, dist);\n        if (fuzzyAlpha < 0.0001) discard;\n    #endif\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #if defined(dPointStyle_fuzzy)\n            gl_FragColor.a *= fuzzyAlpha;\n        #endif\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";

package/lib/mol-gl/shader/points.frag.js

@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-export var points_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nconst vec2 center = vec2(0.5);\nconst float radius = 0.5;\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    bool interior = false;\n    #include assign_material_color\n\n    #if defined(dPointStyle_circle)\n        float dist = distance(gl_PointCoord, center);\n        if (dist > radius) discard;\n    #elif defined(dPointStyle_fuzzy)\n        float dist = distance(gl_PointCoord, center);\n        float fuzzyAlpha = 1.0 - smoothstep(0.0, radius, dist);\n        if (fuzzyAlpha < 0.0001) discard;\n    #endif\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #if defined(dPointStyle_fuzzy)\n            gl_FragColor.a *= fuzzyAlpha;\n        #endif\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";
+export var points_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nconst vec2 center = vec2(0.5);\nconst float radius = 0.5;\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    #if defined(dPointStyle_circle)\n        float dist = distance(gl_PointCoord, center);\n        if (dist > radius) discard;\n    #elif defined(dPointStyle_fuzzy)\n        float dist = distance(gl_PointCoord, center);\n        float fuzzyAlpha = 1.0 - smoothstep(0.0, radius, dist);\n        if (fuzzyAlpha < 0.0001) discard;\n    #endif\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #if defined(dPointStyle_fuzzy)\n            gl_FragColor.a *= fuzzyAlpha;\n        #endif\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";

package/lib/mol-gl/shader/text.frag.d.ts

@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-export declare const text_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nuniform sampler2D tFont;\n\nuniform vec3 uBorderColor;\nuniform float uBorderWidth;\nuniform vec3 uBackgroundColor;\nuniform float uBackgroundOpacity;\n\nvarying vec2 vTexCoord;\n\nconst float smoothness = 32.0;\nconst float gamma = 2.2;\n\nvoid main2(){\n    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\n}\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    bool interior = false;\n    #include assign_material_color\n\n    if (vTexCoord.x > 1.0) {\n        gl_FragColor = vec4(uBackgroundColor, uBackgroundOpacity * material.a);\n    } else {\n        // retrieve signed distance\n        float sdf = texture2D(tFont, vTexCoord).a + uBorderWidth;\n\n        // perform adaptive anti-aliasing of the edges\n        float w = clamp(smoothness * (abs(dFdx(vTexCoord.x)) + abs(dFdy(vTexCoord.y))), 0.0, 0.5);\n        float a = smoothstep(0.5 - w, 0.5 + w, sdf);\n\n        // gamma correction for linear attenuation\n        a = pow(a, 1.0 / gamma);\n\n        if (a < 0.5) discard;\n        material.a *= a;\n\n        // add border\n        float t = 0.5 + uBorderWidth;\n        if (uBorderWidth > 0.0 && sdf < t) {\n            material.xyz = mix(uBorderColor, material.xyz, smoothstep(t - w, t, sdf));\n        }\n\n        gl_FragColor = material;\n    }\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";
+export declare const text_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nuniform sampler2D tFont;\n\nuniform vec3 uBorderColor;\nuniform float uBorderWidth;\nuniform vec3 uBackgroundColor;\nuniform float uBackgroundOpacity;\n\nvarying vec2 vTexCoord;\n\nconst float smoothness = 32.0;\nconst float gamma = 2.2;\n\nvoid main2(){\n    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\n}\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    if (vTexCoord.x > 1.0) {\n        gl_FragColor = vec4(uBackgroundColor, uBackgroundOpacity * material.a);\n    } else {\n        // retrieve signed distance\n        float sdf = texture2D(tFont, vTexCoord).a + uBorderWidth;\n\n        // perform adaptive anti-aliasing of the edges\n        float w = clamp(smoothness * (abs(dFdx(vTexCoord.x)) + abs(dFdy(vTexCoord.y))), 0.0, 0.5);\n        float a = smoothstep(0.5 - w, 0.5 + w, sdf);\n\n        // gamma correction for linear attenuation\n        a = pow(a, 1.0 / gamma);\n\n        if (a < 0.5) discard;\n        material.a *= a;\n\n        // add border\n        float t = 0.5 + uBorderWidth;\n        if (uBorderWidth > 0.0 && sdf < t) {\n            material.xyz = mix(uBorderColor, material.xyz, smoothstep(t - w, t, sdf));\n        }\n\n        gl_FragColor = material;\n    }\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";

package/lib/mol-gl/shader/text.frag.js

@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-export var text_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nuniform sampler2D tFont;\n\nuniform vec3 uBorderColor;\nuniform float uBorderWidth;\nuniform vec3 uBackgroundColor;\nuniform float uBackgroundOpacity;\n\nvarying vec2 vTexCoord;\n\nconst float smoothness = 32.0;\nconst float gamma = 2.2;\n\nvoid main2(){\n    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\n}\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    bool interior = false;\n    #include assign_material_color\n\n    if (vTexCoord.x > 1.0) {\n        gl_FragColor = vec4(uBackgroundColor, uBackgroundOpacity * material.a);\n    } else {\n        // retrieve signed distance\n        float sdf = texture2D(tFont, vTexCoord).a + uBorderWidth;\n\n        // perform adaptive anti-aliasing of the edges\n        float w = clamp(smoothness * (abs(dFdx(vTexCoord.x)) + abs(dFdy(vTexCoord.y))), 0.0, 0.5);\n        float a = smoothstep(0.5 - w, 0.5 + w, sdf);\n\n        // gamma correction for linear attenuation\n        a = pow(a, 1.0 / gamma);\n\n        if (a < 0.5) discard;\n        material.a *= a;\n\n        // add border\n        float t = 0.5 + uBorderWidth;\n        if (uBorderWidth > 0.0 && sdf < t) {\n            material.xyz = mix(uBorderColor, material.xyz, smoothstep(t - w, t, sdf));\n        }\n\n        gl_FragColor = material;\n    }\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";
+export var text_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nuniform sampler2D tFont;\n\nuniform vec3 uBorderColor;\nuniform float uBorderWidth;\nuniform vec3 uBackgroundColor;\nuniform float uBackgroundOpacity;\n\nvarying vec2 vTexCoord;\n\nconst float smoothness = 32.0;\nconst float gamma = 2.2;\n\nvoid main2(){\n    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\n}\n\nvoid main(){\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    if (vTexCoord.x > 1.0) {\n        gl_FragColor = vec4(uBackgroundColor, uBackgroundOpacity * material.a);\n    } else {\n        // retrieve signed distance\n        float sdf = texture2D(tFont, vTexCoord).a + uBorderWidth;\n\n        // perform adaptive anti-aliasing of the edges\n        float w = clamp(smoothness * (abs(dFdx(vTexCoord.x)) + abs(dFdy(vTexCoord.y))), 0.0, 0.5);\n        float a = smoothstep(0.5 - w, 0.5 + w, sdf);\n\n        // gamma correction for linear attenuation\n        a = pow(a, 1.0 / gamma);\n\n        if (a < 0.5) discard;\n        material.a *= a;\n\n        // add border\n        float t = 0.5 + uBorderWidth;\n        if (uBorderWidth > 0.0 && sdf < t) {\n            material.xyz = mix(uBorderColor, material.xyz, smoothstep(t - w, t, sdf));\n        }\n\n        gl_FragColor = material;\n    }\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n    #endif\n}\n";

package/lib/mol-gl/webgl/buffer.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -41,7 +41,7 @@ export interface Buffer {
     destroy: () => void;
 }
 export declare type AttributeItemSize = 1 | 2 | 3 | 4 | 16;
-export declare type AttributeKind = 'float32' | 'int32';
+export declare type AttributeKind = 'float32';
 export declare function getAttribType(gl: GLRenderingContext, kind: AttributeKind, itemSize: AttributeItemSize): number;
 export declare type AttributeDefs = {
     [k: string]: {

package/lib/mol-gl/webgl/buffer.js

@@ -1,11 +1,12 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 import { __assign } from "tslib";
 import { idFactory } from '../../mol-util/id-factory';
 import { assertUnreachable } from '../../mol-util/type-helpers';
+import { isWebGL2 } from './compat';
 var getNextBufferId = idFactory();
 export function getUsageHint(gl, usageHint) {
     switch (usageHint) {
@@ -23,6 +24,7 @@ export function getDataType(gl, dataType) {
         case 'uint32': return gl.UNSIGNED_INT;
         case 'int32': return gl.INT;
         case 'float32': return gl.FLOAT;
+        default: assertUnreachable(dataType);
     }
 }
 function dataTypeFromArray(gl, array) {
@@ -53,7 +55,13 @@ export function getBufferType(gl, bufferType) {
     switch (bufferType) {
         case 'attribute': return gl.ARRAY_BUFFER;
         case 'elements': return gl.ELEMENT_ARRAY_BUFFER;
-        case 'uniform': return gl.UNIFORM_BUFFER;
+        case 'uniform':
+            if (isWebGL2(gl)) {
+                return gl.UNIFORM_BUFFER;
+            }
+            else {
+                throw new Error('WebGL2 is required for uniform buffers');
+            }
     }
 }
 function getBuffer(gl) {
@@ -108,14 +116,6 @@ function createBuffer(gl, array, usageHint, bufferType) {
 }
 export function getAttribType(gl, kind, itemSize) {
     switch (kind) {
-        case 'int32':
-            switch (itemSize) {
-                case 1: return gl.INT;
-                case 2: return gl.INT_VEC2;
-                case 3: return gl.INT_VEC3;
-                case 4: return gl.INT_VEC4;
-            }
-            break;
         case 'float32':
             switch (itemSize) {
                 case 1: return gl.FLOAT;
@@ -124,9 +124,9 @@ export function getAttribType(gl, kind, itemSize) {
                 case 4: return gl.FLOAT_VEC4;
                 case 16: return gl.FLOAT_MAT4;
             }
-            break;
+        default:
+            assertUnreachable(kind);
     }
-    throw new Error("unknown attribute type for kind '".concat(kind, "' and itemSize '").concat(itemSize, "'"));
 }
 export function createAttributeBuffer(gl, state, extensions, array, itemSize, divisor, usageHint) {
     if (usageHint === void 0) { usageHint = 'dynamic'; }

package/lib/mol-gl/webgl/context.d.ts

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

package/lib/mol-gl/webgl/context.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -226,7 +226,7 @@ export function createContext(gl, props) {
         gl: gl,
         isWebGL2: isWebGL2(gl),
         get pixelRatio() {
-            var dpr = (typeof window !== 'undefined') ? window.devicePixelRatio : 1;
+            var dpr = (typeof window !== 'undefined') ? (window.devicePixelRatio || 1) : 1;
             return dpr * (props.pixelScale || 1);
         },
         extensions: extensions,

package/lib/mol-gl/webgl/program.d.ts

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

package/lib/mol-gl/webgl/program.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -8,6 +8,7 @@ import { getUniformSetters, getUniformType } from './uniform';
 import { getAttribType } from './buffer';
 import { idFactory } from '../../mol-util/id-factory';
 import { isDebugMode } from '../../mol-util/debug';
+import { isWebGL2 } from './compat';
 var getNextProgramId = idFactory();
 function getLocations(gl, program, schema) {
     var locations = {};
@@ -51,7 +52,7 @@ function checkActiveAttributes(gl, program, schema) {
             }
             var attribType = getAttribType(gl, spec.kind, spec.itemSize);
             if (attribType !== type) {
-                throw new Error("unexpected attribute type for ".concat(name_1));
+                throw new Error("unexpected attribute type '".concat(attribType, "' for ").concat(name_1, ", expected '").concat(type, "'"));
             }
         }
     }
@@ -84,8 +85,13 @@ function checkActiveUniforms(gl, program, schema) {
                     }
                 }
                 else if (spec.kind === 'volume-float32' || spec.kind === 'volume-uint8') {
-                    if (type !== gl.SAMPLER_3D) {
-                        throw new Error("unexpected sampler type for '".concat(name_2, "'"));
+                    if (isWebGL2(gl)) {
+                        if (type !== gl.SAMPLER_3D) {
+                            throw new Error("unexpected sampler type for '".concat(name_2, "'"));
+                        }
+                    }
+                    else {
+                        throw new Error("WebGL2 is required to use SAMPLER_3D");
                     }
                 }
                 else {

package/lib/mol-io/reader/cif/schema/bird.d.ts

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2017-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
- * Code-generated 'BIRD' schema file. Dictionary versions: mmCIF 5.356, IHM 1.17, MA 1.3.5.
+ * Code-generated 'BIRD' schema file. Dictionary versions: mmCIF 5.357, IHM 1.17, MA 1.3.6.
  *
  * @author molstar/ciftools package
  */
@@ -50,7 +50,7 @@ export declare const BIRD_Schema: {
         /**
          * Defines the structural classification of the entity.
          */
-        type: Schema.Aliased<"Unknown" | "Amino acid" | "Aminoglycoside" | "Anthracycline" | "Anthraquinone" | "Ansamycin" | "Chalkophore" | "Chromophore" | "Glycopeptide" | "Cyclic depsipeptide" | "Cyclic lipopeptide" | "Cyclic peptide" | "Heterocyclic" | "Imino sugar" | "Keto acid" | "Lipoglycopeptide" | "Lipopeptide" | "Macrolide" | "Non-polymer" | "Nucleoside" | "Oligopeptide" | "Oligosaccharide" | "Peptaibol" | "Peptide-like" | "Polycyclic" | "Polypeptide" | "Polysaccharide" | "Quinolone" | "Thiolactone" | "Thiopeptide" | "Siderophore" | "Chalkophore, Polypeptide">;
+        type: Schema.Aliased<"unknown" | "non-polymer" | "peptide-like" | "macrolide" | "amino acid" | "aminoglycoside" | "anthracycline" | "anthraquinone" | "ansamycin" | "chalkophore" | "chromophore" | "glycopeptide" | "cyclic depsipeptide" | "cyclic lipopeptide" | "cyclic peptide" | "heterocyclic" | "imino sugar" | "keto acid" | "lipoglycopeptide" | "lipopeptide" | "nucleoside" | "oligopeptide" | "oligosaccharide" | "peptaibol" | "polycyclic" | "polypeptide" | "polysaccharide" | "quinolone" | "thiolactone" | "thiopeptide" | "siderophore" | "chalkophore, polypeptide">;
         /**
          * Evidence for the assignment of _pdbx_reference_molecule.type
          */
@@ -58,7 +58,7 @@ export declare const BIRD_Schema: {
         /**
          * Broadly defines the function of the entity.
          */
-        class: Schema.Aliased<"Antagonist" | "Antibiotic" | "Anticancer" | "Anticoagulant" | "Antifungal" | "Antigen" | "Antiinflammatory" | "Antimicrobial" | "Antineoplastic" | "Antiparasitic" | "Antiretroviral" | "Anthelmintic" | "Antithrombotic" | "Antitumor" | "Antiviral" | "CASPASE inhibitor" | "Chaperone binding" | "Enzyme inhibitor" | "Drug delivery" | "Glycan component" | "Growth factor" | "Immunosuppressant" | "Inducer" | "Inhibitor" | "Lantibiotic" | "Metabolism" | "Metal transport" | "Nutrient" | "Oxidation-reduction" | "Protein binding" | "Receptor" | "Substrate analog" | "Synthetic opioid" | "Thrombin inhibitor" | "Transition state mimetic" | "Transport activator" | "Trypsin inhibitor" | "Toxin" | "Unknown" | "Water retention" | "Anticoagulant, Antithrombotic" | "Antibiotic, Antimicrobial" | "Antibiotic, Anthelmintic" | "Antibiotic, Antineoplastic" | "Antimicrobial, Antiretroviral" | "Antimicrobial, Antitumor" | "Antimicrobial, Antiparasitic, Antibiotic" | "Thrombin inhibitor, Trypsin inhibitor">;
+        class: Schema.Aliased<"unknown" | "antagonist" | "antibiotic" | "anticancer" | "anticoagulant" | "antifungal" | "antigen" | "antiinflammatory" | "antimicrobial" | "antineoplastic" | "antiparasitic" | "antiretroviral" | "anthelmintic" | "antithrombotic" | "antitumor" | "antiviral" | "caspase inhibitor" | "chaperone binding" | "enzyme inhibitor" | "drug delivery" | "glycan component" | "growth factor" | "immunosuppressant" | "inducer" | "inhibitor" | "lantibiotic" | "metabolism" | "metal transport" | "nutrient" | "oxidation-reduction" | "protein binding" | "receptor" | "substrate analog" | "synthetic opioid" | "thrombin inhibitor" | "transition state mimetic" | "transport activator" | "trypsin inhibitor" | "toxin" | "water retention" | "anticoagulant, antithrombotic" | "antibiotic, antimicrobial" | "antibiotic, anthelmintic" | "antibiotic, antineoplastic" | "antimicrobial, antiretroviral" | "antimicrobial, antitumor" | "antimicrobial, antiparasitic, antibiotic" | "thrombin inhibitor, trypsin inhibitor">;
         /**
          * Evidence for the assignment of _pdbx_reference_molecule.class
          */
@@ -91,7 +91,7 @@ export declare const BIRD_Schema: {
         /**
          * Defines the current PDB release status for this molecule definition.
          */
-        release_status: Schema.Aliased<"WAIT" | "REL" | "HOLD" | "OBS">;
+        release_status: Schema.Aliased<"wait" | "rel" | "hold" | "obs">;
         /**
          * Assigns the identifier for the reference molecule which have been replaced
          * by this reference molecule.
@@ -392,11 +392,11 @@ export declare const BIRD_Schema: {
         /**
          * A flag to indicate that this monomer is observed in the instance example.
          */
-        observed: Schema.Aliased<"N" | "Y">;
+        observed: Schema.Aliased<"y" | "n">;
         /**
          * A flag to indicate that sequence heterogeneity at this monomer position.
          */
-        hetero: Schema.Aliased<"N" | "Y">;
+        hetero: Schema.Aliased<"y" | "n">;
     };
     /**
      * Additional features associated with the reference entity.
@@ -479,7 +479,7 @@ export declare const BIRD_Schema: {
         /**
          * An identifier for the wwPDB site creating or modifying the molecule.
          */
-        processing_site: Schema.Aliased<"RCSB" | "PDBE" | "BMRB" | "PDBJ" | "PDBC">;
+        processing_site: Schema.Aliased<"RCSB" | "PDBE" | "PDBJ" | "BMRB" | "PDBC">;
         /**
          * The action associated with this audit record.
          */

package/lib/mol-io/reader/cif/schema/bird.js

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2017-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
- * Code-generated 'BIRD' schema file. Dictionary versions: mmCIF 5.356, IHM 1.17, MA 1.3.5.
+ * Code-generated 'BIRD' schema file. Dictionary versions: mmCIF 5.357, IHM 1.17, MA 1.3.6.
  *
  * @author molstar/ciftools package
  */
@@ -9,6 +9,7 @@ import { Column } from '../../../../mol-data/db';
 var Schema = Column.Schema;
 var str = Schema.str;
 var float = Schema.float;
+var lstr = Schema.lstr;
 var Aliased = Schema.Aliased;
 var int = Schema.int;
 export var BIRD_Schema = {
@@ -54,7 +55,7 @@ export var BIRD_Schema = {
         /**
          * Defines the structural classification of the entity.
          */
-        type: Aliased(str),
+        type: Aliased(lstr),
         /**
          * Evidence for the assignment of _pdbx_reference_molecule.type
          */
@@ -62,7 +63,7 @@ export var BIRD_Schema = {
         /**
          * Broadly defines the function of the entity.
          */
-        class: Aliased(str),
+        class: Aliased(lstr),
         /**
          * Evidence for the assignment of _pdbx_reference_molecule.class
          */
@@ -74,7 +75,7 @@ export var BIRD_Schema = {
         /**
          * Defines how this entity is represented in PDB data files.
          */
-        represent_as: Aliased(str),
+        represent_as: Aliased(lstr),
         /**
          * For entities represented as single molecules, the identifier
          * corresponding to the chemical definition for the molecule.
@@ -95,7 +96,7 @@ export var BIRD_Schema = {
         /**
          * Defines the current PDB release status for this molecule definition.
          */
-        release_status: Aliased(str),
+        release_status: Aliased(lstr),
         /**
          * Assigns the identifier for the reference molecule which have been replaced
          * by this reference molecule.
@@ -125,7 +126,7 @@ export var BIRD_Schema = {
         /**
          * Defines the polymer characteristic of the entity.
          */
-        type: Aliased(str),
+        type: Aliased(lstr),
         /**
          * Additional details about this entity.
          */
@@ -245,7 +246,7 @@ export var BIRD_Schema = {
         /**
          * The bond order target for the chemical linkage.
          */
-        value_order: Aliased(str),
+        value_order: Aliased(lstr),
         /**
          * The entity component identifier for the first of two entities containing the linkage.
          */
@@ -331,7 +332,7 @@ export var BIRD_Schema = {
         /**
          * The bond order target for the non-standard linkage.
          */
-        value_order: Aliased(str),
+        value_order: Aliased(lstr),
     },
     /**
      * Data items in the PDBX_REFERENCE_ENTITY_POLY category record details about
@@ -396,11 +397,11 @@ export var BIRD_Schema = {
         /**
          * A flag to indicate that this monomer is observed in the instance example.
          */
-        observed: Aliased(str),
+        observed: Aliased(lstr),
         /**
          * A flag to indicate that sequence heterogeneity at this monomer position.
          */
-        hetero: Aliased(str),
+        hetero: Aliased(lstr),
     },
     /**
      * Additional features associated with the reference entity.

package/lib/mol-io/reader/cif/schema/ccd-extras.d.ts

@@ -8,5 +8,5 @@ export declare const ccd_chemCompAtom_schema: {
     comp_id: import("../../../../mol-data/db/column").Column.Schema.Str;
     atom_id: import("../../../../mol-data/db/column").Column.Schema.Str;
     charge: import("../../../../mol-data/db/column").Column.Schema.Int;
-    pdbx_stereo_config: import("../../../../mol-data/db/column").Column.Schema.Aliased<"N" | "R" | "S">;
+    pdbx_stereo_config: import("../../../../mol-data/db/column").Column.Schema.Aliased<"s" | "r" | "n">;
 };

package/lib/mol-io/reader/cif/schema/ccd.d.ts

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2017-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
- * Code-generated 'CCD' schema file. Dictionary versions: mmCIF 5.356, IHM 1.17, MA 1.3.5.
+ * Code-generated 'CCD' schema file. Dictionary versions: mmCIF 5.357, IHM 1.17, MA 1.3.6.
  *
  * @author molstar/ciftools package
  */
@@ -93,7 +93,7 @@ export declare const CCD_Schema: {
          * linking monomers, monomers with some type of N-terminal (or 5')
          * cap and monomers with some type of C-terminal (or 3') cap.
          */
-        type: Schema.Aliased<"other" | "D-peptide linking" | "L-peptide linking" | "D-peptide NH3 amino terminus" | "L-peptide NH3 amino terminus" | "D-peptide COOH carboxy terminus" | "L-peptide COOH carboxy terminus" | "DNA linking" | "RNA linking" | "L-RNA linking" | "L-DNA linking" | "DNA OH 5 prime terminus" | "RNA OH 5 prime terminus" | "DNA OH 3 prime terminus" | "RNA OH 3 prime terminus" | "D-saccharide, beta linking" | "D-saccharide, alpha linking" | "L-saccharide, beta linking" | "L-saccharide, alpha linking" | "L-saccharide" | "D-saccharide" | "saccharide" | "non-polymer" | "peptide linking" | "peptide-like" | "L-gamma-peptide, C-delta linking" | "D-gamma-peptide, C-delta linking" | "L-beta-peptide, C-gamma linking" | "D-beta-peptide, C-gamma linking">;
+        type: Schema.Aliased<"other" | "d-peptide linking" | "l-peptide linking" | "d-peptide nh3 amino terminus" | "l-peptide nh3 amino terminus" | "d-peptide cooh carboxy terminus" | "l-peptide cooh carboxy terminus" | "dna linking" | "rna linking" | "l-rna linking" | "l-dna linking" | "dna oh 5 prime terminus" | "rna oh 5 prime terminus" | "dna oh 3 prime terminus" | "rna oh 3 prime terminus" | "d-saccharide, beta linking" | "d-saccharide, alpha linking" | "l-saccharide, beta linking" | "l-saccharide, alpha linking" | "l-saccharide" | "d-saccharide" | "saccharide" | "non-polymer" | "peptide linking" | "peptide-like" | "l-gamma-peptide, c-delta linking" | "d-gamma-peptide, c-delta linking" | "l-beta-peptide, c-gamma linking" | "d-beta-peptide, c-gamma linking">;
         /**
          * Synonym list for the component.
          */
@@ -144,11 +144,11 @@ export declare const CCD_Schema: {
         /**
          * This data item identifies if ideal coordinates are missing in this definition.
          */
-        pdbx_ideal_coordinates_missing_flag: Schema.Aliased<"N" | "Y">;
+        pdbx_ideal_coordinates_missing_flag: Schema.Aliased<"y" | "n">;
         /**
          * This data item identifies if model coordinates are missing in this definition.
          */
-        pdbx_model_coordinates_missing_flag: Schema.Aliased<"N" | "Y">;
+        pdbx_model_coordinates_missing_flag: Schema.Aliased<"y" | "n">;
         /**
          * Date component was added to database.
          */
@@ -165,7 +165,7 @@ export declare const CCD_Schema: {
          * This data item identifies the deposition site that processed
          * this chemical component defintion.
          */
-        pdbx_processing_site: Schema.Aliased<"RCSB" | "EBI" | "PDBE" | "PDBJ" | "PDBC">;
+        pdbx_processing_site: Schema.Aliased<"RCSB" | "PDBE" | "PDBJ" | "PDBC" | "EBI">;
     };
     /**
      * Data items in the CHEM_COMP_ATOM category record details about
@@ -269,15 +269,15 @@ export declare const CCD_Schema: {
         /**
          * The chiral configuration of the atom that is a chiral center.
          */
-        pdbx_stereo_config: Schema.Aliased<"N" | "R" | "S">;
+        pdbx_stereo_config: Schema.Aliased<"s" | "r" | "n">;
         /**
          * A flag indicating an aromatic atom.
          */
-        pdbx_aromatic_flag: Schema.Aliased<"N" | "Y">;
+        pdbx_aromatic_flag: Schema.Aliased<"y" | "n">;
         /**
          * A flag indicating a leaving atom.
          */
-        pdbx_leaving_atom_flag: Schema.Aliased<"N" | "Y">;
+        pdbx_leaving_atom_flag: Schema.Aliased<"y" | "n">;
     };
     /**
      * Data items in the CHEM_COMP_BOND category record details about
@@ -318,11 +318,11 @@ export declare const CCD_Schema: {
         /**
          * Stereochemical configuration across a double bond.
          */
-        pdbx_stereo_config: Schema.Aliased<"N" | "E" | "Z">;
+        pdbx_stereo_config: Schema.Aliased<"z" | "n" | "e">;
         /**
          * A flag indicating an aromatic bond.
          */
-        pdbx_aromatic_flag: Schema.Aliased<"N" | "Y">;
+        pdbx_aromatic_flag: Schema.Aliased<"y" | "n">;
     };
     /**
      * Data items in the CHEM_COMP_DESCRIPTOR category provide
@@ -342,7 +342,7 @@ export declare const CCD_Schema: {
         /**
          * This data item contains the descriptor type.
          */
-        type: Schema.Aliased<"SMILES_CANNONICAL" | "SMILES_CANONICAL" | "SMILES" | "InChI" | "InChI_MAIN" | "InChI_MAIN_FORMULA" | "InChI_MAIN_CONNECT" | "InChI_MAIN_HATOM" | "InChI_CHARGE" | "InChI_STEREO" | "InChI_ISOTOPE" | "InChI_FIXEDH" | "InChI_RECONNECT" | "InChIKey">;
+        type: Schema.Aliased<"smiles_cannonical" | "smiles_canonical" | "smiles" | "inchi" | "inchi_main" | "inchi_main_formula" | "inchi_main_connect" | "inchi_main_hatom" | "inchi_charge" | "inchi_stereo" | "inchi_isotope" | "inchi_fixedh" | "inchi_reconnect" | "inchikey">;
         /**
          * This data item contains the name of the program
          * or library used to compute the descriptor.

package/lib/mol-io/reader/cif/schema/ccd.js

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2017-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
- * Code-generated 'CCD' schema file. Dictionary versions: mmCIF 5.356, IHM 1.17, MA 1.3.5.
+ * Code-generated 'CCD' schema file. Dictionary versions: mmCIF 5.357, IHM 1.17, MA 1.3.6.
  *
  * @author molstar/ciftools package
  */
@@ -10,6 +10,7 @@ var Schema = Column.Schema;
 var str = Schema.str;
 var float = Schema.float;
 var List = Schema.List;
+var lstr = Schema.lstr;
 var Aliased = Schema.Aliased;
 var int = Schema.int;
 var coord = Schema.coord;
@@ -99,7 +100,7 @@ export var CCD_Schema = {
          * linking monomers, monomers with some type of N-terminal (or 5')
          * cap and monomers with some type of C-terminal (or 3') cap.
          */
-        type: Aliased(str),
+        type: Aliased(lstr),
         /**
          * Synonym list for the component.
          */
@@ -150,11 +151,11 @@ export var CCD_Schema = {
         /**
          * This data item identifies if ideal coordinates are missing in this definition.
          */
-        pdbx_ideal_coordinates_missing_flag: Aliased(str),
+        pdbx_ideal_coordinates_missing_flag: Aliased(lstr),
         /**
          * This data item identifies if model coordinates are missing in this definition.
          */
-        pdbx_model_coordinates_missing_flag: Aliased(str),
+        pdbx_model_coordinates_missing_flag: Aliased(lstr),
         /**
          * Date component was added to database.
          */
@@ -275,15 +276,15 @@ export var CCD_Schema = {
         /**
          * The chiral configuration of the atom that is a chiral center.
          */
-        pdbx_stereo_config: Aliased(str),
+        pdbx_stereo_config: Aliased(lstr),
         /**
          * A flag indicating an aromatic atom.
          */
-        pdbx_aromatic_flag: Aliased(str),
+        pdbx_aromatic_flag: Aliased(lstr),
         /**
          * A flag indicating a leaving atom.
          */
-        pdbx_leaving_atom_flag: Aliased(str),
+        pdbx_leaving_atom_flag: Aliased(lstr),
     },
     /**
      * Data items in the CHEM_COMP_BOND category record details about
@@ -316,7 +317,7 @@ export var CCD_Schema = {
          * bond associated with the specified atoms, expressed as a bond
          * order.
          */
-        value_order: Aliased(str),
+        value_order: Aliased(lstr),
         /**
          * Ordinal index for the component bond list.
          */
@@ -324,11 +325,11 @@ export var CCD_Schema = {
         /**
          * Stereochemical configuration across a double bond.
          */
-        pdbx_stereo_config: Aliased(str),
+        pdbx_stereo_config: Aliased(lstr),
         /**
          * A flag indicating an aromatic bond.
          */
-        pdbx_aromatic_flag: Aliased(str),
+        pdbx_aromatic_flag: Aliased(lstr),
     },
     /**
      * Data items in the CHEM_COMP_DESCRIPTOR category provide
@@ -348,7 +349,7 @@ export var CCD_Schema = {
         /**
          * This data item contains the descriptor type.
          */
-        type: Aliased(str),
+        type: Aliased(lstr),
         /**
          * This data item contains the name of the program
          * or library used to compute the descriptor.

package/lib/mol-io/reader/cif/schema/mmcif-extras.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
@@ -23,12 +23,12 @@ export declare const mmCIF_chemCompBond_schema: {
     comp_id: Column.Schema.Str;
     value_order: Column.Schema.Aliased<"sing" | "doub" | "trip" | "quad" | "arom" | "poly" | "delo" | "pi">;
     pdbx_ordinal: Column.Schema.Int;
-    pdbx_stereo_config: Column.Schema.Aliased<"N" | "E" | "Z">;
-    pdbx_aromatic_flag: Column.Schema.Aliased<"N" | "Y">;
+    pdbx_stereo_config: Column.Schema.Aliased<"z" | "n" | "e">;
+    pdbx_aromatic_flag: Column.Schema.Aliased<"y" | "n">;
 };
-/** Has `type` extended with 'Ion' and 'Lipid' */
+/** Has `type` extended with 'ION' and 'LIPID' */
 export declare const mmCIF_chemComp_schema: {
-    type: Column.Schema.Aliased<"other" | "D-peptide linking" | "L-peptide linking" | "D-peptide NH3 amino terminus" | "L-peptide NH3 amino terminus" | "D-peptide COOH carboxy terminus" | "L-peptide COOH carboxy terminus" | "DNA linking" | "RNA linking" | "L-RNA linking" | "L-DNA linking" | "DNA OH 5 prime terminus" | "RNA OH 5 prime terminus" | "DNA OH 3 prime terminus" | "RNA OH 3 prime terminus" | "D-saccharide, beta linking" | "D-saccharide, alpha linking" | "L-saccharide, beta linking" | "L-saccharide, alpha linking" | "L-saccharide" | "D-saccharide" | "saccharide" | "non-polymer" | "peptide linking" | "peptide-like" | "L-gamma-peptide, C-delta linking" | "D-gamma-peptide, C-delta linking" | "L-beta-peptide, C-gamma linking" | "D-beta-peptide, C-gamma linking" | "Ion" | "Lipid">;
+    type: Column.Schema.Aliased<"other" | "d-peptide linking" | "l-peptide linking" | "d-peptide nh3 amino terminus" | "l-peptide nh3 amino terminus" | "d-peptide cooh carboxy terminus" | "l-peptide cooh carboxy terminus" | "dna linking" | "rna linking" | "l-rna linking" | "l-dna linking" | "dna oh 5 prime terminus" | "rna oh 5 prime terminus" | "dna oh 3 prime terminus" | "rna oh 3 prime terminus" | "d-saccharide, beta linking" | "d-saccharide, alpha linking" | "l-saccharide, beta linking" | "l-saccharide, alpha linking" | "l-saccharide" | "d-saccharide" | "saccharide" | "non-polymer" | "peptide linking" | "peptide-like" | "l-gamma-peptide, c-delta linking" | "d-gamma-peptide, c-delta linking" | "l-beta-peptide, c-gamma linking" | "d-beta-peptide, c-gamma linking" | "ion" | "lipid">;
     formula: Column.Schema.Str;
     formula_weight: Column.Schema.Float;
     id: Column.Schema.Str;

package/lib/mol-io/reader/cif/schema/mmcif-extras.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
@@ -20,5 +20,5 @@ export var mmCIF_residueId_schema = {
 export var mmCIF_chemCompBond_schema = __assign(__assign({}, mmCIF_Schema.chem_comp_bond), { 
     /** Indicates if the bond entry was taken from the protonation variant dictionary */
     molstar_protonation_variant: Column.Schema.Str() });
-/** Has `type` extended with 'Ion' and 'Lipid' */
+/** Has `type` extended with 'ION' and 'LIPID' */
 export var mmCIF_chemComp_schema = __assign(__assign({}, mmCIF_Schema.chem_comp), { type: Column.Schema.Aliased(Column.Schema.str) });