molstar 3.8.2 → 3.9.0

package/lib/mol-script/language/symbol-table/core.d.ts

@@ -16,8 +16,8 @@ export declare namespace Types {
     const Regex: Type.Value<RegExp>;
     const Set: <T extends Type<any>>(t?: T | undefined) => Type.Container<Set<T["@type"]>>;
     const List: <T extends Type<any>>(t?: T | undefined) => Type.Container<List<T["@type"]>>;
-    const Fn: <T extends Type<any>>(t?: T | undefined, alias?: string | undefined) => Type.Container<(env: any) => T["@type"]>;
-    const Flags: <T extends Type<any>>(t: T, alias?: string | undefined) => Type.Container<number>;
+    const Fn: <T extends Type<any>>(t?: T | undefined, alias?: string) => Type.Container<(env: any) => T["@type"]>;
+    const Flags: <T extends Type<any>>(t: T, alias?: string) => Type.Container<number>;
     const BitFlags: Type.Container<number>;
 }
 export declare const TTargs: Arguments<Arguments.PropTypes<{

package/lib/mol-script/runtime/query/table.js

@@ -209,7 +209,7 @@ var symbols = [
     C(MolScript.structureQuery.type.elementSymbol, function (ctx, v) { return ElementSymbol(v[0](ctx)); }),
     C(MolScript.structureQuery.type.atomName, function (ctx, v) { return upperCaseAny(v[0](ctx)); }),
     C(MolScript.structureQuery.type.bondFlags, function (ctx, xs) {
-        var ret = 0 /* None */;
+        var ret = 0 /* BondType.Flag.None */;
         if (typeof xs.length === 'number') {
             for (var i = 0, _i = xs.length; i < _i; i++)
                 ret = bondFlag(ret, xs[i](ctx));
@@ -224,7 +224,7 @@ var symbols = [
     }),
     C(MolScript.structureQuery.type.ringFingerprint, function (ctx, xs) { return UnitRing.elementFingerprint(getArray(ctx, xs)); }),
     C(MolScript.structureQuery.type.secondaryStructureFlags, function (ctx, xs) {
-        var ret = 0 /* None */;
+        var ret = 0 /* SecondaryStructureType.Flag.None */;
         if (typeof xs.length === 'number') {
             for (var i = 0, _i = xs.length; i < _i; i++)
                 ret = secondaryStructureFlag(ret, xs[i](ctx));
@@ -386,20 +386,20 @@ function atomProp(p) {
     return function (ctx, xs) { return p((xs && xs[0] && xs[0](ctx)) || ctx.element); };
 }
 function bondFlag(current, f) {
-    return current | (BondType.isName(f) ? BondType.fromName(f) : 0 /* None */);
+    return current | (BondType.isName(f) ? BondType.fromName(f) : 0 /* BondType.Flag.None */);
 }
 function secondaryStructureFlag(current, f) {
     switch (f.toLowerCase()) {
-        case 'helix': return current | 2 /* Helix */;
-        case 'alpha': return current | 2 /* Helix */ | 4096 /* HelixAlpha */;
-        case 'pi': return current | 2 /* Helix */ | 32768 /* HelixPi */;
-        case '310': return current | 2 /* Helix */ | 2048 /* Helix3Ten */;
-        case 'beta': return current | 4 /* Beta */;
-        case 'strand': return current | 4 /* Beta */ | 4194304 /* BetaStrand */;
-        case 'sheet': return current | 4 /* Beta */ | 8388608 /* BetaSheet */;
-        case 'turn': return current | 16 /* Turn */;
-        case 'bend': return current | 8 /* Bend */;
-        case 'coil': return current | 536870912 /* NA */;
+        case 'helix': return current | 2 /* SecondaryStructureType.Flag.Helix */;
+        case 'alpha': return current | 2 /* SecondaryStructureType.Flag.Helix */ | 4096 /* SecondaryStructureType.Flag.HelixAlpha */;
+        case 'pi': return current | 2 /* SecondaryStructureType.Flag.Helix */ | 32768 /* SecondaryStructureType.Flag.HelixPi */;
+        case '310': return current | 2 /* SecondaryStructureType.Flag.Helix */ | 2048 /* SecondaryStructureType.Flag.Helix3Ten */;
+        case 'beta': return current | 4 /* SecondaryStructureType.Flag.Beta */;
+        case 'strand': return current | 4 /* SecondaryStructureType.Flag.Beta */ | 4194304 /* SecondaryStructureType.Flag.BetaStrand */;
+        case 'sheet': return current | 4 /* SecondaryStructureType.Flag.Beta */ | 8388608 /* SecondaryStructureType.Flag.BetaSheet */;
+        case 'turn': return current | 16 /* SecondaryStructureType.Flag.Turn */;
+        case 'bend': return current | 8 /* SecondaryStructureType.Flag.Bend */;
+        case 'coil': return current | 536870912 /* SecondaryStructureType.Flag.NA */;
         default: return current;
     }
 }

package/lib/mol-state/object.d.ts

@@ -52,8 +52,8 @@ declare namespace StateObject {
     function create<Data, T extends Type>(type: T): {
         new (data: Data, props?: {
             label: string;
-            description?: string | undefined;
-        } | undefined): {
+            description?: string;
+        }): {
             id: UUID;
             type: T;
             label: string;
@@ -61,7 +61,7 @@ declare namespace StateObject {
             data: Data;
         };
         type: T;
-        is(obj?: StateObject<any, Type<any>> | undefined): obj is {
+        is(obj?: StateObject): obj is {
             id: UUID;
             type: T;
             label: string;

package/lib/mol-task/util/user-timing.js

@@ -4,7 +4,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 import { isProductionMode } from '../../mol-util/debug';
-var hasPerformance = (typeof performance !== 'undefined') && performance.mark && performance.measure;
+var hasPerformance = (typeof performance !== 'undefined') && !!performance.mark && performance.measure;
 var timingEnabled = hasPerformance && !isProductionMode;
 export var UserTiming;
 (function (UserTiming) {

package/lib/mol-theme/clipping.js

@@ -21,12 +21,12 @@ function Clipping(layers) {
         }
         Groups.create = create;
         Groups.Names = {
-            'one': 1 /* One */,
-            'two': 2 /* Two */,
-            'three': 4 /* Three */,
-            'four': 8 /* Four */,
-            'five': 16 /* Five */,
-            'six': 32 /* Six */,
+            'one': 1 /* Flag.One */,
+            'two': 2 /* Flag.Two */,
+            'three': 4 /* Flag.Three */,
+            'four': 8 /* Flag.Four */,
+            'five': 16 /* Flag.Five */,
+            'six': 32 /* Flag.Six */,
         };
         function isName(name) {
             return name in Groups.Names;
@@ -34,17 +34,17 @@ function Clipping(layers) {
         Groups.isName = isName;
         function fromName(name) {
             switch (name) {
-                case 'one': return 1 /* One */;
-                case 'two': return 2 /* Two */;
-                case 'three': return 4 /* Three */;
-                case 'four': return 8 /* Four */;
-                case 'five': return 16 /* Five */;
-                case 'six': return 32 /* Six */;
+                case 'one': return 1 /* Flag.One */;
+                case 'two': return 2 /* Flag.Two */;
+                case 'three': return 4 /* Flag.Three */;
+                case 'four': return 8 /* Flag.Four */;
+                case 'five': return 16 /* Flag.Five */;
+                case 'six': return 32 /* Flag.Six */;
             }
         }
         Groups.fromName = fromName;
         function fromNames(names) {
-            var f = 0 /* None */;
+            var f = 0 /* Flag.None */;
             for (var i = 0, il = names.length; i < il; ++i) {
                 f |= fromName(names[i]);
             }
@@ -53,17 +53,17 @@ function Clipping(layers) {
         Groups.fromNames = fromNames;
         function toNames(groups) {
             var names = [];
-            if (Groups.is(groups, 1 /* One */))
+            if (Groups.is(groups, 1 /* Flag.One */))
                 names.push('one');
-            if (Groups.is(groups, 2 /* Two */))
+            if (Groups.is(groups, 2 /* Flag.Two */))
                 names.push('two');
-            if (Groups.is(groups, 4 /* Three */))
+            if (Groups.is(groups, 4 /* Flag.Three */))
                 names.push('three');
-            if (Groups.is(groups, 8 /* Four */))
+            if (Groups.is(groups, 8 /* Flag.Four */))
                 names.push('four');
-            if (Groups.is(groups, 16 /* Five */))
+            if (Groups.is(groups, 16 /* Flag.Five */))
                 names.push('five');
-            if (Groups.is(groups, 32 /* Six */))
+            if (Groups.is(groups, 32 /* Flag.Six */))
                 names.push('six');
             return names;
         }

package/lib/mol-theme/color/atom-id.js

@@ -70,7 +70,7 @@ export function AtomIdColorTheme(ctx, props) {
 export var AtomIdColorThemeProvider = {
     name: 'atom-id',
     label: 'Atom Id',
-    category: "Atom Property" /* Atom */,
+    category: "Atom Property" /* ColorTheme.Category.Atom */,
     factory: AtomIdColorTheme,
     getParams: getAtomIdColorThemeParams,
     defaultValues: PD.getDefaultValues(AtomIdColorThemeParams),

package/lib/mol-theme/color/carbohydrate-symbol.js

@@ -54,7 +54,7 @@ export function CarbohydrateSymbolColorTheme(ctx, props) {
 export var CarbohydrateSymbolColorThemeProvider = {
     name: 'carbohydrate-symbol',
     label: 'Carbohydrate Symbol',
-    category: "Residue Property" /* Residue */,
+    category: "Residue Property" /* ColorTheme.Category.Residue */,
     factory: CarbohydrateSymbolColorTheme,
     getParams: getCarbohydrateSymbolColorThemeParams,
     defaultValues: PD.getDefaultValues(CarbohydrateSymbolColorThemeParams),

package/lib/mol-theme/color/chain-id.js

@@ -22,12 +22,12 @@ export function getChainIdColorThemeParams(ctx) {
 }
 function getAsymId(unit, type) {
     switch (unit.kind) {
-        case 0 /* Atomic */:
+        case 0 /* Unit.Kind.Atomic */:
             return type === 'auth'
                 ? StructureProperties.chain.auth_asym_id
                 : StructureProperties.chain.label_asym_id;
-        case 1 /* Spheres */:
-        case 2 /* Gaussians */:
+        case 1 /* Unit.Kind.Spheres */:
+        case 2 /* Unit.Kind.Gaussians */:
             return StructureProperties.coarse.asym_id;
     }
 }
@@ -104,7 +104,7 @@ export function ChainIdColorTheme(ctx, props) {
 export var ChainIdColorThemeProvider = {
     name: 'chain-id',
     label: 'Chain Id',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: ChainIdColorTheme,
     getParams: getChainIdColorThemeParams,
     defaultValues: PD.getDefaultValues(ChainIdColorThemeParams),

package/lib/mol-theme/color/element-index.js

@@ -61,7 +61,7 @@ export function ElementIndexColorTheme(ctx, props) {
 export var ElementIndexColorThemeProvider = {
     name: 'element-index',
     label: 'Element Index',
-    category: "Atom Property" /* Atom */,
+    category: "Atom Property" /* ColorTheme.Category.Atom */,
     factory: ElementIndexColorTheme,
     getParams: getElementIndexColorThemeParams,
     defaultValues: PD.getDefaultValues(ElementIndexColorThemeParams),

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

@@ -88,7 +88,7 @@ export function ElementSymbolColorTheme(ctx, props) {
 export var ElementSymbolColorThemeProvider = {
     name: 'element-symbol',
     label: 'Element Symbol',
-    category: "Atom Property" /* Atom */,
+    category: "Atom Property" /* ColorTheme.Category.Atom */,
     factory: ElementSymbolColorTheme,
     getParams: getElementSymbolColorThemeParams,
     defaultValues: PD.getDefaultValues(ElementSymbolColorThemeParams),

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

@@ -48,10 +48,10 @@ function getEntityIdSerialMap(structure) {
 }
 function getEntityId(location) {
     switch (location.unit.kind) {
-        case 0 /* Atomic */:
+        case 0 /* Unit.Kind.Atomic */:
             return StructureProperties.chain.label_entity_id(location);
-        case 1 /* Spheres */:
-        case 2 /* Gaussians */:
+        case 1 /* Unit.Kind.Spheres */:
+        case 2 /* Unit.Kind.Gaussians */:
             return StructureProperties.coarse.entity_id(location);
     }
 }
@@ -99,7 +99,7 @@ export function EntityIdColorTheme(ctx, props) {
 export var EntityIdColorThemeProvider = {
     name: 'entity-id',
     label: 'Entity Id',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: EntityIdColorTheme,
     getParams: getEntityIdColorThemeParams,
     defaultValues: PD.getDefaultValues(EntityIdColorThemeParams),

package/lib/mol-theme/color/entity-source.js

@@ -50,9 +50,10 @@ function addSrc(seqToSrcByModelEntity, srcKeySerialMap, modelIndex, model, entit
         var gene = gene_src_gene ? gene_src_gene.value(j)[0] : '';
         var sK = srcKey(modelIndex, entityId, scientific_name.value(j), pdbx_src_id.value(j), plasmid, gene);
         // may not be given (= 0) indicating src is for the whole seq
-        var beg = pdbx_beg_seq_num.valueKind(j) === 0 /* Present */ ? pdbx_beg_seq_num.value(j) : 1;
-        var end = pdbx_end_seq_num.valueKind(j) === 0 /* Present */ ? pdbx_end_seq_num.value(j) : seqToSrc.length;
-        var srcIndex = void 0; // serial no starting from 1
+        var beg = pdbx_beg_seq_num.valueKind(j) === 0 /* Column.ValueKind.Present */ ? pdbx_beg_seq_num.value(j) : 1;
+        var end = pdbx_end_seq_num.valueKind(j) === 0 /* Column.ValueKind.Present */ ? pdbx_end_seq_num.value(j) : seqToSrc.length;
+        var srcIndex = // serial no starting from 1
+         void 0; // serial no starting from 1
         if (srcKeySerialMap.has(sK)) {
             srcIndex = srcKeySerialMap.get(sK);
         }
@@ -142,7 +143,7 @@ export function EntitySourceColorTheme(ctx, props) {
 export var EntitySourceColorThemeProvider = {
     name: 'entity-source',
     label: 'Entity Source',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: EntitySourceColorTheme,
     getParams: getEntitySourceColorThemeParams,
     defaultValues: PD.getDefaultValues(EntitySourceColorThemeParams),

package/lib/mol-theme/color/hydrophobicity.js

@@ -81,7 +81,7 @@ export function HydrophobicityColorTheme(ctx, props) {
 export var HydrophobicityColorThemeProvider = {
     name: 'hydrophobicity',
     label: 'Hydrophobicity',
-    category: "Residue Property" /* Residue */,
+    category: "Residue Property" /* ColorTheme.Category.Residue */,
     factory: HydrophobicityColorTheme,
     getParams: getHydrophobicityColorThemeParams,
     defaultValues: PD.getDefaultValues(HydrophobicityColorThemeParams),

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

@@ -64,7 +64,7 @@ export function IllustrativeColorTheme(ctx, props) {
 export var IllustrativeColorThemeProvider = {
     name: 'illustrative',
     label: 'Illustrative',
-    category: "Miscellaneous" /* Misc */,
+    category: "Miscellaneous" /* ColorTheme.Category.Misc */,
     factory: IllustrativeColorTheme,
     getParams: getIllustrativeColorThemeParams,
     defaultValues: PD.getDefaultValues(IllustrativeColorThemeParams),

package/lib/mol-theme/color/model-index.js

@@ -57,7 +57,7 @@ export function ModelIndexColorTheme(ctx, props) {
 export var ModelIndexColorThemeProvider = {
     name: 'model-index',
     label: 'Model Index',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: ModelIndexColorTheme,
     getParams: getModelIndexColorThemeParams,
     defaultValues: PD.getDefaultValues(ModelIndexColorThemeParams),

package/lib/mol-theme/color/molecule-type.js

@@ -35,13 +35,13 @@ export function getMoleculeTypeColorThemeParams(ctx) {
 export function moleculeTypeColor(colorMap, unit, element) {
     var moleculeType = getElementMoleculeType(unit, element);
     switch (moleculeType) {
-        case 2 /* Water */: return colorMap.water;
-        case 3 /* Ion */: return colorMap.ion;
-        case 5 /* Protein */: return colorMap.protein;
-        case 6 /* RNA */: return colorMap.RNA;
-        case 7 /* DNA */: return colorMap.DNA;
-        case 8 /* PNA */: return colorMap.PNA;
-        case 9 /* Saccharide */: return colorMap.saccharide;
+        case 2 /* MoleculeType.Water */: return colorMap.water;
+        case 3 /* MoleculeType.Ion */: return colorMap.ion;
+        case 5 /* MoleculeType.Protein */: return colorMap.protein;
+        case 6 /* MoleculeType.RNA */: return colorMap.RNA;
+        case 7 /* MoleculeType.DNA */: return colorMap.DNA;
+        case 8 /* MoleculeType.PNA */: return colorMap.PNA;
+        case 9 /* MoleculeType.Saccharide */: return colorMap.saccharide;
     }
     return DefaultMoleculeTypeColor;
 }
@@ -70,7 +70,7 @@ export function MoleculeTypeColorTheme(ctx, props) {
 export var MoleculeTypeColorThemeProvider = {
     name: 'molecule-type',
     label: 'Molecule Type',
-    category: "Residue Property" /* Residue */,
+    category: "Residue Property" /* ColorTheme.Category.Residue */,
     factory: MoleculeTypeColorTheme,
     getParams: getMoleculeTypeColorThemeParams,
     defaultValues: PD.getDefaultValues(MoleculeTypeColorThemeParams),

package/lib/mol-theme/color/occupancy.js

@@ -51,7 +51,7 @@ export function OccupancyColorTheme(ctx, props) {
 export var OccupancyColorThemeProvider = {
     name: 'occupancy',
     label: 'Occupancy',
-    category: "Atom Property" /* Atom */,
+    category: "Atom Property" /* ColorTheme.Category.Atom */,
     factory: OccupancyColorTheme,
     getParams: getOccupancyColorThemeParams,
     defaultValues: PD.getDefaultValues(OccupancyColorThemeParams),

package/lib/mol-theme/color/operator-hkl.js

@@ -100,7 +100,7 @@ export function OperatorHklColorTheme(ctx, props) {
 export var OperatorHklColorThemeProvider = {
     name: 'operator-hkl',
     label: 'Operator HKL',
-    category: "Symmetry" /* Symmetry */,
+    category: "Symmetry" /* ColorTheme.Category.Symmetry */,
     factory: OperatorHklColorTheme,
     getParams: getOperatorHklColorThemeParams,
     defaultValues: PD.getDefaultValues(OperatorHklColorThemeParams),

package/lib/mol-theme/color/operator-name.js

@@ -62,7 +62,7 @@ export function OperatorNameColorTheme(ctx, props) {
 export var OperatorNameColorThemeProvider = {
     name: 'operator-name',
     label: 'Operator Name',
-    category: "Symmetry" /* Symmetry */,
+    category: "Symmetry" /* ColorTheme.Category.Symmetry */,
     factory: OperatorNameColorTheme,
     getParams: getOperatorNameColorThemeParams,
     defaultValues: PD.getDefaultValues(OperatorNameColorThemeParams),

package/lib/mol-theme/color/partial-charge.js

@@ -49,7 +49,7 @@ export function PartialChargeColorTheme(ctx, props) {
 export var PartialChargeColorThemeProvider = {
     name: 'partial-charge',
     label: 'Partial Charge',
-    category: "Atom Property" /* Atom */,
+    category: "Atom Property" /* ColorTheme.Category.Atom */,
     factory: PartialChargeColorTheme,
     getParams: getPartialChargeColorThemeParams,
     defaultValues: PD.getDefaultValues(PartialChargeColorThemeParams),

package/lib/mol-theme/color/polymer-id.js

@@ -26,10 +26,10 @@ export function getPolymerIdColorThemeParams(ctx) {
 }
 function getAsymId(unit) {
     switch (unit.kind) {
-        case 0 /* Atomic */:
+        case 0 /* Unit.Kind.Atomic */:
             return StructureProperties.chain.label_asym_id;
-        case 1 /* Spheres */:
-        case 2 /* Gaussians */:
+        case 1 /* Unit.Kind.Spheres */:
+        case 2 /* Unit.Kind.Gaussians */:
             return StructureProperties.coarse.asym_id;
     }
 }
@@ -112,7 +112,7 @@ export function PolymerIdColorTheme(ctx, props) {
 export var PolymerIdColorThemeProvider = {
     name: 'polymer-id',
     label: 'Polymer Chain Id',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: PolymerIdColorTheme,
     getParams: getPolymerIdColorThemeParams,
     defaultValues: PD.getDefaultValues(PolymerIdColorThemeParams),

package/lib/mol-theme/color/polymer-index.js

@@ -72,7 +72,7 @@ export function PolymerIndexColorTheme(ctx, props) {
 export var PolymerIndexColorThemeProvider = {
     name: 'polymer-index',
     label: 'Polymer Chain Instance',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: PolymerIndexColorTheme,
     getParams: getPolymerIndexColorThemeParams,
     defaultValues: PD.getDefaultValues(PolymerIndexColorThemeParams),

package/lib/mol-theme/color/residue-name.js

@@ -123,7 +123,7 @@ export function ResidueNameColorTheme(ctx, props) {
 export var ResidueNameColorThemeProvider = {
     name: 'residue-name',
     label: 'Residue Name',
-    category: "Residue Property" /* Residue */,
+    category: "Residue Property" /* ColorTheme.Category.Residue */,
     factory: ResidueNameColorTheme,
     getParams: getResidueNameColorThemeParams,
     defaultValues: PD.getDefaultValues(ResidueNameColorThemeParams),

package/lib/mol-theme/color/secondary-structure.js

@@ -41,42 +41,42 @@ export function getSecondaryStructureColorThemeParams(ctx) {
     return SecondaryStructureColorThemeParams; // TODO return copy
 }
 export function secondaryStructureColor(colorMap, unit, element, computedSecondaryStructure) {
-    var secStrucType = SecondaryStructureType.create(0 /* None */);
+    var secStrucType = SecondaryStructureType.create(0 /* SecondaryStructureType.Flag.None */);
     if (computedSecondaryStructure && Unit.isAtomic(unit)) {
         var secondaryStructure = computedSecondaryStructure.get(unit.invariantId);
         if (secondaryStructure)
             secStrucType = secondaryStructure.type[secondaryStructure.getIndex(unit.residueIndex[element])];
     }
-    if (SecondaryStructureType.is(secStrucType, 2 /* Helix */)) {
-        if (SecondaryStructureType.is(secStrucType, 2048 /* Helix3Ten */)) {
+    if (SecondaryStructureType.is(secStrucType, 2 /* SecondaryStructureType.Flag.Helix */)) {
+        if (SecondaryStructureType.is(secStrucType, 2048 /* SecondaryStructureType.Flag.Helix3Ten */)) {
             return colorMap.threeTenHelix;
         }
-        else if (SecondaryStructureType.is(secStrucType, 32768 /* HelixPi */)) {
+        else if (SecondaryStructureType.is(secStrucType, 32768 /* SecondaryStructureType.Flag.HelixPi */)) {
             return colorMap.piHelix;
         }
         return colorMap.alphaHelix;
     }
-    else if (SecondaryStructureType.is(secStrucType, 4 /* Beta */)) {
+    else if (SecondaryStructureType.is(secStrucType, 4 /* SecondaryStructureType.Flag.Beta */)) {
         return colorMap.betaStrand;
     }
-    else if (SecondaryStructureType.is(secStrucType, 8 /* Bend */)) {
+    else if (SecondaryStructureType.is(secStrucType, 8 /* SecondaryStructureType.Flag.Bend */)) {
         return colorMap.bend;
     }
-    else if (SecondaryStructureType.is(secStrucType, 16 /* Turn */)) {
+    else if (SecondaryStructureType.is(secStrucType, 16 /* SecondaryStructureType.Flag.Turn */)) {
         return colorMap.turn;
     }
     else {
         var moleculeType = getElementMoleculeType(unit, element);
-        if (moleculeType === 7 /* DNA */) {
+        if (moleculeType === 7 /* MoleculeType.DNA */) {
             return colorMap.dna;
         }
-        else if (moleculeType === 6 /* RNA */) {
+        else if (moleculeType === 6 /* MoleculeType.RNA */) {
             return colorMap.rna;
         }
-        else if (moleculeType === 9 /* Saccharide */) {
+        else if (moleculeType === 9 /* MoleculeType.Saccharide */) {
             return colorMap.carbohydrate;
         }
-        else if (moleculeType === 5 /* Protein */) {
+        else if (moleculeType === 5 /* MoleculeType.Protein */) {
             return colorMap.coil;
         }
     }
@@ -111,7 +111,7 @@ export function SecondaryStructureColorTheme(ctx, props) {
 export var SecondaryStructureColorThemeProvider = {
     name: 'secondary-structure',
     label: 'Secondary Structure',
-    category: "Residue Property" /* Residue */,
+    category: "Residue Property" /* ColorTheme.Category.Residue */,
     factory: SecondaryStructureColorTheme,
     getParams: getSecondaryStructureColorThemeParams,
     defaultValues: PD.getDefaultValues(SecondaryStructureColorThemeParams),

package/lib/mol-theme/color/sequence-id.js

@@ -17,13 +17,13 @@ export function getSequenceIdColorThemeParams(ctx) {
 function getSeqId(unit, element) {
     var model = unit.model;
     switch (unit.kind) {
-        case 0 /* Atomic */:
+        case 0 /* Unit.Kind.Atomic */:
             var residueIndex = model.atomicHierarchy.residueAtomSegments.index[element];
             return model.atomicHierarchy.residues.label_seq_id.value(residueIndex);
-        case 1 /* Spheres */:
+        case 1 /* Unit.Kind.Spheres */:
             return Math.round((model.coarseHierarchy.spheres.seq_id_begin.value(element) +
                 model.coarseHierarchy.spheres.seq_id_end.value(element)) / 2);
-        case 2 /* Gaussians */:
+        case 2 /* Unit.Kind.Gaussians */:
             return Math.round((model.coarseHierarchy.gaussians.seq_id_begin.value(element) +
                 model.coarseHierarchy.gaussians.seq_id_end.value(element)) / 2);
     }
@@ -32,14 +32,14 @@ function getSequenceLength(unit, element) {
     var model = unit.model;
     var entityId = '';
     switch (unit.kind) {
-        case 0 /* Atomic */:
+        case 0 /* Unit.Kind.Atomic */:
             var chainIndex = model.atomicHierarchy.chainAtomSegments.index[element];
             entityId = model.atomicHierarchy.chains.label_entity_id.value(chainIndex);
             break;
-        case 1 /* Spheres */:
+        case 1 /* Unit.Kind.Spheres */:
             entityId = model.coarseHierarchy.spheres.entity_id.value(element);
             break;
-        case 2 /* Gaussians */:
+        case 2 /* Unit.Kind.Gaussians */:
             entityId = model.coarseHierarchy.gaussians.entity_id.value(element);
             break;
     }
@@ -97,7 +97,7 @@ export function SequenceIdColorTheme(ctx, props) {
 export var SequenceIdColorThemeProvider = {
     name: 'sequence-id',
     label: 'Sequence Id',
-    category: "Residue Property" /* Residue */,
+    category: "Residue Property" /* ColorTheme.Category.Residue */,
     factory: SequenceIdColorTheme,
     getParams: getSequenceIdColorThemeParams,
     defaultValues: PD.getDefaultValues(SequenceIdColorThemeParams),

package/lib/mol-theme/color/shape-group.js

@@ -29,7 +29,7 @@ export function ShapeGroupColorTheme(ctx, props) {
 export var ShapeGroupColorThemeProvider = {
     name: 'shape-group',
     label: 'Shape Group',
-    category: "Miscellaneous" /* Misc */,
+    category: "Miscellaneous" /* ColorTheme.Category.Misc */,
     factory: ShapeGroupColorTheme,
     getParams: getShapeGroupColorThemeParams,
     defaultValues: PD.getDefaultValues(ShapeGroupColorThemeParams),

package/lib/mol-theme/color/uncertainty.js

@@ -55,7 +55,7 @@ export function UncertaintyColorTheme(ctx, props) {
 export var UncertaintyColorThemeProvider = {
     name: 'uncertainty',
     label: 'Uncertainty/Disorder',
-    category: "Atom Property" /* Atom */,
+    category: "Atom Property" /* ColorTheme.Category.Atom */,
     factory: UncertaintyColorTheme,
     getParams: getUncertaintyColorThemeParams,
     defaultValues: PD.getDefaultValues(UncertaintyColorThemeParams),

package/lib/mol-theme/color/uniform.js

@@ -29,7 +29,7 @@ export function UniformColorTheme(ctx, props) {
 export var UniformColorThemeProvider = {
     name: 'uniform',
     label: 'Uniform',
-    category: "Miscellaneous" /* Misc */,
+    category: "Miscellaneous" /* ColorTheme.Category.Misc */,
     factory: UniformColorTheme,
     getParams: getUniformColorThemeParams,
     defaultValues: PD.getDefaultValues(UniformColorThemeParams),

package/lib/mol-theme/color/unit-index.js

@@ -59,7 +59,7 @@ export function UnitIndexColorTheme(ctx, props) {
 export var UnitIndexColorThemeProvider = {
     name: 'unit-index',
     label: 'Chain Instance',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: UnitIndexColorTheme,
     getParams: getUnitIndexColorThemeParams,
     defaultValues: PD.getDefaultValues(UnitIndexColorThemeParams),

package/lib/mol-theme/color/volume-value.js

@@ -41,7 +41,7 @@ export function VolumeValueColorTheme(ctx, props) {
 export var VolumeValueColorThemeProvider = {
     name: 'volume-value',
     label: 'Volume Value',
-    category: "Miscellaneous" /* Misc */,
+    category: "Miscellaneous" /* ColorTheme.Category.Misc */,
     factory: VolumeValueColorTheme,
     getParams: getVolumeValueColorThemeParams,
     defaultValues: PD.getDefaultValues(VolumeValueColorThemeParams),

package/lib/mol-theme/label.js

@@ -107,7 +107,7 @@ function _structureElementStatsLabel(stats, countsOnly, hidePrefix, condensed, r
     else if (!countsOnly && elementCount === 0 && residueCount === 0 && chainCount === 1) {
         var unit = stats.firstChainLoc.unit;
         var granularity = (Unit.isAtomic(unit) && getResidueCount(unit) === 1)
-            ? 'residue' : Unit.Traits.is(unit.traits, 1 /* MultiChain */)
+            ? 'residue' : Unit.Traits.is(unit.traits, 1 /* Unit.Trait.MultiChain */)
             ? 'residue' : 'chain';
         return elementLabel(stats.firstChainLoc, { hidePrefix: hidePrefix, condensed: condensed, granularity: granularity, reverse: reverse });
     }
@@ -250,7 +250,7 @@ function _atomicElementLabel(location, granularity, hideOccupancy) {
     var rI = StructureElement.Location.residueIndex(location);
     var label_asym_id = Props.chain.label_asym_id(location);
     var auth_asym_id = Props.chain.auth_asym_id(location);
-    var has_label_seq_id = location.unit.model.atomicHierarchy.residues.label_seq_id.valueKind(rI) === 0 /* Present */;
+    var has_label_seq_id = location.unit.model.atomicHierarchy.residues.label_seq_id.valueKind(rI) === 0 /* Column.ValueKind.Present */;
     var label_seq_id = Props.residue.label_seq_id(location);
     var auth_seq_id = Props.residue.auth_seq_id(location);
     var ins_code = Props.residue.pdbx_PDB_ins_code(location);
@@ -277,7 +277,7 @@ function _atomicElementLabel(location, granularity, hideOccupancy) {
                 label.push("<b>".concat(label_asym_id, "</b>"));
             }
             else {
-                if (granularity === 'chain' && Unit.Traits.is(location.unit.traits, 1 /* MultiChain */)) {
+                if (granularity === 'chain' && Unit.Traits.is(location.unit.traits, 1 /* Unit.Trait.MultiChain */)) {
                     label.push("<small>[auth</small> <b>".concat(auth_asym_id, "</b><small>]</small>"));
                 }
                 else {

package/lib/mol-util/binding.js

@@ -78,13 +78,13 @@ function formatButtons(buttons) {
         s.push('mouse hover');
     }
     else {
-        if (B.has(buttons, 1 /* Primary */))
+        if (B.has(buttons, 1 /* B.Flag.Primary */))
             s.push('left mouse button');
-        if (B.has(buttons, 2 /* Secondary */))
+        if (B.has(buttons, 2 /* B.Flag.Secondary */))
             s.push('right mouse button');
-        if (B.has(buttons, 4 /* Auxilary */))
+        if (B.has(buttons, 4 /* B.Flag.Auxilary */))
             s.push('wheel/middle mouse button');
-        if (B.has(buttons, 8 /* Forth */))
+        if (B.has(buttons, 8 /* B.Flag.Forth */))
             s.push('three fingers');
     }
     return s.join(' + ');