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

phetsims · Nov 27, 2024 · 00474ea · 00474ea
1 parent f39f9c8
commit 00474ea
Show file tree

Hide file tree

Showing 126 changed files with 778 additions and 778 deletions.
diff --git a/js/bar-magnet/BarMagnetScreen.ts b/js/bar-magnet/BarMagnetScreen.ts
@@ -7,16 +7,16 @@
  */
 
 import Screen, { ScreenOptions } from '../../../joist/js/Screen.js';
-import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
-import BarMagnetScreenView from './view/BarMagnetScreenView.js';
-import FaradaysElectromagneticLabStrings from '../FaradaysElectromagneticLabStrings.js';
-import BarMagnetScreenModel from './model/BarMagnetScreenModel.js';
-import Tandem from '../../../tandem/js/Tandem.js';
 import { combineOptions } from '../../../phet-core/js/optionize.js';
+import Tandem from '../../../tandem/js/Tandem.js';
 import FELConstants from '../common/FELConstants.js';
+import FELPreferences from '../common/model/FELPreferences.js';
 import FELKeyboardHelpContent from '../common/view/FELKeyboardHelpContent.js';
 import FELScreenIconFactory from '../common/view/FELScreenIconFactory.js';
-import FELPreferences from '../common/model/FELPreferences.js';
+import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
+import FaradaysElectromagneticLabStrings from '../FaradaysElectromagneticLabStrings.js';
+import BarMagnetScreenModel from './model/BarMagnetScreenModel.js';
+import BarMagnetScreenView from './view/BarMagnetScreenView.js';
 
 export default class BarMagnetScreen extends Screen<BarMagnetScreenModel, BarMagnetScreenView> {
 

diff --git a/js/bar-magnet/model/BarMagnetScreenModel.ts b/js/bar-magnet/model/BarMagnetScreenModel.ts
@@ -9,13 +9,13 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
+import Vector2 from '../../../../dot/js/Vector2.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
 import BarMagnet from '../../common/model/BarMagnet.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
-import KinematicCompass from '../../common/model/KinematicCompass.js';
-import FELScreenModel from '../../common/model/FELScreenModel.js';
 import FELPreferences from '../../common/model/FELPreferences.js';
+import FELScreenModel from '../../common/model/FELScreenModel.js';
+import KinematicCompass from '../../common/model/KinematicCompass.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 
 // Positions are factored out here because we've changed them so many times.
 const BAR_MAGNET_POSITION = new Vector2( 430, 285 );

diff --git a/js/bar-magnet/view/BarMagnetDeveloperAccordionBox.ts b/js/bar-magnet/view/BarMagnetDeveloperAccordionBox.ts
@@ -7,10 +7,10 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 import { VBox } from '../../../../scenery/js/imports.js';
-import FELDeveloperAccordionBox from '../../common/view/FELDeveloperAccordionBox.js';
 import BarMagnet from '../../common/model/BarMagnet.js';
+import FELDeveloperAccordionBox from '../../common/view/FELDeveloperAccordionBox.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 
 export default class BarMagnetDeveloperAccordionBox extends FELDeveloperAccordionBox {
 

diff --git a/js/bar-magnet/view/BarMagnetPanels.ts b/js/bar-magnet/view/BarMagnetPanels.ts
@@ -6,15 +6,15 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
+import Property from '../../../../axon/js/Property.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import { Node } from '../../../../scenery/js/imports.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
 import BarMagnetPanel from '../../common/view/BarMagnetPanel.js';
-import ToolsPanel from '../../common/view/ToolsPanel.js';
 import FELPanels from '../../common/view/FELPanels.js';
-import { Node } from '../../../../scenery/js/imports.js';
+import ToolsPanel from '../../common/view/ToolsPanel.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 import BarMagnetScreenModel from '../model/BarMagnetScreenModel.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import Property from '../../../../axon/js/Property.js';
 
 export default class BarMagnetPanels extends FELPanels {
 

diff --git a/js/bar-magnet/view/BarMagnetScreenView.ts b/js/bar-magnet/view/BarMagnetScreenView.ts
@@ -6,19 +6,19 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
-import BarMagnetScreenModel from '../model/BarMagnetScreenModel.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
 import { Node } from '../../../../scenery/js/imports.js';
-import BarMagnetViewProperties from './BarMagnetViewProperties.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
+import FELQueryParameters from '../../common/FELQueryParameters.js';
+import FELPreferences from '../../common/model/FELPreferences.js';
 import BarMagnetNode from '../../common/view/BarMagnetNode.js';
 import EarthNode from '../../common/view/EarthNode.js';
-import BarMagnetDeveloperAccordionBox from './BarMagnetDeveloperAccordionBox.js';
-import BarMagnetPanels from './BarMagnetPanels.js';
 import FELScreenView from '../../common/view/FELScreenView.js';
-import FELQueryParameters from '../../common/FELQueryParameters.js';
 import FieldPositionsNode from '../../common/view/FieldPositionsNode.js';
-import FELPreferences from '../../common/model/FELPreferences.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
+import BarMagnetScreenModel from '../model/BarMagnetScreenModel.js';
+import BarMagnetDeveloperAccordionBox from './BarMagnetDeveloperAccordionBox.js';
+import BarMagnetPanels from './BarMagnetPanels.js';
+import BarMagnetViewProperties from './BarMagnetViewProperties.js';
 
 export default class BarMagnetScreenView extends FELScreenView {
 

diff --git a/js/bar-magnet/view/BarMagnetViewProperties.ts b/js/bar-magnet/view/BarMagnetViewProperties.ts
@@ -6,10 +6,10 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import Property from '../../../../axon/js/Property.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 
 export default class BarMagnetViewProperties {
 

diff --git a/js/common/FELColors.ts b/js/common/FELColors.ts
@@ -12,9 +12,9 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import PhetColorScheme from '../../../scenery-phet/js/PhetColorScheme.js';
 import { Color, ProfileColorProperty } from '../../../scenery/js/imports.js';
 import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
-import PhetColorScheme from '../../../scenery-phet/js/PhetColorScheme.js';
 
 const PANEL_FILL_PROJECTOR = new Color( 222, 234, 255 );
 const BAR_MAGNET_NORTH_COLOR = 'rgb( 219, 30, 34 )';

diff --git a/js/common/FELConstants.ts b/js/common/FELConstants.ts
@@ -6,21 +6,21 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
-import { ScreenOptions } from '../../../joist/js/Screen.js';
-import FELColors from './FELColors.js';
+import Dimension2 from '../../../dot/js/Dimension2.js';
+import Range from '../../../dot/js/Range.js';
 import { CreditsData } from '../../../joist/js/CreditsNode.js';
-import { PanelOptions } from '../../../sun/js/Panel.js';
+import { PreferencesControlOptions } from '../../../joist/js/preferences/PreferencesControl.js';
+import { ScreenOptions } from '../../../joist/js/Screen.js';
+import NumberControl, { NumberControlOptions } from '../../../scenery-phet/js/NumberControl.js';
 import PhetFont from '../../../scenery-phet/js/PhetFont.js';
-import { CheckboxOptions } from '../../../sun/js/Checkbox.js';
 import { RichTextOptions, Text, TextOptions, VBoxOptions } from '../../../scenery/js/imports.js';
-import NumberControl, { NumberControlOptions } from '../../../scenery-phet/js/NumberControl.js';
-import Dimension2 from '../../../dot/js/Dimension2.js';
 import { RectangularRadioButtonOptions } from '../../../sun/js/buttons/RectangularRadioButton.js';
+import { CheckboxOptions } from '../../../sun/js/Checkbox.js';
+import { PanelOptions } from '../../../sun/js/Panel.js';
 import { SliderOptions } from '../../../sun/js/Slider.js';
 import Tandem from '../../../tandem/js/Tandem.js';
-import Range from '../../../dot/js/Range.js';
-import { PreferencesControlOptions } from '../../../joist/js/preferences/PreferencesControl.js';
+import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
+import FELColors from './FELColors.js';
 
 // Credits are shared by all sims in this family.
 const CREDITS: CreditsData = {

diff --git a/js/common/FELSim.ts b/js/common/FELSim.ts
@@ -6,19 +6,19 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
-import Sim from '../../../joist/js/Sim.js';
 import TReadOnlyProperty from '../../../axon/js/TReadOnlyProperty.js';
-import FELConstants from './FELConstants.js';
 import PreferencesModel from '../../../joist/js/preferences/PreferencesModel.js';
-import FELPreferencesNode from './view/preferences/FELPreferencesNode.js';
+import Sim from '../../../joist/js/Sim.js';
+import platform from '../../../phet-core/js/platform.js';
 import BarMagnetScreen from '../bar-magnet/BarMagnetScreen.js';
-import PickupCoilScreen from '../pickup-coil/PickupCoilScreen.js';
 import ElectromagnetScreen from '../electromagnet/ElectromagnetScreen.js';
-import TransformerScreen from '../transformer/TransformerScreen.js';
+import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
 import GeneratorScreen from '../generator/GeneratorScreen.js';
+import PickupCoilScreen from '../pickup-coil/PickupCoilScreen.js';
+import TransformerScreen from '../transformer/TransformerScreen.js';
+import FELConstants from './FELConstants.js';
 import FELPreferences from './model/FELPreferences.js';
-import platform from '../../../phet-core/js/platform.js';
+import FELPreferencesNode from './view/preferences/FELPreferencesNode.js';
 
 type FELScreen = BarMagnetScreen | PickupCoilScreen | ElectromagnetScreen | TransformerScreen | GeneratorScreen;
 

diff --git a/js/common/FELUtils.ts b/js/common/FELUtils.ts
@@ -6,8 +6,8 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
 import Utils from '../../../dot/js/Utils.js';
+import faradaysElectromagneticLab from '../faradaysElectromagneticLab.js';
 
 const FELUtils = {
 

diff --git a/js/common/model/ACPowerSupply.ts b/js/common/model/ACPowerSupply.ts
@@ -9,16 +9,16 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Tandem from '../../../../tandem/js/Tandem.js';
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
-import CurrentSource from './CurrentSource.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
+import Multilink from '../../../../axon/js/Multilink.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Range from '../../../../dot/js/Range.js';
-import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import NumberIO from '../../../../tandem/js/types/NumberIO.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 import ConstantDtClock from './ConstantDtClock.js';
-import Multilink from '../../../../axon/js/Multilink.js';
+import CurrentSource from './CurrentSource.js';
 
 const MAX_VOLTAGE_RANGE = new Range( 0, 110 ); // V
 const MAX_VOLTAGE_PERCENT_RANGE = new Range( 0, 100 ); // %

diff --git a/js/common/model/BarMagnet.ts b/js/common/model/BarMagnet.ts
@@ -9,19 +9,19 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
-import Magnet, { MagnetOptions } from './Magnet.js';
-import BarMagnetFieldData from './BarMagnetFieldData.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
-import BarMagnetFieldGrid from './BarMagnetFieldGrid.js';
-import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
+import Dimension3 from '../../../../dot/js/Dimension3.js';
 import Range from '../../../../dot/js/Range.js';
-import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
-import NumberIO from '../../../../tandem/js/types/NumberIO.js';
+import Vector2 from '../../../../dot/js/Vector2.js';
+import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import WithOptional from '../../../../phet-core/js/types/WithOptional.js';
+import NumberIO from '../../../../tandem/js/types/NumberIO.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 import FELConstants from '../FELConstants.js';
-import Dimension3 from '../../../../dot/js/Dimension3.js';
+import BarMagnetFieldData from './BarMagnetFieldData.js';
+import BarMagnetFieldGrid from './BarMagnetFieldGrid.js';
+import Magnet, { MagnetOptions } from './Magnet.js';
 
 const DEFAULT_SIZE = new Dimension3( 250, 50, 50 );
 const STRENGTH_RANGE = FELConstants.MAGNET_STRENGTH_RANGE; // G

diff --git a/js/common/model/BarMagnetFieldData.ts b/js/common/model/BarMagnetFieldData.ts
@@ -10,8 +10,8 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 import Dimension2 from '../../../../dot/js/Dimension2.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 
 const BarMagnetFieldData = {
 

diff --git a/js/common/model/ChargedParticle.ts b/js/common/model/ChargedParticle.ts
@@ -16,16 +16,16 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
-import CoilSegment from './CoilSegment.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Range from '../../../../dot/js/Range.js';
+import Utils from '../../../../dot/js/Utils.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 import FELConstants from '../FELConstants.js';
-import Utils from '../../../../dot/js/Utils.js';
-import ConstantDtClock from './ConstantDtClock.js';
-import { CoilLayer } from './Coil.js';
 import { CurrentFlow } from '../FELQueryParameters.js';
+import { CoilLayer } from './Coil.js';
+import CoilSegment from './CoilSegment.js';
+import ConstantDtClock from './ConstantDtClock.js';
 
 // Maximum distance along a coil segment that can be traveled in one clock tick.
 const MAX_COIL_SEGMENT_POSITION_DELTA = 0.15;

diff --git a/js/common/model/Coil.ts b/js/common/model/Coil.ts
@@ -17,27 +17,27 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import RangeWithValue from '../../../../dot/js/RangeWithValue.js';
-import Range from '../../../../dot/js/Range.js';
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
+import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
+import Emitter from '../../../../axon/js/Emitter.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
+import Property from '../../../../axon/js/Property.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import Range from '../../../../dot/js/Range.js';
+import RangeWithValue from '../../../../dot/js/RangeWithValue.js';
+import Vector2 from '../../../../dot/js/Vector2.js';
 import optionize from '../../../../phet-core/js/optionize.js';
-import Property from '../../../../axon/js/Property.js';
-import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
-import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
-import NumberIO from '../../../../tandem/js/types/NumberIO.js';
-import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
-import FELConstants from '../FELConstants.js';
-import CoilSegment from './CoilSegment.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
 import { LinearGradient, TColor } from '../../../../scenery/js/imports.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 faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 import FELColors from '../FELColors.js';
-import ChargedParticle from './ChargedParticle.js';
-import Emitter from '../../../../axon/js/Emitter.js';
+import FELConstants from '../FELConstants.js';
 import { CurrentFlow } from '../FELQueryParameters.js';
+import ChargedParticle from './ChargedParticle.js';
+import CoilSegment from './CoilSegment.js';
 
 // Spacing between the centers of charges in the coil.
 const CHARGE_SPACING = 25;

diff --git a/js/common/model/CoilMagnet.ts b/js/common/model/CoilMagnet.ts
@@ -13,15 +13,15 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
-import Magnet, { MagnetOptions } from './Magnet.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import Dimension3 from '../../../../dot/js/Dimension3.js';
 import Range from '../../../../dot/js/Range.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
-import Coil from './Coil.js';
 import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
-import Dimension3 from '../../../../dot/js/Dimension3.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
+import Coil from './Coil.js';
+import Magnet, { MagnetOptions } from './Magnet.js';
 
 type SelfOptions = EmptySelfOptions;
 

diff --git a/js/common/model/CoilSegment.ts b/js/common/model/CoilSegment.ts
@@ -9,13 +9,13 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
-import { PathOptions, TPaint } from '../../../../scenery/js/imports.js';
-import QuadraticBezierSpline from './QuadraticBezierSpline.js';
-import optionize from '../../../../phet-core/js/optionize.js';
-import { CoilLayer } from './Coil.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import { Shape } from '../../../../kite/js/imports.js';
+import optionize from '../../../../phet-core/js/optionize.js';
+import { PathOptions, TPaint } from '../../../../scenery/js/imports.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
+import { CoilLayer } from './Coil.js';
+import QuadraticBezierSpline from './QuadraticBezierSpline.js';
 
 type SelfOptions = {
   stroke: TPaint;

diff --git a/js/common/model/Compass.ts b/js/common/model/Compass.ts
@@ -8,16 +8,16 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
-import Property from '../../../../axon/js/Property.js';
+import Multilink from '../../../../axon/js/Multilink.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
-import Magnet from './Magnet.js';
+import Property from '../../../../axon/js/Property.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import Vector2 from '../../../../dot/js/Vector2.js';
 import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
-import Multilink from '../../../../axon/js/Multilink.js';
-import FieldMeasurementTool, { FieldMeasurementToolOptions } from './FieldMeasurementTool.js';
+import faradaysElectromagneticLab from '../../faradaysElectromagneticLab.js';
 import ConstantDtClock from './ConstantDtClock.js';
+import FieldMeasurementTool, { FieldMeasurementToolOptions } from './FieldMeasurementTool.js';
+import Magnet from './Magnet.js';
 
 type SelfOptions = EmptySelfOptions;