refactor: eslint default case and regex rules

Author: forrest

Sources/Common/Core/ScalarsToColors/index.js

@@ -351,8 +351,16 @@ function vtkScalarsToColors(publicAPI, model) {
         break;
       }
 
-      default:
-      case VectorMode.MAGNITUDE: {
+      case VectorMode.RGBCOLORS: {
+        // publicAPI.mapColorsToColors(
+        //   input, output, inComponents, vectorSize,
+        //   outputFormat);
+        break;
+      }
+
+      // MAGNITUDE is considered default
+      case VectorMode.MAGNITUDE:
+      default: {
         const magValues = vtkDataArray.newInstance({
           numberOfComponents: 1,
           values: new Float32Array(input.getNumberOfTuples()),
@@ -362,13 +370,6 @@ function vtkScalarsToColors(publicAPI, model) {
         publicAPI.mapScalarsThroughTable(magValues, output, outputFormat, 0);
         break;
       }
-
-      case VectorMode.RGBCOLORS: {
-        // publicAPI.mapColorsToColors(
-        //   input, output, inComponents, vectorSize,
-        //   outputFormat);
-        break;
-      }
     }
   };
 

Sources/Common/DataModel/PiecewiseFunction/index.js

@@ -41,8 +41,8 @@ function vtkPiecewiseFunction(publicAPI, model) {
             case 1:
               functionType = 1; // NonDecreasing
               break;
-            default:
             case 2:
+            default:
               functionType = 3; // Varied
               break;
           }
@@ -53,8 +53,8 @@ function vtkPiecewiseFunction(publicAPI, model) {
             case 2:
               functionType = 2; // NonIncreasing
               break;
-            default:
             case 1:
+            default:
               functionType = 3; // Varied
               break;
           }
@@ -76,8 +76,8 @@ function vtkPiecewiseFunction(publicAPI, model) {
         return 'NonDecreasing';
       case 2:
         return 'NonIncreasing';
-      default:
       case 3:
+      default:
         return 'Varied';
     }
   };

Sources/Imaging/Core/ImageInterpolator/index.js

@@ -93,16 +93,16 @@ function vtkImageInterpolator(publicAPI, model) {
 
   publicAPI.interpolatePoint = (interpolationInfo, point, value) => {
     switch (model.interpolationMode) {
-      case InterpolationMode.NEAREST:
-      default:
-        publicAPI.interpolateNearest(interpolationInfo, point, value);
-        break;
       case InterpolationMode.LINEAR:
         console.log('LINEAR not implemented');
         break;
       case InterpolationMode.CUBIC:
         console.log('CUBIC not implemented');
         break;
+      case InterpolationMode.NEAREST:
+      default:
+        publicAPI.interpolateNearest(interpolationInfo, point, value);
+        break;
     }
   };
 
@@ -124,16 +124,16 @@ function vtkImageInterpolator(publicAPI, model) {
 
   publicAPI.interpolateRow = (weights, xIdx, yIdx, zIdx, value, n) => {
     switch (model.interpolationMode) {
-      case InterpolationMode.NEAREST:
-      default:
-        publicAPI.interpolateRowNearest(weights, xIdx, yIdx, zIdx, value, n);
-        break;
       case InterpolationMode.LINEAR:
         console.log('LINEAR not implemented');
         break;
       case InterpolationMode.CUBIC:
         console.log('CUBIC not implemented');
         break;
+      case InterpolationMode.NEAREST:
+      default:
+        publicAPI.interpolateRowNearest(weights, xIdx, yIdx, zIdx, value, n);
+        break;
     }
   };
 

Sources/Imaging/Core/ImageReslice/index.js

@@ -835,10 +835,6 @@ function vtkImageReslice(publicAPI, model) {
     switch (dataType) {
       case 'Int8Array':
         return { min: -128, max: 127 };
-      case 'Uint8Array':
-      case 'Uint8ClampedArray':
-      default:
-        return { min: 0, max: 255 };
       case 'Int16Array':
         return { min: -32768, max: 32767 };
       case 'Uint16Array':
@@ -851,6 +847,10 @@ function vtkImageReslice(publicAPI, model) {
         return { min: -1.2e38, max: 1.2e38 };
       case 'Float64Array':
         return { min: -1.2e38, max: 1.2e38 };
+      case 'Uint8Array':
+      case 'Uint8ClampedArray':
+      default:
+        return { min: 0, max: 255 };
     }
   };
 

Sources/Rendering/OpenGL/BufferObject/index.js

@@ -32,10 +32,10 @@ function vtkOpenGLBufferObject(publicAPI, model) {
         }
       /* eslint-disable no-fallthrough */
       // Intentional fallthrough in case there is no TEXTURE_BUFFER in WebGL
-      default:
-      /* eslint-enable no-fallthrough */
       case ObjectType.ARRAY_BUFFER:
+      default:
         return model.context.ARRAY_BUFFER;
+      /* eslint-enable no-fallthrough */
     }
   }
 

Sources/Rendering/OpenGL/RenderWindow/index.js

@@ -528,8 +528,8 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
             default:
               return model.context.RGBA8;
           }
-        default:
         case VtkDataTypes.FLOAT:
+        default:
           switch (numComps) {
             case 1:
               return model.context.R16F;

Sources/Rendering/OpenGL/VolumeMapper/index.js

@@ -243,10 +243,6 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     const shadowFactor = '';
 
     switch (model.lastLightComplexity) {
-      default:
-      case 0: // no lighting, tcolor is fine as is
-        break;
-
       case 1: // headlight
       case 2: // light kit
       case 3: {
@@ -287,7 +283,10 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
             lightNum++;
           }
         });
+        break;
       }
