Sort imports and run grunt modulify, see phetsims/chipper#1462

phetsims · Nov 27, 2024 · dc42a59 · dc42a59
1 parent 891aa04
commit dc42a59
Show file tree

Hide file tree

Showing 81 changed files with 274 additions and 274 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -7,8 +7,8 @@
  * @author Michael Kauzmann (PhET Interactive Simulations)
  */
 
-import banTSCommentConfig from '../perennial-alias/js/eslint/config/util/banTSCommentConfig.mjs';
 import simEslintConfig from '../perennial-alias/js/eslint/config/sim.eslint.config.mjs';
+import banTSCommentConfig from '../perennial-alias/js/eslint/config/util/banTSCommentConfig.mjs';
 
 export default [
   ...simEslintConfig,

diff --git a/js/common/GasPropertiesConstants.ts b/js/common/GasPropertiesConstants.ts
@@ -8,6 +8,9 @@
 
 import RangeWithValue from '../../../dot/js/RangeWithValue.js';
 import { CreditsData } from '../../../joist/js/CreditsNode.js';
+import { ScreenOptions } from '../../../joist/js/Screen.js';
+import { SimOptions } from '../../../joist/js/Sim.js';
+import platform from '../../../phet-core/js/platform.js';
 import { ComboBoxDisplayOptions } from '../../../scenery-phet/js/ComboBoxDisplay.js';
 import PhetFont from '../../../scenery-phet/js/PhetFont.js';
 import { AccordionBoxOptions } from '../../../sun/js/AccordionBox.js';
@@ -16,9 +19,6 @@ import { CheckboxOptions } from '../../../sun/js/Checkbox.js';
 import { PanelOptions } from '../../../sun/js/Panel.js';
 import gasProperties from '../gasProperties.js';
 import GasPropertiesColors from './GasPropertiesColors.js';
-import { ScreenOptions } from '../../../joist/js/Screen.js';
-import { SimOptions } from '../../../joist/js/Sim.js';
-import platform from '../../../phet-core/js/platform.js';
 
 // for all panel-like containers
 const PANEL_CORNER_RADIUS = 5;

diff --git a/js/common/model/BaseContainer.ts b/js/common/model/BaseContainer.ts
@@ -19,11 +19,11 @@ import Vector2 from '../../../../dot/js/Vector2.js';
 import optionize from '../../../../phet-core/js/optionize.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import NumberIO from '../../../../tandem/js/types/NumberIO.js';
 import gasProperties from '../../gasProperties.js';
-import Particle from './Particle.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
 import GasPropertiesConstants from '../GasPropertiesConstants.js';
+import Particle from './Particle.js';
 
 type SelfOptions = {
   position?: Vector2; // position of the container's bottom right corner, in pm

diff --git a/js/common/model/BaseModel.ts b/js/common/model/BaseModel.ts
@@ -19,16 +19,16 @@ import Range from '../../../../dot/js/Range.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import TModel from '../../../../joist/js/TModel.js';
 import optionize from '../../../../phet-core/js/optionize.js';
+import PickOptional from '../../../../phet-core/js/types/PickOptional.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
 import Stopwatch from '../../../../scenery-phet/js/Stopwatch.js';
 import TimeSpeed from '../../../../scenery-phet/js/TimeSpeed.js';
+import { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesConstants from '../GasPropertiesConstants.js';
 import TimeTransform from './TimeTransform.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
-import PickOptional from '../../../../phet-core/js/types/PickOptional.js';
 
 const MODEL_VIEW_SCALE = 0.040; // number of pixels per pm
 

diff --git a/js/common/model/CollisionCounter.ts b/js/common/model/CollisionCounter.ts
@@ -7,17 +7,17 @@
  */
 
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
+import Multilink from '../../../../axon/js/Multilink.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
 import Property from '../../../../axon/js/Property.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import Vector2Property from '../../../../dot/js/Vector2Property.js';
 import optionize from '../../../../phet-core/js/optionize.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
+import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
 import gasProperties from '../../gasProperties.js';
 import CollisionDetector from './CollisionDetector.js';
-import Multilink from '../../../../axon/js/Multilink.js';
-import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 
 type SelfOptions = {
   position?: Vector2;

diff --git a/js/common/model/GasPropertiesPreferences.ts b/js/common/model/GasPropertiesPreferences.ts
@@ -7,10 +7,10 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import gasProperties from '../../gasProperties.js';
-import GasPropertiesQueryParameters from '../GasPropertiesQueryParameters.js';
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
+import gasProperties from '../../gasProperties.js';
+import GasPropertiesQueryParameters from '../GasPropertiesQueryParameters.js';
 
 const GasPropertiesPreferences = {
 

diff --git a/js/common/model/IdealGasLawContainer.ts b/js/common/model/IdealGasLawContainer.ts
@@ -15,12 +15,12 @@ import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Utils from '../../../../dot/js/Utils.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import optionize from '../../../../phet-core/js/optionize.js';
+import WithRequired from '../../../../phet-core/js/types/WithRequired.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
+import BooleanIO from '../../../../tandem/js/types/BooleanIO.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesQueryParameters from '../GasPropertiesQueryParameters.js';
 import BaseContainer, { BaseContainerOptions } from './BaseContainer.js';
-import BooleanIO from '../../../../tandem/js/types/BooleanIO.js';
-import WithRequired from '../../../../phet-core/js/types/WithRequired.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
 
 const NUMBER_OF_DX_SAMPLES = 50;
 

diff --git a/js/common/model/IdealGasLawModel.ts b/js/common/model/IdealGasLawModel.ts
@@ -21,6 +21,9 @@ import Range from '../../../../dot/js/Range.js';
 import Utils from '../../../../dot/js/Utils.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js';
+import PickOptional from '../../../../phet-core/js/types/PickOptional.js';
+import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
+import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesConstants from '../GasPropertiesConstants.js';
@@ -33,9 +36,6 @@ import IdealGasLawContainer, { IdealGasLawContainerOptions } from './IdealGasLaw
 import IdealGasLawParticleSystem from './IdealGasLawParticleSystem.js';
 import PressureModel from './PressureModel.js';
 import TemperatureModel from './TemperatureModel.js';
-import PickOptional from '../../../../phet-core/js/types/PickOptional.js';
-import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
-import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 
 type SelfOptions = {
 

diff --git a/js/common/model/IdealGasLawParticleSystem.ts b/js/common/model/IdealGasLawParticleSystem.ts
@@ -7,15 +7,23 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
 import Property from '../../../../axon/js/Property.js';
 import ReadOnlyProperty from '../../../../axon/js/ReadOnlyProperty.js';
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import dotRandom from '../../../../dot/js/dotRandom.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
+import optionize from '../../../../phet-core/js/optionize.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
+import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
+import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
+import phetioStateSetEmitter from '../../../../tandem/js/phetioStateSetEmitter.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
+import IOType from '../../../../tandem/js/types/IOType.js';
 import NumberIO from '../../../../tandem/js/types/NumberIO.js';
+import ReferenceArrayIO from '../../../../tandem/js/types/ReferenceArrayIO.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesConstants from '../GasPropertiesConstants.js';
 import GasPropertiesUtils from '../GasPropertiesUtils.js';
@@ -24,14 +32,6 @@ import IdealGasLawContainer from './IdealGasLawContainer.js';
 import LightParticle, { LightParticleStateObject } from './LightParticle.js';
 import Particle, { ParticleOptions } from './Particle.js';
 import ParticleUtils from './ParticleUtils.js';
-import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
-import optionize from '../../../../phet-core/js/optionize.js';
-import IOType from '../../../../tandem/js/types/IOType.js';
-import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
-import ReferenceArrayIO from '../../../../tandem/js/types/ReferenceArrayIO.js';
-import phetioStateSetEmitter from '../../../../tandem/js/phetioStateSetEmitter.js';
 
 // used to compute the initial velocity angle for particles, in radians
 const PARTICLE_DISPERSION_ANGLE = Math.PI / 2;

diff --git a/js/common/model/Particle.ts b/js/common/model/Particle.ts
@@ -11,11 +11,11 @@
  */
 
 import Bounds2 from '../../../../dot/js/Bounds2.js';
+import optionize from '../../../../phet-core/js/optionize.js';
 import { ProfileColorProperty } from '../../../../scenery/js/imports.js';
+import NumberIO from '../../../../tandem/js/types/NumberIO.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesUtils from '../GasPropertiesUtils.js';
-import NumberIO from '../../../../tandem/js/types/NumberIO.js';
-import optionize from '../../../../phet-core/js/optionize.js';
 
 type SelfOptions = {
   mass: number; // AMU

diff --git a/js/common/model/PressureModel.ts b/js/common/model/PressureModel.ts
@@ -7,24 +7,24 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
 import Property from '../../../../axon/js/Property.js';
+import StringUnionProperty from '../../../../axon/js/StringUnionProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import dotRandom from '../../../../dot/js/dotRandom.js';
+import LinearFunction from '../../../../dot/js/LinearFunction.js';
+import Range from '../../../../dot/js/Range.js';
+import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
+import PhetioObject from '../../../../tandem/js/PhetioObject.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
+import NumberIO from '../../../../tandem/js/types/NumberIO.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesConstants from '../GasPropertiesConstants.js';
 import GasPropertiesQueryParameters from '../GasPropertiesQueryParameters.js';
+import GasPropertiesPreferences from './GasPropertiesPreferences.js';
 import { HoldConstant } from './HoldConstant.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
-import StringUnionProperty from '../../../../axon/js/StringUnionProperty.js';
-import PhetioObject from '../../../../tandem/js/PhetioObject.js';
-import Range from '../../../../dot/js/Range.js';
-import LinearFunction from '../../../../dot/js/LinearFunction.js';
 import { PressureUnits, PressureUnitsValues } from './PressureUnits.js';
-import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
-import NumberIO from '../../../../tandem/js/types/NumberIO.js';
-import GasPropertiesPreferences from './GasPropertiesPreferences.js';
-import dotRandom from '../../../../dot/js/dotRandom.js';
-import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 
 // Maximum pressure, in kPa. When exceeded, the lid blows off of the container.
 const MAX_PRESSURE = GasPropertiesQueryParameters.maxPressure;

diff --git a/js/common/model/TemperatureModel.ts b/js/common/model/TemperatureModel.ts
@@ -8,20 +8,20 @@
  */
 
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
 import Property from '../../../../axon/js/Property.js';
+import StringUnionProperty from '../../../../axon/js/StringUnionProperty.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Range from '../../../../dot/js/Range.js';
+import optionize from '../../../../phet-core/js/optionize.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
+import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
 import NullableIO from '../../../../tandem/js/types/NullableIO.js';
 import NumberIO from '../../../../tandem/js/types/NumberIO.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesConstants from '../GasPropertiesConstants.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
-import optionize from '../../../../phet-core/js/optionize.js';
-import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
-import StringUnionProperty from '../../../../axon/js/StringUnionProperty.js';
 import { TemperatureUnits, TemperatureUnitsValues } from './TemperatureUnits.js';
 
 const DEFAULT_TEMPERATURE_KELVIN_RANGE = new Range( 0, 1000 ); // in K

diff --git a/js/common/view/BaseScreenView.ts b/js/common/view/BaseScreenView.ts
@@ -8,15 +8,15 @@
 
 import ScreenView, { ScreenViewOptions } from '../../../../joist/js/ScreenView.js';
 import optionize from '../../../../phet-core/js/optionize.js';
-import { Node } from '../../../../scenery/js/imports.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.js';
 import TimeControlNode from '../../../../scenery-phet/js/TimeControlNode.js';
+import { Node } from '../../../../scenery/js/imports.js';
+import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesColors from '../GasPropertiesColors.js';
 import GasPropertiesConstants from '../GasPropertiesConstants.js';
 import BaseModel from '../model/BaseModel.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 
 type SelfOptions = {
   hasTimeSpeedFeature?: boolean;

diff --git a/js/common/view/BicyclePumpControl.ts b/js/common/view/BicyclePumpControl.ts
@@ -6,20 +6,20 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import gasProperties from '../../gasProperties.js';
-import { Node, NodeOptions, NodeTranslationOptions } from '../../../../scenery/js/imports.js';
-import ParticleTypeRadioButtonGroup from './ParticleTypeRadioButtonGroup.js';
-import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
-import StringUnionProperty from '../../../../axon/js/StringUnionProperty.js';
-import { ParticleType } from '../model/ParticleType.js';
-import GasPropertiesBicyclePumpNode, { GasPropertiesBicyclePumpNodeOptions } from './GasPropertiesBicyclePumpNode.js';
-import optionize, { combineOptions, EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
-import GasPropertiesColors from '../GasPropertiesColors.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
-import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
+import StringUnionProperty from '../../../../axon/js/StringUnionProperty.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
+import optionize, { combineOptions, EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
+import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
+import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
+import { Node, NodeOptions, NodeTranslationOptions } from '../../../../scenery/js/imports.js';
+import gasProperties from '../../gasProperties.js';
+import GasPropertiesColors from '../GasPropertiesColors.js';
+import { ParticleType } from '../model/ParticleType.js';
+import GasPropertiesBicyclePumpNode, { GasPropertiesBicyclePumpNodeOptions } from './GasPropertiesBicyclePumpNode.js';
+import ParticleTypeRadioButtonGroup from './ParticleTypeRadioButtonGroup.js';
 
 type SelfOptions = EmptySelfOptions;
 

diff --git a/js/common/view/CollisionCounterNode.ts b/js/common/view/CollisionCounterNode.ts
@@ -7,6 +7,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import Range from '../../../../dot/js/Range.js';
@@ -15,16 +16,15 @@ import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import NumberDisplay from '../../../../scenery-phet/js/NumberDisplay.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import ShadedRectangle from '../../../../scenery-phet/js/ShadedRectangle.js';
+import SoundDragListener from '../../../../scenery-phet/js/SoundDragListener.js';
+import SoundKeyboardDragListener from '../../../../scenery-phet/js/SoundKeyboardDragListener.js';
 import { Circle, HBox, InteractiveHighlighting, InteractiveHighlightingOptions, Node, NodeOptions, Rectangle, Text, VBox, VStrut } from '../../../../scenery/js/imports.js';
 import gasProperties from '../../gasProperties.js';
 import GasPropertiesStrings from '../../GasPropertiesStrings.js';
 import GasPropertiesColors from '../GasPropertiesColors.js';
 import GasPropertiesQueryParameters from '../GasPropertiesQueryParameters.js';
 import CollisionCounter from '../model/CollisionCounter.js';
 import PlayResetButton from './PlayResetButton.js';
-import SoundKeyboardDragListener from '../../../../scenery-phet/js/SoundKeyboardDragListener.js';
-import SoundDragListener from '../../../../scenery-phet/js/SoundDragListener.js';
-import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import SamplePeriodComboBox from './SamplePeriodComboBox.js';
 
 const X_MARGIN = 15;

diff --git a/js/common/view/GasPropertiesBicyclePumpNode.ts b/js/common/view/GasPropertiesBicyclePumpNode.ts
@@ -11,8 +11,8 @@ import NumberProperty from '../../../../axon/js/NumberProperty.js';
 import Property from '../../../../axon/js/Property.js';
 import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import BicyclePumpNode, { BicyclePumpNodeOptions } from '../../../../scenery-phet/js/BicyclePumpNode.js';
-import gasProperties from '../../gasProperties.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
+import gasProperties from '../../gasProperties.js';
 
 type SelfOptions = EmptySelfOptions;
 

diff --git a/js/common/view/GasPropertiesHeaterCoolerNode.ts b/js/common/view/GasPropertiesHeaterCoolerNode.ts
@@ -22,12 +22,12 @@ import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import HeaterCoolerNode, { HeaterCoolerNodeOptions } from '../../../../scenery-phet/js/HeaterCoolerNode.js';
 import { NodeTranslationOptions } from '../../../../scenery/js/imports.js';
+import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
 import Animation from '../../../../twixt/js/Animation.js';
 import Easing from '../../../../twixt/js/Easing.js';
 import gasProperties from '../../gasProperties.js';
 import { HoldConstant } from '../model/HoldConstant.js';
-import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
 
 // Animation duration in seconds, split evenly between raising and lowering the flame/ice.
 const HEAT_COOL_DURATION = 1.5;