Improve types, see #401

phetsims · Oct 11, 2021 · 17a9372 · 17a9372
1 parent 666c44c
commit 17a9372
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 14 deletions.
diff --git a/js/common/model/BendingLightModel.ts b/js/common/model/BendingLightModel.ts
@@ -25,7 +25,7 @@ const DEFAULT_LASER_DISTANCE_FROM_PIVOT = 9.225E-6;
 const CHARACTERISTIC_LENGTH = BendingLightConstants.WAVELENGTH_RED;
 
 abstract class BendingLightModel {
-  readonly rays: LightRay[]; // Comes from ObservableArray
+  readonly rays: ObservableArray<LightRay>;
   mediumColorFactory: MediumColorFactory;
   readonly modelWidth: number;
   readonly modelHeight: number;
@@ -97,8 +97,6 @@ abstract class BendingLightModel {
    */
   clearModel() {
     for ( let i = 0; i < this.rays.length; i++ ) {
-
-      // @ts-ignore createObservableArray
       this.rays[ i ].particles.clear();
     }
     this.rays.length = 0;

diff --git a/js/common/model/LightRay.ts b/js/common/model/LightRay.ts
@@ -45,7 +45,7 @@ class LightRay {
   numWavelengthsPhaseOffset: number;
   extend: boolean;
   vectorForm: Vector2;
-  particles: WaveParticle[];
+  particles: ObservableArray<WaveParticle>;
   time: number;
   rayType: string;
   unitVector: Vector2;

diff --git a/js/common/model/WaveParticle.ts b/js/common/model/WaveParticle.ts
@@ -15,7 +15,7 @@ import bendingLight from '../../bendingLight.js';
 class WaveParticle {
   private readonly position: Vector2;
   private readonly width: number;
-  private readonly color: string;
+  readonly color: string;
   readonly angle: number;
   readonly height: number;
   readonly particleGradientColor: string;

diff --git a/js/intro/view/AngleNode.ts b/js/intro/view/AngleNode.ts
@@ -46,7 +46,7 @@ class AngleNode extends Node {
    * @param {ModelViewTransform2} modelViewTransform
    * @param {function} addStepListener -
    */
-  constructor( showAnglesProperty: Property, laserOnProperty: Property, showNormalProperty: Property, rays: LightRay[], modelViewTransform: ModelViewTransform2,
+  constructor( showAnglesProperty: Property, laserOnProperty: Property, showNormalProperty: Property, rays: ObservableArray<LightRay>, modelViewTransform: ModelViewTransform2,
                addStepListener: ( x: () => void ) => void ) {
     super();
 
@@ -111,9 +111,7 @@ class AngleNode extends Node {
       dirty = true;
     };
 
-    // @ts-ignore
     rays.addItemAddedListener( markDirty );
-    // @ts-ignore
     rays.addItemRemovedListener( markDirty );
 
     /**

diff --git a/js/intro/view/WaveCanvasNode.ts b/js/intro/view/WaveCanvasNode.ts
@@ -78,12 +78,10 @@ class WaveCanvasNode extends CanvasNode {
         const wavelength = this.modelViewTransform.modelToViewDeltaX( particle.height );
 
         // Fill the background with the dark color, in the entire clip area
-        // @ts-ignore
         context.fillStyle = particle.particleGradientColor;
         context.fillRect( -1000, -1000, 2000, 2000 );
 
         // Set up the color for the wave crests
-        // @ts-ignore
         context.fillStyle = particle.color;
 
         // Render each crest, but we don't need as many wavelengths for the incoming light

diff --git a/js/intro/view/WaveWebGLNode.ts b/js/intro/view/WaveWebGLNode.ts
@@ -19,13 +19,13 @@ const scratchFloatArray2 = new Float32Array( 9 );
 
 class WaveWebGLNode extends WebGLNode {
   readonly modelViewTransform: ModelViewTransform2;
-  readonly rays: LightRay[];
+  readonly rays: ObservableArray<LightRay>;
 
   /**
    * @param {ModelViewTransform2} modelViewTransform - Transform between model and view coordinate frames
    * @param {ObservableArrayDef.<LightRay>} rays - light rays
    */
-  constructor( modelViewTransform: ModelViewTransform2, rays: LightRay[] ) {
+  constructor( modelViewTransform: ModelViewTransform2, rays: ObservableArray<LightRay> ) {
     super( WavePainter );
     this.modelViewTransform = modelViewTransform; // @public (read-only)
     this.rays = rays; // @private

diff --git a/js/prisms/view/PrismsScreenView.ts b/js/prisms/view/PrismsScreenView.ts
@@ -304,8 +304,6 @@ class PrismsScreenView extends BendingLightScreenView {
       stageWidth,
       stageHeight,
       bendingLightModel.rays,
-
-      // @ts-ignore
       bendingLightModel.environmentMediumProperty,
       bendingLightModel.mediumColorFactory
     );