lint: add computed-property-spacing rule

.eslintrc.json

@@ -43,7 +43,8 @@
         "key-spacing": "error",
         "object-curly-spacing": ["error", "always"],
         "array-bracket-spacing": "error",
-        "space-in-parens": "error"
+        "space-in-parens": "error",
+        "computed-property-spacing": "error"
     },
     "overrides": [
         {

src/cli/cifschema/index.ts

@@ -131,8 +131,8 @@ async function getFieldNamesFilter(fieldNamesPath: string): Promise<Filter> {
     fieldNames.forEach((name, i) => {
         const [category, field] = name.split('.');
         // console.log(category, field)
-        if (!filter[ category ]) filter[ category ] = {};
-        filter[ category ][ field ] = true;
+        if (!filter[category]) filter[category] = {};
+        filter[category][field] = true;
     });
     return filter;
 }

src/cli/cifschema/util/schema.ts

@@ -57,7 +57,7 @@ export function mergeFilters (...filters: Filter[]) {
     const fields: Map<string, number> = new Map();
     filters.forEach(filter => {
         Object.keys(filter).forEach(category => {
-            Object.keys(filter[ category ]).forEach(field => {
+            Object.keys(filter[category]).forEach(field => {
                 const key = `${category}.${field}`;
                 const value = fields.get(key) || 0;
                 fields.set(key, value + 1);

src/extensions/rcsb/validation-report/prop.ts

@@ -431,7 +431,7 @@ function parseValidationReportXml(xml: XMLDocument, model: Model): ValidationRep
 
     const groups = xml.getElementsByTagName('ModelledSubgroup');
     for (let i = 0, il = groups.length; i < il; ++i) {
-        const g = groups[ i ];
+        const g = groups[i];
         const ga = g.attributes;
 
         const pdbx_PDB_model_num = parseInt(getItem(ga, 'model'));

src/mol-canvas3d/passes/multi-sample.ts

@@ -123,7 +123,7 @@ export class MultiSamplePass {
         //
         // This manual approach to MSAA re-renders the scene once for
         // each sample with camera jitter and accumulates the results.
-        const offsetList = JitterVectors[ Math.max(0, Math.min(props.multiSample.sampleLevel, 5)) ];
+        const offsetList = JitterVectors[Math.max(0, Math.min(props.multiSample.sampleLevel, 5))];
 
         const { x, y, width, height } = camera.viewport;
         const baseSampleWeight = 1.0 / offsetList.length;
@@ -190,7 +190,7 @@ export class MultiSamplePass {
         //
         // This manual approach to MSAA re-renders the scene once for
         // each sample with camera jitter and accumulates the results.
-        const offsetList = JitterVectors[ Math.max(0, Math.min(props.multiSample.sampleLevel, 5)) ];
+        const offsetList = JitterVectors[Math.max(0, Math.min(props.multiSample.sampleLevel, 5))];
 
         if (sampleIndex === -2 || sampleIndex >= offsetList.length) return -2;
 

src/mol-geo/primitive/cylinder.ts

@@ -89,10 +89,10 @@ export function Cylinder(props?: CylinderProps): Primitive {
 
             for (let y = 0; y < heightSegments; ++y) {
                 // we use the index array to access the correct indices
-                const a = indexArray[ y ][ x ];
-                const b = indexArray[ y + 1 ][ x ];
-                const c = indexArray[ y + 1 ][ x + 1 ];
-                const d = indexArray[ y ][ x + 1 ];
+                const a = indexArray[y][x];
+                const b = indexArray[y + 1][x];
+                const c = indexArray[y + 1][x + 1];
+                const d = indexArray[y][x + 1];
 
                 // faces
                 indices.push(a, b, d);

src/mol-geo/primitive/polyhedron.ts

@@ -46,9 +46,9 @@ export function Polyhedron(_vertices: ArrayLike<number>, _indices: ArrayLike<num
         // iterate over all faces and apply a subdivison with the given detail value
         for (let i = 0; i < _indices.length; i += 3) {
             // get the vertices of the face
-            Vec3.fromArray(a, _vertices, _indices[ i + 0 ] * 3);
-            Vec3.fromArray(b, _vertices, _indices[ i + 1 ] * 3);
-            Vec3.fromArray(c, _vertices, _indices[ i + 2 ] * 3);
+            Vec3.fromArray(a, _vertices, _indices[i + 0] * 3);
+            Vec3.fromArray(b, _vertices, _indices[i + 1] * 3);
+            Vec3.fromArray(c, _vertices, _indices[i + 2] * 3);
 
             // perform subdivision
             subdivideFace(a, b, c, detail);

src/mol-io/reader/cube/parser.ts

@@ -52,7 +52,7 @@ const bohrToAngstromFactor = 0.529177210859;
 function readHeader(tokenizer: Tokenizer) {
     const headerLines = Tokenizer.readLines(tokenizer, 6);
     const h = (k: number, l: number) => {
-        const field = +headerLines[k].trim().split(/\s+/g)[ l ];
+        const field = +headerLines[k].trim().split(/\s+/g)[l];
         return Number.isNaN(field) ? 0 : field;
     };
     const basis = (i: number) => {

src/mol-math/linear-algebra/matrix/matrix.ts

@@ -91,11 +91,11 @@ namespace Matrix {
         const md = mat.data;
         const mean = new Array(ncols) as V;
 
-        for (let j = 0; j < ncols; ++j) mean[ j ] = 0.0;
+        for (let j = 0; j < ncols; ++j) mean[j] = 0.0;
         for (let i = 0, p = 0; i < nrows; ++i) {
-            for (let j = 0; j < ncols; ++j, ++p) mean[ j ] += md[ p ];
+            for (let j = 0; j < ncols; ++j, ++p) mean[j] += md[p];
         }
-        for (let j = 0; j < ncols; ++j) mean[ j ] /= nrows;
+        for (let j = 0; j < ncols; ++j) mean[j] /= nrows;
 
         return mean;
     }
@@ -106,7 +106,7 @@ namespace Matrix {
         const md = mat.data;
 
         for (let i = 0, p = 0; i < nrows; ++i) {
-            for (let j = 0; j < ncols; ++j, ++p) md[ p ] -= row[ j ];
+            for (let j = 0; j < ncols; ++j, ++p) md[p] -= row[j];
         }
         return mat;
     }

src/mol-util/color/color.ts

@@ -53,17 +53,17 @@ export namespace Color {
 
     /** Copies hex color to rgb array */
     export function toArray(hexColor: Color, array: NumberArray, offset: number) {
-        array[ offset ] = (hexColor >> 16 & 255);
-        array[ offset + 1 ] = (hexColor >> 8 & 255);
-        array[ offset + 2 ] = (hexColor & 255);
+        array[offset] = (hexColor >> 16 & 255);
+        array[offset + 1] = (hexColor >> 8 & 255);
+        array[offset + 2] = (hexColor & 255);
         return array;
     }
 
     /** Copies normalized (0 to 1) hex color to rgb array */
     export function toArrayNormalized<T extends NumberArray>(hexColor: Color, array: T, offset: number) {
-        array[ offset ] = (hexColor >> 16 & 255) / 255;
-        array[ offset + 1 ] = (hexColor >> 8 & 255) / 255;
-        array[ offset + 2 ] = (hexColor & 255) / 255;
+        array[offset] = (hexColor >> 16 & 255) / 255;
+        array[offset + 1] = (hexColor >> 8 & 255) / 255;
+        array[offset + 2] = (hexColor & 255) / 255;
         return array;
     }
 

src/mol-util/file-info.ts

@@ -51,8 +51,8 @@ export function getFileInfo (file: FileInput): FileInfo {
 
     const protocolMatch = path.match(/^(.+):\/\/(.+)$/);
     if (protocolMatch) {
-        protocol = protocolMatch[ 1 ].toLowerCase();
-        path = protocolMatch[ 2 ] || '';
+        protocol = protocolMatch[1].toLowerCase();
+        path = protocolMatch[2] || '';
     }
 
     const dir = path.substring(0, path.lastIndexOf('/') + 1);

src/mol-util/polyfill.ts

@@ -32,7 +32,7 @@ if (typeof window.HTMLCanvasElement !== 'undefined' && !window.HTMLCanvasElement
     Object.defineProperty(window.HTMLCanvasElement.prototype, 'toBlob', {
 
         value: function (callback: any, type: any, quality: any) {
-            let bin = window.atob(this.toDataURL(type, quality).split(',')[ 1 ]);
+            let bin = window.atob(this.toDataURL(type, quality).split(',')[1]);
             let len = bin.length;
             let len32 = len >> 2;
             let a8 = new Uint8Array(len);
@@ -51,7 +51,7 @@ if (typeof window.HTMLCanvasElement !== 'undefined' && !window.HTMLCanvasElement
             let tailLength = len & 3;
 
             while (tailLength--) {
-                a8[ j ] = bin.charCodeAt(j++);
+                a8[j] = bin.charCodeAt(j++);
             }
 
             callback(new window.Blob([a8], { 'type': type || 'image/png' }));
@@ -401,12 +401,12 @@ if (typeof window !== 'undefined') {
 
         for (let x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
             window.requestAnimationFrame = (
-                (window as any)[ vendors[ x ] + 'RequestAnimationFrame' ]
+                (window as any)[vendors[x] + 'RequestAnimationFrame']
             );
 
             window.cancelAnimationFrame = (
-                (window as any)[ vendors[ x ] + 'CancelAnimationFrame' ] ||
-                (window as any)[ vendors[ x ] + 'CancelRequestAnimationFrame' ]
+                (window as any)[vendors[x] + 'CancelAnimationFrame'] ||
+                (window as any)[vendors[x] + 'CancelRequestAnimationFrame']
             );
         }
 
@@ -442,7 +442,7 @@ if (Function.prototype.name === undefined && Object.defineProperty !== undefined
     Object.defineProperty(Function.prototype, 'name', {
 
         get: function () {
-            return this.toString().match(/^\s*function\s*(\S*)\s*\(/)[ 1 ];
+            return this.toString().match(/^\s*function\s*(\S*)\s*\(/)[1];
         }
 
     });

src/mol-util/zip/deflate.ts

@@ -75,7 +75,7 @@ function deflateChunk(ctx: DeflateContext, count: number) {
             if(mch !== 0) {
                 const len = mch >>> 16, dst = mch & 0xffff;
                 const lgi = _goodIndex(len, U.of0);  U.lhst[257 + lgi]++;
-                const dgi = _goodIndex(dst, U.df0);  U.dhst[    dgi]++;  ebits += U.exb[lgi] + U.dxb[dgi];
+                const dgi = _goodIndex(dst, U.df0);  U.dhst[dgi]++;  ebits += U.exb[lgi] + U.dxb[dgi];
                 lits[li] = (len << 23) | (i - cvrd);  lits[li + 1] = (dst << 16) | (lgi << 8) | dgi;  li += 2;
                 cvrd = i + len;
             } else {