molstar 3.0.0-dev.8 → 3.0.2

package/lib/commonjs/mol-theme/color/element-symbol.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 Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -154,9 +154,152 @@ export declare const ElementSymbolColorThemeParams: {
         }>, "generate"> | PD.NamedParams<PD.Normalize<{
             list: any;
         }>, "colors">;
-    }>, "operator-name">>;
+    }>, "operator-name"> | PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+    }>, "entity-id"> | PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+    }>, "entity-source">>;
     saturation: PD.Numeric;
     lightness: PD.Numeric;
+    colors: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "default"> | PD.NamedParams<PD.Normalize<{
+        H: Color;
+        D: Color;
+        T: Color;
+        HE: Color;
+        LI: Color;
+        BE: Color;
+        B: Color;
+        C: Color;
+        N: Color;
+        O: Color;
+        F: Color;
+        NE: Color;
+        NA: Color;
+        MG: Color;
+        AL: Color;
+        SI: Color;
+        P: Color;
+        S: Color;
+        CL: Color;
+        AR: Color;
+        K: Color;
+        CA: Color;
+        SC: Color;
+        TI: Color;
+        V: Color;
+        CR: Color;
+        MN: Color;
+        FE: Color;
+        CO: Color;
+        NI: Color;
+        CU: Color;
+        ZN: Color;
+        GA: Color;
+        GE: Color;
+        AS: Color;
+        SE: Color;
+        BR: Color;
+        KR: Color;
+        RB: Color;
+        SR: Color;
+        Y: Color;
+        ZR: Color;
+        NB: Color;
+        MO: Color;
+        TC: Color;
+        RU: Color;
+        RH: Color;
+        PD: Color;
+        AG: Color;
+        CD: Color;
+        IN: Color;
+        SN: Color;
+        SB: Color;
+        TE: Color;
+        I: Color;
+        XE: Color;
+        CS: Color;
+        BA: Color;
+        LA: Color;
+        CE: Color;
+        PR: Color;
+        ND: Color;
+        PM: Color;
+        SM: Color;
+        EU: Color;
+        GD: Color;
+        TB: Color;
+        DY: Color;
+        HO: Color;
+        ER: Color;
+        TM: Color;
+        YB: Color;
+        LU: Color;
+        HF: Color;
+        TA: Color;
+        W: Color;
+        RE: Color;
+        OS: Color;
+        IR: Color;
+        PT: Color;
+        AU: Color;
+        HG: Color;
+        TL: Color;
+        PB: Color;
+        BI: Color;
+        PO: Color;
+        AT: Color;
+        RN: Color;
+        FR: Color;
+        RA: Color;
+        AC: Color;
+        TH: Color;
+        PA: Color;
+        U: Color;
+        NP: Color;
+        PU: Color;
+        AM: Color;
+        CM: Color;
+        BK: Color;
+        CF: Color;
+        ES: Color;
+        FM: Color;
+        MD: Color;
+        NO: Color;
+        LR: Color;
+        RF: Color;
+        DB: Color;
+        SG: Color;
+        BH: Color;
+        HS: Color;
+        MT: Color;
+        DS: Color;
+        RG: Color;
+        CN: Color;
+        UUT: Color;
+        FL: Color;
+        UUP: Color;
+        LV: Color;
+        UUH: Color;
+    }>, "custom">>;
 };
 export declare type ElementSymbolColorThemeParams = typeof ElementSymbolColorThemeParams;
 export declare function getElementSymbolColorThemeParams(ctx: ThemeDataContext): {
@@ -183,9 +326,152 @@ export declare function getElementSymbolColorThemeParams(ctx: ThemeDataContext):
         }>, "generate"> | PD.NamedParams<PD.Normalize<{
             list: any;
         }>, "colors">;
-    }>, "operator-name">>;
+    }>, "operator-name"> | PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+    }>, "entity-id"> | PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+    }>, "entity-source">>;
     saturation: PD.Numeric;
     lightness: PD.Numeric;
