fix valueType in IOTypes for Particle subclasses, #231

phetsims · May 3, 2024 · 7c839b9 · 7c839b9
1 parent 33759fb
commit 7c839b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/js/common/model/HeavyParticle.ts b/js/common/model/HeavyParticle.ts
@@ -52,7 +52,7 @@ export default class HeavyParticle extends Particle {
   }
 
   public static readonly HeavyParticleIO = new IOType<HeavyParticle, HeavyParticleStateObject>( 'HeavyParticleIO', {
-    valueType: Particle,
+    valueType: HeavyParticle,
     stateSchema: Particle.STATE_SCHEMA,
     fromStateObject: HeavyParticle.fromStateObject
   } );

diff --git a/js/common/model/LightParticle.ts b/js/common/model/LightParticle.ts
@@ -52,7 +52,7 @@ export default class LightParticle extends Particle {
   }
 
   public static readonly LightParticleIO = new IOType<LightParticle, LightParticleStateObject>( 'LightParticleIO', {
-    valueType: Particle,
+    valueType: LightParticle,
     stateSchema: Particle.STATE_SCHEMA,
     fromStateObject: LightParticle.fromStateObject
   } );

diff --git a/js/diffusion/model/DiffusionParticle1.ts b/js/diffusion/model/DiffusionParticle1.ts
@@ -21,6 +21,8 @@ type SelfOptions = EmptySelfOptions;
 export type DiffusionParticle1Options = SelfOptions &
   StrictOmit<DiffusionParticleOptions, 'colorProperty' | 'highlightColorProperty'>;
 
+export type DiffusionParticle1StateObject = ParticleStateObject;
+
 export default class DiffusionParticle1 extends DiffusionParticle {
 
   public constructor( providedOptions?: DiffusionParticle1Options ) {
@@ -35,7 +37,7 @@ export default class DiffusionParticle1 extends DiffusionParticle {
   /**
    * Deserializes an instance of DiffusionParticle1.
    */
-  private static fromStateObject( stateObject: ParticleStateObject ): DiffusionParticle1 {
+  private static fromStateObject( stateObject: DiffusionParticle1StateObject ): DiffusionParticle1 {
     return new DiffusionParticle1( {
       x: stateObject.x,
       y: stateObject.y,
@@ -46,8 +48,8 @@ export default class DiffusionParticle1 extends DiffusionParticle {
     } );
   }
 
-  public static readonly DiffusionParticle1IO = new IOType<DiffusionParticle1, ParticleStateObject>( 'DiffusionParticle1IO', {
-    valueType: Particle,
+  public static readonly DiffusionParticle1IO = new IOType<DiffusionParticle1, DiffusionParticle1StateObject>( 'DiffusionParticle1IO', {
+    valueType: DiffusionParticle1,
     stateSchema: Particle.STATE_SCHEMA,
     fromStateObject: DiffusionParticle1.fromStateObject
   } );

diff --git a/js/diffusion/model/DiffusionParticle2.ts b/js/diffusion/model/DiffusionParticle2.ts
@@ -21,6 +21,8 @@ type SelfOptions = EmptySelfOptions;
 export type DiffusionParticle2Options = SelfOptions &
   StrictOmit<DiffusionParticleOptions, 'colorProperty' | 'highlightColorProperty'>;
 
+export type DiffusionParticle2StateObject = ParticleStateObject;
+
 export default class DiffusionParticle2 extends DiffusionParticle {
 
   public constructor( providedOptions?: DiffusionParticle2Options ) {
@@ -35,7 +37,7 @@ export default class DiffusionParticle2 extends DiffusionParticle {
   /**
    * Deserializes an instance of DiffusionParticle1.
    */
-  private static fromStateObject( stateObject: ParticleStateObject ): DiffusionParticle2 {
+  private static fromStateObject( stateObject: DiffusionParticle2StateObject ): DiffusionParticle2 {
     return new DiffusionParticle2( {
       x: stateObject.x,
       y: stateObject.y,
@@ -46,8 +48,8 @@ export default class DiffusionParticle2 extends DiffusionParticle {
     } );
   }
 
-  public static readonly DiffusionParticle2IO = new IOType<DiffusionParticle2, ParticleStateObject>( 'DiffusionParticle2IO', {
-    valueType: Particle,
+  public static readonly DiffusionParticle2IO = new IOType<DiffusionParticle2, DiffusionParticle2StateObject>( 'DiffusionParticle2IO', {
+    valueType: DiffusionParticle2,
     stateSchema: Particle.STATE_SCHEMA,
     fromStateObject: DiffusionParticle2.fromStateObject
   } );