lint: add object-curly-spacing rule

.eslintrc.json

@@ -40,7 +40,8 @@
             }
         ],
         "no-throw-literal": "error",
-        "key-spacing": "error"
+        "key-spacing": "error",
+        "object-curly-spacing": ["error", "always"]
     },
     "overrides": [
         {

src/cli/chem-comp-dict/create-ions.ts

@@ -19,7 +19,7 @@ import { ensureDataAvailable, readCCD } from './util';
 function extractIonNames(ccd: DatabaseCollection<CCD_Schema>) {
     const ionNames: string[] = [];
     for (const k in ccd) {
-        const {chem_comp} = ccd[k];
+        const { chem_comp } = ccd[k];
         if (chem_comp.name.value(0).toUpperCase().includes(' ION')) {
             ionNames.push(chem_comp.id.value(0));
         }

src/examples/lighting/index.ts

@@ -105,7 +105,7 @@ class LightingDemo {
                 ...this.plugin.canvas3d!.props.postprocessing,
                 ...props.postprocessing
             },
-        }});
+        } });
     }
 
     async load({ url, format = 'mmcif', isBinary = true, assemblyId = '' }: LoadParams, radius: number, bias: number) {

src/extensions/anvil/algorithm.ts

@@ -41,8 +41,8 @@ interface ANVILContext {
 export const ANVILParams = {
     numberOfSpherePoints: PD.Numeric(175, { min: 35, max: 700, step: 1 }, { description: 'Number of spheres/directions to test for membrane placement. Original value is 350.' }),
     stepSize: PD.Numeric(1, { min: 0.25, max: 4, step: 0.25 }, { description: 'Thickness of membrane slices that will be tested' }),
-    minThickness: PD.Numeric(20, { min: 10, max: 30, step: 1}, { description: 'Minimum membrane thickness used during refinement' }),
-    maxThickness: PD.Numeric(40, { min: 30, max: 50, step: 1}, { description: 'Maximum membrane thickness used during refinement' }),
+    minThickness: PD.Numeric(20, { min: 10, max: 30, step: 1 }, { description: 'Minimum membrane thickness used during refinement' }),
+    maxThickness: PD.Numeric(40, { min: 30, max: 50, step: 1 }, { description: 'Maximum membrane thickness used during refinement' }),
     asaCutoff: PD.Numeric(40, { min: 10, max: 100, step: 1 }, { description: 'Relative ASA cutoff above which residues will be considered' }),
     adjust: PD.Numeric(14, { min: 0, max: 30, step: 1 }, { description: 'Minimum length of membrane-spanning regions (original values: 14 for alpha-helices and 5 for beta sheets). Set to 0 to not optimize membrane thickness.' }),
     tmdetDefinition: PD.Boolean(false, { description: `Use TMDET's classification of membrane-favoring amino acids. TMDET's classification shows better performance on porins and other beta-barrel structures.` })

src/extensions/cellpack/color/generate.ts

@@ -48,7 +48,7 @@ export function CellPackGenerateColorTheme(ctx: ThemeDataContext, props: PD.Valu
                 hue, chroma: [30, 80], luminance: [15, 85],
                 clusteringStepCount: 50, minSampleCount: 800, maxCount: 75
             }
-        }}, { minLabel: 'Min', maxLabel: 'Max' });
+        } }, { minLabel: 'Min', maxLabel: 'Max' });
         legend = palette.legend;
         const modelColor = new Map<number, Color>();
         for (let i = 0, il = models.length; i < il; ++i) {

src/mol-canvas3d/helper/interaction-events.ts

@@ -149,13 +149,13 @@ export class Canvas3dInteractionHelper {
     }
 
     constructor(private canvasIdentify: Canvas3D['identify'], private getLoci: Canvas3D['getLoci'], private input: InputObserver, private camera: Camera, private maxFps: number = 30) {
-        input.drag.subscribe(({x, y, buttons, button, modifiers }) => {
+        input.drag.subscribe(({ x, y, buttons, button, modifiers }) => {
             this.isInteracting = true;
             // console.log('drag');
             this.drag(x, y, buttons, button, modifiers);
         });
 
-        input.move.subscribe(({x, y, inside, buttons, button, modifiers }) => {
+        input.move.subscribe(({ x, y, inside, buttons, button, modifiers }) => {
             if (!inside || this.isInteracting) return;
             // console.log('move');
             this.move(x, y, buttons, button, modifiers);
@@ -166,7 +166,7 @@ export class Canvas3dInteractionHelper {
             this.leave();
         });
 
-        input.click.subscribe(({x, y, buttons, button, modifiers }) => {
+        input.click.subscribe(({ x, y, buttons, button, modifiers }) => {
             if (this.outsideViewport(x, y)) return;
             // console.log('click');
             this.click(x, y, buttons, button, modifiers);

src/mol-canvas3d/passes/postprocessing.ts

@@ -241,7 +241,7 @@ function getPostprocessingRenderable(ctx: WebGLContext, colorTexture: Texture, d
 export const PostprocessingParams = {
     occlusion: PD.MappedStatic('on', {
         on: PD.Group({
-            samples: PD.Numeric(32, {min: 1, max: 256, step: 1}),
+            samples: PD.Numeric(32, { min: 1, max: 256, step: 1 }),
             radius: PD.Numeric(5, { min: 0, max: 10, step: 0.1 }, { description: 'Final radius is 2^x.' }),
             bias: PD.Numeric(0.8, { min: 0, max: 3, step: 0.1 }),
             blurKernelSize: PD.Numeric(15, { min: 1, max: 25, step: 2 }),

src/mol-data/db/_spec/table.spec.ts

@@ -100,7 +100,7 @@ describe('table', () => {
             n: Column.ofArray({ array: ['row1', 'row2'], schema: Column.Schema.str }),
         });
         const s = { x: Column.Schema.int, y: Column.Schema.int };
-        const picked = Table.pickColumns(s, t, { y: Column.ofArray({ array: [3, 4], schema: Column.Schema.int })});
+        const picked = Table.pickColumns(s, t, { y: Column.ofArray({ array: [3, 4], schema: Column.Schema.int }) });
         expect(picked._columns).toEqual(['x', 'y']);
         expect(picked._rowCount).toEqual(2);
         expect(picked.x.toArray()).toEqual([10, -1]);

src/mol-geo/geometry/base.ts

@@ -52,8 +52,8 @@ export namespace BaseGeometry {
         if (!transform) transform = createIdentityTransform();
         const locationIterator = LocationIterator(1, transform.instanceCount.ref.value, 1, () => NullLocation, false, () => false);
         const theme: Theme = {
-            color: UniformColorTheme({}, { value: colorValue}),
-            size: UniformSizeTheme({}, { value: sizeValue})
+            color: UniformColorTheme({}, { value: colorValue }),
+            size: UniformSizeTheme({}, { value: sizeValue })
         };
         return { transform, locationIterator, theme };
     }

src/mol-geo/geometry/cylinders/cylinders.ts

@@ -6,7 +6,7 @@
 
 import { ValueCell } from '../../../mol-util';
 import { Mat4, Vec3, Vec4 } from '../../../mol-math/linear-algebra';
-import { transformPositionArray, GroupMapping, createGroupMapping} from '../../util';
+import { transformPositionArray, GroupMapping, createGroupMapping } from '../../util';
 import { GeometryUtils } from '../geometry';
 import { createColors } from '../color-data';
 import { createMarkers } from '../marker-data';

src/mol-geo/geometry/lines/lines.ts

@@ -6,7 +6,7 @@
 
 import { ValueCell } from '../../../mol-util';
 import { Mat4, Vec3, Vec4 } from '../../../mol-math/linear-algebra';
-import { transformPositionArray, GroupMapping, createGroupMapping} from '../../util';
+import { transformPositionArray, GroupMapping, createGroupMapping } from '../../util';
 import { GeometryUtils } from '../geometry';
 import { createColors } from '../color-data';
 import { createMarkers } from '../marker-data';

src/mol-geo/geometry/points/points.ts

@@ -6,7 +6,7 @@
 
 import { ValueCell } from '../../../mol-util';
 import { Mat4, Vec3, Vec4 } from '../../../mol-math/linear-algebra';
-import { transformPositionArray, GroupMapping, createGroupMapping} from '../../util';
+import { transformPositionArray, GroupMapping, createGroupMapping } from '../../util';
 import { GeometryUtils } from '../geometry';
 import { createColors } from '../color-data';
 import { createMarkers } from '../marker-data';

src/mol-geo/geometry/size-data.ts

@@ -98,7 +98,7 @@ export function createTextureSize(sizes: TextureImage<Uint8Array>, type: SizeTyp
 
 /** Creates size texture with size for each instance/unit */
 export function createInstanceSize(locationIt: LocationIterator, sizeFn: LocationSize, sizeData?: SizeData): SizeData {
-    const { instanceCount} = locationIt;
+    const { instanceCount } = locationIt;
     const sizes = createTextureImage(Math.max(1, instanceCount), 3, Uint8Array, sizeData && sizeData.tSize.ref.value.array);
     locationIt.reset();
     while (locationIt.hasNext && !locationIt.isNextNewInstance) {

src/mol-io/reader/_spec/ply.spec.ts

@@ -123,8 +123,8 @@ describe('ply reader', () => {
 
         const face = plyFile.getElement('face') as PlyList;
         if (!face) return;
-        expect(face.value(0)).toEqual({ count: 3, entries: [0, 2, 1]});
-        expect(face.value(1)).toEqual({ count: 3, entries: [3, 5, 4]});
+        expect(face.value(0)).toEqual({ count: 3, entries: [0, 2, 1] });
+        expect(face.value(1)).toEqual({ count: 3, entries: [3, 5, 4] });
 
         expect.assertions(3);
     });

src/mol-math/geometry/molecular-surface.ts

@@ -41,7 +41,7 @@ function getAngleTables (probePositions: number): AnglesTables {
         sinTable[i] = Math.sin(theta);
         theta += step;
     }
-    return { cosTable, sinTable};
+    return { cosTable, sinTable };
 }
 
 //

src/mol-model-formats/structure/property/assembly.ts

@@ -62,7 +62,7 @@ function operatorGroupsProvider(generators: Generator[], matrices: Matrices): ()
             const selector = Q.generators.atoms({ chainTest: Q.pred.and(
                 Q.pred.eq(ctx => StructureProperties.unit.operator_name(ctx.element), SymmetryOperator.DefaultName),
                 Q.pred.inSet(ctx => StructureProperties.chain.label_asym_id(ctx.element), gen.asymIds)
-            )});
+            ) });
             groups[groups.length] = { selector, operators };
             operatorOffset += operators.length;
         }

src/mol-model-props/integrative/cross-link-restraint/property.ts

@@ -5,7 +5,7 @@
  */
 
 import { ModelCrossLinkRestraint } from './format';
-import { Unit, StructureElement, Structure, Bond} from '../../../mol-model/structure';
+import { Unit, StructureElement, Structure, Bond } from '../../../mol-model/structure';
 import { PairRestraints, PairRestraint } from '../pair-restraints';
 import { CustomStructureProperty } from '../../common/custom-structure-property';
 import { CustomProperty } from '../../common/custom-property';

src/mol-model/structure/structure/symmetry.ts

@@ -143,7 +143,7 @@ function getSelector(asymIds: string[]) {
     return Q.generators.atoms({ chainTest: Q.pred.and(
         Q.pred.eq(ctx => StructureProperties.unit.operator_name(ctx.element), SymmetryOperator.DefaultName),
         Q.pred.inSet(ctx => StructureProperties.chain.label_asym_id(ctx.element), asymIds)
-    )});
+    ) });
 }
 
 function getOperatorsForIndex(symmetry: Symmetry, index: number, i: number, j: number, k: number, modelCenter: Vec3) {

src/mol-plugin-state/animation/built-in/assembly-unwind.ts

@@ -25,7 +25,7 @@ export const AnimateAssemblyUnwind = PluginStateAnimation.create({
         }
 
         return {
-            durationInMs: PD.Numeric(3000, { min: 100, max: 10000, step: 100}),
+            durationInMs: PD.Numeric(3000, { min: 100, max: 10000, step: 100 }),
             playOnce: PD.Boolean(false),
             target: PD.Select(targets[0][0], targets)
         };

src/mol-plugin-state/animation/built-in/explode-units.ts

@@ -15,7 +15,7 @@ export const AnimateUnitsExplode = PluginStateAnimation.create({
     name: 'built-in.animate-units-explode',
     display: { name: 'Explode Units' },
     params: () => ({
-        durationInMs: PD.Numeric(3000, { min: 100, max: 10000, step: 100})
+        durationInMs: PD.Numeric(3000, { min: 100, max: 10000, step: 100 })
     }),
     initialState: () => ({ t: 0 }),
     async setup(_, __, plugin) {

src/mol-plugin-state/animation/built-in/spin-structure.ts

@@ -16,7 +16,7 @@ export const AnimateStructureSpin = PluginStateAnimation.create({
     display: { name: 'Spin Structure' },
     isExportable: true,
     params: () => ({
-        durationInMs: PD.Numeric(3000, { min: 100, max: 10000, step: 100})
+        durationInMs: PD.Numeric(3000, { min: 100, max: 10000, step: 100 })
     }),
     initialState: () => ({ t: 0 }),
     getDuration: p => ({ kind: 'fixed', durationMs: p.durationInMs }),

src/mol-plugin-state/manager/snapshots.ts

@@ -193,7 +193,7 @@ class PluginStateSnapshotManager extends StatefulPluginComponent<{
         const json = JSON.stringify(this.getStateSnapshot({ params: options?.params }), null, 2);
 
         if (!options?.type || options.type === 'json' || options.type === 'molj') {
-            return new Blob([json], {type: 'application/json;charset=utf-8'});
+            return new Blob([json], { type: 'application/json;charset=utf-8' });
         } else {
             const state = new Uint8Array(utf8ByteCount(json));
             utf8Write(state, 0, json);
@@ -218,7 +218,7 @@ class PluginStateSnapshotManager extends StatefulPluginComponent<{
             }
 
             const zipFile = await this.plugin.runTask(Zip(zipDataObj));
-            return new Blob([zipFile], {type: 'application/zip'});
+            return new Blob([zipFile], { type: 'application/zip' });
         }
     }
 

src/mol-plugin-ui/controls/legend.tsx

@@ -29,8 +29,8 @@ export class ScaleLegend extends React.PureComponent<LegendProps<ScaleLegendData
         const colors = legend.colors.map(c => Array.isArray(c) ? `${Color.toStyle(c[0])} ${100 * c[1]}%` : Color.toStyle(c)).join(', ');
         return  <div className='msp-scale-legend'>
             <div style={{ background: `linear-gradient(to right, ${colors})` }}>
-                <span style={{float: 'left'}}>{legend.minLabel}</span>
-                <span style={{float: 'right'}}>{legend.maxLabel}</span>
+                <span style={{ float: 'left' }}>{legend.minLabel}</span>
+                <span style={{ float: 'right' }}>{legend.maxLabel}</span>
             </div>
         </div>;
     }
@@ -43,7 +43,7 @@ export class TableLegend extends React.PureComponent<LegendProps<TableLegendData
             {legend.table.map((value, i) => {
                 const [name, color] = value;
                 return <div key={i}>
-                    <div className='msp-table-legend-color' style={{backgroundColor: Color.toStyle(color)}}></div>
+                    <div className='msp-table-legend-color' style={{ backgroundColor: Color.toStyle(color) }}></div>
                     <div className='msp-table-legend-text'>{name}</div>
                 </div>;
             })}

src/mol-plugin-ui/controls/line-graph/line-graph-component.tsx

@@ -259,7 +259,7 @@ export class LineGraphComponent extends React.Component<any, LineGraphComponentS
             }
             return a[0] - b[0];
         });
-        this.setState({points});
+        this.setState({ points });
         this.change(points);
     }
 
@@ -278,7 +278,7 @@ export class LineGraphComponent extends React.Component<any, LineGraphComponentS
             }
             return a[0] - b[0];
         });
-        this.setState({points});
+        this.setState({ points });
         this.change(points);
         event.stopPropagation();
     }

src/mol-plugin-ui/controls/line-graph/point-component.tsx

@@ -6,7 +6,7 @@ import { Vec2 } from '../../../mol-math/linear-algebra';
 export class PointComponent extends React.Component<any, {show: boolean}> {
     constructor(props: any) {
         super(props);
-        this.state = {show: false};
+        this.state = { show: false };
 
         this.handleHover = this.handleHover.bind(this);
         this.handleHoverOff = this.handleHoverOff.bind(this);
@@ -14,13 +14,13 @@ export class PointComponent extends React.Component<any, {show: boolean}> {
     }
 
     private handleHover() {
-        this.setState({show: true});
+        this.setState({ show: true });
         const point = Vec2.create(this.props.nX, this.props.nY);
         this.props.onmouseover(point);
     }
 
     private handleHoverOff() {
-        this.setState({show: false});
+        this.setState({ show: false });
         this.props.onmouseover(undefined);
     }
 

src/mol-plugin-ui/state/snapshots.tsx

@@ -75,7 +75,7 @@ export class StateExportImportControls extends PluginUIComponent<{ onAction?: ()
                     <Icon svg={OpenInBrowserSvg} inline /> Open <input onChange={this.open} type='file' multiple={false} accept='.molx,.molj' />
                 </div>
             </div>
-            <div className='msp-help-text' style={{ padding: '10px'}}>
+            <div className='msp-help-text' style={{ padding: '10px' }}>
                 <Icon svg={WarningSvg} /> This is an experimental feature and stored states/sessions might not be openable in a future version.
             </div>
         </>;

src/mol-script/language/symbol-table/core.ts

@@ -85,7 +85,7 @@ const ctrl = {
     }), Type.Union([Type.Variable('a', Type.Any), Type.Variable('b', Type.Any)])),
     assoc: symbol(Arguments.Dictionary({
         0: Argument(Type.Str, { description: 'Name' }),
-        1: Argument(Type.Variable('a', Type.Any), {description: 'Value to assign' })
+        1: Argument(Type.Variable('a', Type.Any), { description: 'Value to assign' })
     }), Type.Variable('a', Type.Any))
 };
 

src/mol-theme/label.ts

@@ -141,7 +141,7 @@ export function bondLabel(bond: Bond.Location, options: Partial<LabelOptions> =
     return bundleLabel({ loci: [
         StructureElement.Loci(bond.aStructure, [{ unit: bond.aUnit, indices: OrderedSet.ofSingleton(bond.aIndex) }]),
         StructureElement.Loci(bond.bStructure, [{ unit: bond.bUnit, indices: OrderedSet.ofSingleton(bond.bIndex) }])
-    ]}, options);
+    ] }, options);
 }
 
 export function bundleLabel(bundle: Loci.Bundle<any>, options: Partial<LabelOptions> = {}): string {

src/perf-tests/mol-script.ts

@@ -49,7 +49,7 @@ console.log(result);
 
 const CustomProp = CustomPropertyDescriptor({
     name: 'test_prop',
-    cifExport: { prefix: '', categories: [ ]},
+    cifExport: { prefix: '', categories: [ ] },
     symbols: {
         residueIndex: QuerySymbolRuntime.Dynamic(CustomPropSymbol('custom.test-prop', 'residue-index', Type.Num), ctx => {
             const e = ctx.element;

src/servers/model/server/api.ts

@@ -68,7 +68,7 @@ export const AtomSiteSchemaElement = {
     label_entity_id: { type: QueryParamType.String, groupName: 'atom_site' },
 
     label_asym_id: { type: QueryParamType.String, groupName: 'atom_site' },
-    auth_asym_id: { type: QueryParamType.String, groupName: 'atom_site'},
+    auth_asym_id: { type: QueryParamType.String, groupName: 'atom_site' },
 
     label_comp_id: { type: QueryParamType.String, groupName: 'atom_site' },
     auth_comp_id: { type: QueryParamType.String, groupName: 'atom_site' },

src/tests/browser/render-shape.ts

@@ -40,7 +40,7 @@ parent.appendChild(info);
 let prevReprLoci = Representation.Loci.Empty;
 const canvas3d = Canvas3D.create(Canvas3DContext.fromCanvas(canvas));
 canvas3d.animate();
-canvas3d.input.move.subscribe(({x, y}) => {
+canvas3d.input.move.subscribe(({ x, y }) => {
     const pickingId = canvas3d.identify(x, y)?.id;
     let label = '';
     if (pickingId) {

src/tests/browser/render-structure.ts

@@ -50,7 +50,7 @@ info.style.color = 'white';
 parent.appendChild(info);
 
 let prevReprLoci = Representation.Loci.Empty;
-canvas3d.input.move.pipe(throttleTime(100)).subscribe(({x, y}) => {
+canvas3d.input.move.pipe(throttleTime(100)).subscribe(({ x, y }) => {
     const pickingId = canvas3d.identify(x, y)?.id;
     let label = '';
     if (pickingId) {