+    colors: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "default"> | PD.NamedParams<PD.Normalize<{
+        H: Color;
+        D: Color;
+        T: Color;
+        HE: Color;
+        LI: Color;
+        BE: Color;
+        B: Color;
+        C: Color;
+        N: Color;
+        O: Color;
+        F: Color;
+        NE: Color;
+        NA: Color;
+        MG: Color;
+        AL: Color;
+        SI: Color;
+        P: Color;
+        S: Color;
+        CL: Color;
+        AR: Color;
+        K: Color;
+        CA: Color;
+        SC: Color;
+        TI: Color;
+        V: Color;
+        CR: Color;
+        MN: Color;
+        FE: Color;
+        CO: Color;
+        NI: Color;
+        CU: Color;
+        ZN: Color;
+        GA: Color;
+        GE: Color;
+        AS: Color;
+        SE: Color;
+        BR: Color;
+        KR: Color;
+        RB: Color;
+        SR: Color;
+        Y: Color;
+        ZR: Color;
+        NB: Color;
+        MO: Color;
+        TC: Color;
+        RU: Color;
+        RH: Color;
+        PD: Color;
+        AG: Color;
+        CD: Color;
+        IN: Color;
+        SN: Color;
+        SB: Color;
+        TE: Color;
+        I: Color;
+        XE: Color;
+        CS: Color;
+        BA: Color;
+        LA: Color;
+        CE: Color;
+        PR: Color;
+        ND: Color;
+        PM: Color;
+        SM: Color;
+        EU: Color;
+        GD: Color;
+        TB: Color;
+        DY: Color;
+        HO: Color;
+        ER: Color;
+        TM: Color;
+        YB: Color;
+        LU: Color;
+        HF: Color;
+        TA: Color;
+        W: Color;
+        RE: Color;
+        OS: Color;
+        IR: Color;
+        PT: Color;
+        AU: Color;
+        HG: Color;
+        TL: Color;
+        PB: Color;
+        BI: Color;
+        PO: Color;
+        AT: Color;
+        RN: Color;
+        FR: Color;
+        RA: Color;
+        AC: Color;
+        TH: Color;
+        PA: Color;
+        U: Color;
+        NP: Color;
+        PU: Color;
+        AM: Color;
+        CM: Color;
+        BK: Color;
+        CF: Color;
+        ES: Color;
+        FM: Color;
+        MD: Color;
+        NO: Color;
+        LR: Color;
+        RF: Color;
+        DB: Color;
+        SG: Color;
+        BH: Color;
+        HS: Color;
+        MT: Color;
+        DS: Color;
+        RG: Color;
+        CN: Color;
+        UUT: Color;
+        FL: Color;
+        UUP: Color;
+        LV: Color;
+        UUH: Color;
+    }>, "custom">>;
 };
 export declare function elementSymbolColor(colorMap: ElementSymbolColors, element: ElementSymbol): Color;
 export declare function ElementSymbolColorTheme(ctx: ThemeDataContext, props: PD.Values<ElementSymbolColorThemeParams>): ColorTheme<ElementSymbolColorThemeParams>;

package/lib/commonjs/mol-theme/color/element-symbol.js