+      case 0: // no lighting, tcolor is fine as is
+      default:
     }
 
     shaders.Fragment = FSSource;
@@ -702,11 +701,6 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     const pos2 = new Float64Array(3);
     for (let i = 0; i < 6; ++i) {
       switch (i) {
-        default:
-        case 0:
-          vec3.set(normal, 1.0, 0.0, 0.0);
-          vec3.set(pos2, ext[1], ext[3], ext[5]);
-          break;
         case 1:
           vec3.set(normal, -1.0, 0.0, 0.0);
           vec3.set(pos2, ext[0], ext[2], ext[4]);
@@ -727,6 +721,11 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
           vec3.set(normal, 0.0, 0.0, -1.0);
           vec3.set(pos2, ext[0], ext[2], ext[4]);
           break;
+        case 0:
+        default:
+          vec3.set(normal, 1.0, 0.0, 0.0);
+          vec3.set(pos2, ext[1], ext[3], ext[5]);
+          break;
       }
       vec3.transformMat3(normal, normal, model.idxNormalMatrix);
       vec3.transformMat4(pos2, pos2, model.idxToView);
@@ -759,10 +758,6 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
 
     // handle lighting values
     switch (model.lastLightComplexity) {
-      default:
-      case 0: // no lighting, tcolor is fine as is
-        break;
-
       case 1: // headlight
       case 2: // light kit
       case 3: {
@@ -799,7 +794,11 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
           }
         });
         // mat3.transpose(keyMats.normalMatrix, keyMats.normalMatrix);
+        break;
       }
+      case 0: // no lighting, tcolor is fine as is
+      default:
+        break;
     }
   };
 

Sources/Rendering/WebGPU/HardwareSelector/index.js

@@ -282,9 +282,9 @@ function vtkWebGPUHardwareSelector(publicAPI, model) {
 
     if (!model.WebGPURenderWindow.getInitialized()) {
       model.WebGPURenderWindow.initialize();
-      await new Promise((resolve) =>
-        model.WebGPURenderWindow.onInitialized(resolve)
-      );
+      await new Promise((resolve) => {
+        model.WebGPURenderWindow.onInitialized(resolve);
+      });
     }
 
     const webGPURenderer = model.WebGPURenderWindow.getViewNodeFor(renderer);

Sources/Rendering/WebGPU/MapperHelper/index.js

@@ -114,6 +114,7 @@ function vtkWebGPUMapperHelper(publicAPI, model) {
 
     // look for replacements to invoke
     const scode = model.vertexShaderTemplate + model.fragmentShaderTemplate;
+    // eslint-disable-next-line prefer-regex-literals
     const re = new RegExp('//VTK::[^:]*::', 'g');
     const unique = scode.match(re).filter((v, i, a) => a.indexOf(v) === i);
     const fnames = unique.map(

Sources/Rendering/WebGPU/PolyDataMapper/index.js

@@ -386,8 +386,8 @@ function vtkWebGPUPolyDataMapper(publicAPI, model) {
         return 'triangle-list';
       case BufferUsage.Verts:
         return 'point-list';
-      default:
       case BufferUsage.Lines:
+      default:
         return 'line-list';
     }
   };