@@ -1,34 +1,42 @@
 "use strict";
 /**
- * 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 Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElementSymbolColorThemeProvider = exports.ElementSymbolColorTheme = exports.elementSymbolColor = exports.getElementSymbolColorThemeParams = exports.ElementSymbolColorThemeParams = exports.ElementSymbolColors = void 0;
-var tslib_1 = require("tslib");
 var color_1 = require("../../mol-util/color");
 var structure_1 = require("../../mol-model/structure");
 var param_definition_1 = require("../../mol-util/param-definition");
 var legend_1 = require("../../mol-util/legend");
 var color_2 = require("../../mol-util/color/color");
+var params_1 = require("../../mol-util/color/params");
 var chain_id_1 = require("./chain-id");
 var operator_name_1 = require("./operator-name");
+var entity_id_1 = require("./entity-id");
+var type_helpers_1 = require("../../mol-util/type-helpers");
+var entity_source_1 = require("./entity-source");
 // from Jmol http://jmol.sourceforge.net/jscolors/ (or 0xFFFFFF)
 exports.ElementSymbolColors = (0, color_1.ColorMap)({
     'H': 0xFFFFFF, 'D': 0xFFFFC0, 'T': 0xFFFFA0, 'HE': 0xD9FFFF, 'LI': 0xCC80FF, 'BE': 0xC2FF00, 'B': 0xFFB5B5, 'C': 0x909090, 'N': 0x3050F8, 'O': 0xFF0D0D, 'F': 0x90E050, 'NE': 0xB3E3F5, 'NA': 0xAB5CF2, 'MG': 0x8AFF00, 'AL': 0xBFA6A6, 'SI': 0xF0C8A0, 'P': 0xFF8000, 'S': 0xFFFF30, 'CL': 0x1FF01F, 'AR': 0x80D1E3, 'K': 0x8F40D4, 'CA': 0x3DFF00, 'SC': 0xE6E6E6, 'TI': 0xBFC2C7, 'V': 0xA6A6AB, 'CR': 0x8A99C7, 'MN': 0x9C7AC7, 'FE': 0xE06633, 'CO': 0xF090A0, 'NI': 0x50D050, 'CU': 0xC88033, 'ZN': 0x7D80B0, 'GA': 0xC28F8F, 'GE': 0x668F8F, 'AS': 0xBD80E3, 'SE': 0xFFA100, 'BR': 0xA62929, 'KR': 0x5CB8D1, 'RB': 0x702EB0, 'SR': 0x00FF00, 'Y': 0x94FFFF, 'ZR': 0x94E0E0, 'NB': 0x73C2C9, 'MO': 0x54B5B5, 'TC': 0x3B9E9E, 'RU': 0x248F8F, 'RH': 0x0A7D8C, 'PD': 0x006985, 'AG': 0xC0C0C0, 'CD': 0xFFD98F, 'IN': 0xA67573, 'SN': 0x668080, 'SB': 0x9E63B5, 'TE': 0xD47A00, 'I': 0x940094, 'XE': 0x940094, 'CS': 0x57178F, 'BA': 0x00C900, 'LA': 0x70D4FF, 'CE': 0xFFFFC7, 'PR': 0xD9FFC7, 'ND': 0xC7FFC7, 'PM': 0xA3FFC7, 'SM': 0x8FFFC7, 'EU': 0x61FFC7, 'GD': 0x45FFC7, 'TB': 0x30FFC7, 'DY': 0x1FFFC7, 'HO': 0x00FF9C, 'ER': 0x00E675, 'TM': 0x00D452, 'YB': 0x00BF38, 'LU': 0x00AB24, 'HF': 0x4DC2FF, 'TA': 0x4DA6FF, 'W': 0x2194D6, 'RE': 0x267DAB, 'OS': 0x266696, 'IR': 0x175487, 'PT': 0xD0D0E0, 'AU': 0xFFD123, 'HG': 0xB8B8D0, 'TL': 0xA6544D, 'PB': 0x575961, 'BI': 0x9E4FB5, 'PO': 0xAB5C00, 'AT': 0x754F45, 'RN': 0x428296, 'FR': 0x420066, 'RA': 0x007D00, 'AC': 0x70ABFA, 'TH': 0x00BAFF, 'PA': 0x00A1FF, 'U': 0x008FFF, 'NP': 0x0080FF, 'PU': 0x006BFF, 'AM': 0x545CF2, 'CM': 0x785CE3, 'BK': 0x8A4FE3, 'CF': 0xA136D4, 'ES': 0xB31FD4, 'FM': 0xB31FBA, 'MD': 0xB30DA6, 'NO': 0xBD0D87, 'LR': 0xC70066, 'RF': 0xCC0059, 'DB': 0xD1004F, 'SG': 0xD90045, 'BH': 0xE00038, 'HS': 0xE6002E, 'MT': 0xEB0026, 'DS': 0xFFFFFF, 'RG': 0xFFFFFF, 'CN': 0xFFFFFF, 'UUT': 0xFFFFFF, 'FL': 0xFFFFFF, 'UUP': 0xFFFFFF, 'LV': 0xFFFFFF, 'UUH': 0xFFFFFF
 });
 var DefaultElementSymbolColor = (0, color_1.Color)(0xFFFFFF);
 var Description = 'Assigns a color to every atom according to its chemical element.';
-// TODO generalise `carbonColor` param to all themes?
 exports.ElementSymbolColorThemeParams = {
     carbonColor: param_definition_1.ParamDefinition.MappedStatic('chain-id', {
-        'chain-id': param_definition_1.ParamDefinition.Group((0, tslib_1.__assign)({}, chain_id_1.ChainIdColorThemeParams)),
-        'operator-name': param_definition_1.ParamDefinition.Group((0, tslib_1.__assign)({}, operator_name_1.OperatorNameColorThemeParams)),
-        'element-symbol': param_definition_1.ParamDefinition.Group({})
+        'chain-id': param_definition_1.ParamDefinition.Group(chain_id_1.ChainIdColorThemeParams),
+        'entity-id': param_definition_1.ParamDefinition.Group(entity_id_1.EntityIdColorThemeParams),
+        'entity-source': param_definition_1.ParamDefinition.Group(entity_source_1.EntitySourceColorThemeParams),
+        'operator-name': param_definition_1.ParamDefinition.Group(operator_name_1.OperatorNameColorThemeParams),
+        'element-symbol': param_definition_1.ParamDefinition.EmptyGroup()
     }, { description: 'Use chain-id coloring for carbon atoms.' }),
     saturation: param_definition_1.ParamDefinition.Numeric(0, { min: -6, max: 6, step: 0.1 }),
-    lightness: param_definition_1.ParamDefinition.Numeric(0.2, { min: -6, max: 6, step: 0.1 })
+    lightness: param_definition_1.ParamDefinition.Numeric(0.2, { min: -6, max: 6, step: 0.1 }),
+    colors: param_definition_1.ParamDefinition.MappedStatic('default', {
+        'default': param_definition_1.ParamDefinition.EmptyGroup(),
+        'custom': param_definition_1.ParamDefinition.Group((0, params_1.getColorMapParams)(exports.ElementSymbolColors))
+    })
 };
 function getElementSymbolColorThemeParams(ctx) {
     return exports.ElementSymbolColorThemeParams; // TODO return copy
@@ -40,12 +48,14 @@ function elementSymbolColor(colorMap, element) {
 }
 exports.elementSymbolColor = elementSymbolColor;
 function ElementSymbolColorTheme(ctx, props) {
-    var colorMap = (0, color_2.getAdjustedColorMap)(exports.ElementSymbolColors, props.saturation, props.lightness);
-    var carbonColor = props.carbonColor.name === 'chain-id'
-        ? (0, chain_id_1.ChainIdColorTheme)(ctx, props.carbonColor.params).color
-        : props.carbonColor.name === 'operator-name'
-            ? (0, operator_name_1.OperatorNameColorTheme)(ctx, props.carbonColor.params).color
-            : undefined;
+    var colorMap = (0, color_2.getAdjustedColorMap)(props.colors.name === 'default' ? exports.ElementSymbolColors : props.colors.params, props.saturation, props.lightness);
+    var pcc = props.carbonColor;
+    var carbonColor = pcc.name === 'chain-id' ? (0, chain_id_1.ChainIdColorTheme)(ctx, pcc.params).color :
+        pcc.name === 'entity-id' ? (0, entity_id_1.EntityIdColorTheme)(ctx, pcc.params).color :
+            pcc.name === 'entity-source' ? (0, entity_source_1.EntitySourceColorTheme)(ctx, pcc.params).color :
+                pcc.name === 'operator-name' ? (0, operator_name_1.OperatorNameColorTheme)(ctx, pcc.params).color :
+                    pcc.name === 'element-symbol' ? undefined :
+                        (0, type_helpers_1.assertUnreachable)(pcc);
     function elementColor(element, location) {
         return (carbonColor && element === 'C')
             ? carbonColor(location, false)
@@ -75,8 +85,8 @@ function ElementSymbolColorTheme(ctx, props) {
         color: color,
         props: props,
         description: Description,
-        legend: (0, legend_1.TableLegend)(Object.keys(exports.ElementSymbolColors).map(function (name) {
-            return [name, exports.ElementSymbolColors[name]];
+        legend: (0, legend_1.TableLegend)(Object.keys(colorMap).map(function (name) {
+            return [name, colorMap[name]];
         }))
     };
 }

package/lib/commonjs/mol-theme/color/entity-id.d.ts

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

package/lib/commonjs/mol-theme/color/entity-id.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2021-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -32,9 +32,33 @@ function getEntityIdSerialMap(structure) {
             if (!map.has(k))
                 map.set(k, map.size);
         }
+        var coarseHierarchy = structure.models[i].coarseHierarchy;
+        if (coarseHierarchy.isDefined) {
+            var spheres_entity_id = coarseHierarchy.spheres.entity_id;
+            for (var j = 0, jl = spheres_entity_id.rowCount; j < jl; ++j) {
+                var k = key(spheres_entity_id.value(j), i);
+                if (!map.has(k))
+                    map.set(k, map.size);
+            }
+            var gaussians_entity_id = coarseHierarchy.gaussians.entity_id;
+            for (var j = 0, jl = gaussians_entity_id.rowCount; j < jl; ++j) {
+                var k = key(gaussians_entity_id.value(j), i);
+                if (!map.has(k))
+                    map.set(k, map.size);
+            }
+        }
     }
     return map;
 }
+function getEntityId(location) {
+    switch (location.unit.kind) {
+        case 0 /* Atomic */:
+            return structure_1.StructureProperties.chain.label_entity_id(location);
+        case 1 /* Spheres */:
+        case 2 /* Gaussians */:
+            return structure_1.StructureProperties.coarse.entity_id(location);
+    }
+}
 function EntityIdColorTheme(ctx, props) {
     var color;
     var legend;
@@ -48,17 +72,17 @@ function EntityIdColorTheme(ctx, props) {
         color = function (location) {
             var serial = undefined;
             if (structure_1.StructureElement.Location.is(location)) {
-                var atomId = structure_1.StructureProperties.chain.label_entity_id(location);
+                var entityId = getEntityId(location);
                 var modelIndex = location.structure.models.indexOf(location.unit.model);
-                var k = key(atomId, modelIndex);
+                var k = key(entityId, modelIndex);
                 serial = entityIdSerialMap_1.get(k);
             }
             else if (structure_1.Bond.isLocation(location)) {
                 l_1.unit = location.aUnit;
                 l_1.element = location.aUnit.elements[location.aIndex];
-                var atomId = structure_1.StructureProperties.chain.label_entity_id(l_1);
+                var entityId = getEntityId(l_1);
                 var modelIndex = l_1.structure.models.indexOf(l_1.unit.model);
-                var k = key(atomId, modelIndex);
+                var k = key(entityId, modelIndex);
                 serial = entityIdSerialMap_1.get(k);
             }
             return serial === undefined ? DefaultColor : palette_2.color(serial);

package/lib/commonjs/mol-theme/color/illustrative.d.ts

@@ -1,45 +1,116 @@
 /**
- * Copyright (c) 2019-2020 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>
  */
+import { Color } from '../../mol-util/color';
 import { ColorTheme } from '../color';
 import { ParamDefinition as PD } from '../../mol-util/param-definition';
 import { ThemeDataContext } from '../theme';
 export declare const IllustrativeColorThemeParams: {
+    style: PD.Mapped<PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+        asymId: "label" | "auth";
+    }>, "chain-id"> | PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+    }>, "entity-id"> | PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+    }>, "entity-source"> | PD.NamedParams<PD.Normalize<{
+        value: Color;
+    }>, "uniform"> | PD.NamedParams<PD.Normalize<{
+        saturation: number;
+        lightness: number;
+        colors: PD.NamedParams<PD.Normalize<unknown>, "default"> | PD.NamedParams<PD.Normalize<{
+            water: any;
+            ion: any;
+            protein: any;
+            RNA: any;
+            DNA: any;
+            PNA: any;
+            saccharide: any;
+        }>, "custom">;
+    }>, "molecule-type">>;
     carbonLightness: PD.Numeric;
-    palette: PD.Mapped<PD.NamedParams<PD.Normalize<{
-        maxCount: number;
-        hue: [number, number];
-        chroma: [number, number];
-        luminance: [number, number];
-        clusteringStepCount: number;
-        minSampleCount: number;
-    }>, "generate"> | PD.NamedParams<PD.Normalize<{
-        list: {
-            kind: "set" | "interpolate";
-            colors: import("../../mol-util/color/color").ColorListEntry[];
-        };
-    }>, "colors">>;
-    asymId: PD.Select<"label" | "auth">;
 };
 export declare type IllustrativeColorThemeParams = typeof IllustrativeColorThemeParams;
 export declare function getIllustrativeColorThemeParams(ctx: ThemeDataContext): {
+    style: PD.Mapped<PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+        asymId: "label" | "auth";
+    }>, "chain-id"> | PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+    }>, "entity-id"> | PD.NamedParams<PD.Normalize<{
+        palette: PD.NamedParams<PD.Normalize<{
+            maxCount: any;
+            hue: any;
+            chroma: any;
+            luminance: any;
+            clusteringStepCount: any;
+            minSampleCount: any;
+        }>, "generate"> | PD.NamedParams<PD.Normalize<{
+            list: any;
+        }>, "colors">;
+    }>, "entity-source"> | PD.NamedParams<PD.Normalize<{
+        value: Color;
+    }>, "uniform"> | PD.NamedParams<PD.Normalize<{
+        saturation: number;
+        lightness: number;
+        colors: PD.NamedParams<PD.Normalize<unknown>, "default"> | PD.NamedParams<PD.Normalize<{
+            water: any;
+            ion: any;
+            protein: any;
+            RNA: any;
+            DNA: any;
+            PNA: any;
+            saccharide: any;
+        }>, "custom">;
+    }>, "molecule-type">>;
     carbonLightness: PD.Numeric;
-    palette: PD.Mapped<PD.NamedParams<PD.Normalize<{
-        maxCount: number;
-        hue: [number, number];
-        chroma: [number, number];
-        luminance: [number, number];
-        clusteringStepCount: number;
-        minSampleCount: number;
-    }>, "generate"> | PD.NamedParams<PD.Normalize<{
-        list: {
-            kind: "set" | "interpolate";
-            colors: import("../../mol-util/color/color").ColorListEntry[];
-        };
-    }>, "colors">>;
-    asymId: PD.Select<"label" | "auth">;
 };
 export declare function IllustrativeColorTheme(ctx: ThemeDataContext, props: PD.Values<IllustrativeColorThemeParams>): ColorTheme<IllustrativeColorThemeParams>;
 export declare const IllustrativeColorThemeProvider: ColorTheme.Provider<IllustrativeColorThemeParams, 'illustrative'>;

package/lib/commonjs/mol-theme/color/illustrative.js

@@ -1,27 +1,46 @@
 "use strict";
 /**
- * Copyright (c) 2019-2020 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>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IllustrativeColorThemeProvider = exports.IllustrativeColorTheme = exports.getIllustrativeColorThemeParams = exports.IllustrativeColorThemeParams = void 0;
-var tslib_1 = require("tslib");
 var color_1 = require("../../mol-util/color");
 var structure_1 = require("../../mol-model/structure");
 var param_definition_1 = require("../../mol-util/param-definition");
 var chain_id_1 = require("./chain-id");
+var uniform_1 = require("./uniform");
+var type_helpers_1 = require("../../mol-util/type-helpers");
+var entity_id_1 = require("./entity-id");
+var molecule_type_1 = require("./molecule-type");
+var entity_source_1 = require("./entity-source");
 var DefaultIllustrativeColor = (0, color_1.Color)(0xEEEEEE);
-var Description = "Assigns an illustrative color that gives every chain a unique color with lighter carbons (inspired by David Goodsell's Molecule of the Month style).";
-exports.IllustrativeColorThemeParams = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, chain_id_1.ChainIdColorThemeParams), { carbonLightness: param_definition_1.ParamDefinition.Numeric(0.8, { min: -6, max: 6, step: 0.1 }) });
+var Description = "Assigns an illustrative color that gives every chain a color based on the choosen style but with lighter carbons (inspired by David Goodsell's Molecule of the Month style).";
+exports.IllustrativeColorThemeParams = {
+    style: param_definition_1.ParamDefinition.MappedStatic('entity-id', {
+        uniform: param_definition_1.ParamDefinition.Group(uniform_1.UniformColorThemeParams),
+        'chain-id': param_definition_1.ParamDefinition.Group(chain_id_1.ChainIdColorThemeParams),
+        'entity-id': param_definition_1.ParamDefinition.Group(entity_id_1.EntityIdColorThemeParams),
+        'entity-source': param_definition_1.ParamDefinition.Group(entity_source_1.EntitySourceColorThemeParams),
+        'molecule-type': param_definition_1.ParamDefinition.Group(molecule_type_1.MoleculeTypeColorThemeParams),
+    }),
+    carbonLightness: param_definition_1.ParamDefinition.Numeric(0.8, { min: -6, max: 6, step: 0.1 })
+};
 function getIllustrativeColorThemeParams(ctx) {
-    return exports.IllustrativeColorThemeParams; // TODO return copy
+    var params = param_definition_1.ParamDefinition.clone(exports.IllustrativeColorThemeParams);
+    return params;
 }
 exports.getIllustrativeColorThemeParams = getIllustrativeColorThemeParams;
 function IllustrativeColorTheme(ctx, props) {
-    var _a = (0, chain_id_1.ChainIdColorTheme)(ctx, props), chainIdColor = _a.color, legend = _a.legend;
+    var _a = props.style.name === 'uniform' ? (0, uniform_1.UniformColorTheme)(ctx, props.style.params) :
+        props.style.name === 'chain-id' ? (0, chain_id_1.ChainIdColorTheme)(ctx, props.style.params) :
+            props.style.name === 'entity-id' ? (0, entity_id_1.EntityIdColorTheme)(ctx, props.style.params) :
+                props.style.name === 'entity-source' ? (0, entity_source_1.EntitySourceColorTheme)(ctx, props.style.params) :
+                    props.style.name === 'molecule-type' ? (0, molecule_type_1.MoleculeTypeColorTheme)(ctx, props.style.params) :
+                        (0, type_helpers_1.assertUnreachable)(props.style), styleColor = _a.color, legend = _a.legend;
     function illustrativeColor(location, typeSymbol) {
-        var baseColor = chainIdColor(location, false);
+        var baseColor = styleColor(location, false);
         return typeSymbol === 'C' ? color_1.Color.lighten(baseColor, props.carbonLightness) : baseColor;
     }
     function color(location) {