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

phetsims · Nov 27, 2024 · 12cb28f · 12cb28f
1 parent 28e62bf
commit 12cb28f
Show file tree

Hide file tree

Showing 94 changed files with 263 additions and 263 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/FMWConstants.ts b/js/common/FMWConstants.ts
@@ -11,12 +11,12 @@ import Utils from '../../../dot/js/Utils.js';
 import { EraserButtonOptions } from '../../../scenery-phet/js/buttons/EraserButton.js';
 import { NumberControlOptions } from '../../../scenery-phet/js/NumberControl.js';
 import NumberDisplay from '../../../scenery-phet/js/NumberDisplay.js';
+import PhetFont from '../../../scenery-phet/js/PhetFont.js';
+import { Node, VBox } from '../../../scenery/js/imports.js';
 import ArrowButton from '../../../sun/js/buttons/ArrowButton.js';
 import { CheckboxOptions } from '../../../sun/js/Checkbox.js';
 import { PanelOptions } from '../../../sun/js/Panel.js';
 import Slider from '../../../sun/js/Slider.js';
-import PhetFont from '../../../scenery-phet/js/PhetFont.js';
-import { Node, VBox } from '../../../scenery/js/imports.js';
 import fourierMakingWaves from '../fourierMakingWaves.js';
 import FMWColors from './FMWColors.js';
 

diff --git a/js/common/FMWDerivedStrings.ts b/js/common/FMWDerivedStrings.ts
@@ -6,12 +6,12 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import fourierMakingWaves from '../fourierMakingWaves.js';
-import FMWSymbols from './FMWSymbols.js';
 import PatternStringProperty from '../../../axon/js/PatternStringProperty.js';
-import FourierMakingWavesStrings from '../FourierMakingWavesStrings.js';
 import StringProperty from '../../../axon/js/StringProperty.js';
 import Tandem from '../../../tandem/js/Tandem.js';
+import fourierMakingWaves from '../fourierMakingWaves.js';
+import FourierMakingWavesStrings from '../FourierMakingWavesStrings.js';
+import FMWSymbols from './FMWSymbols.js';
 
 const DERIVED_STRINGS_TANDEM = Tandem.getDerivedStringsTandem();
 

diff --git a/js/common/model/DomainChart.ts b/js/common/model/DomainChart.ts
@@ -7,8 +7,8 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
+import Disposable from '../../../../axon/js/Disposable.js';
 import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js';
 import Property from '../../../../axon/js/Property.js';
 import Tandem from '../../../../tandem/js/Tandem.js';

diff --git a/js/common/model/EmphasizedHarmonics.ts b/js/common/model/EmphasizedHarmonics.ts
@@ -15,8 +15,8 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import createObservableArray, { ObservableArray } from '../../../../axon/js/createObservableArray.js';
+import Disposable from '../../../../axon/js/Disposable.js';
 import { Node } from '../../../../scenery/js/imports.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import Harmonic from './Harmonic.js';

diff --git a/js/common/model/HarmonicsChart.ts b/js/common/model/HarmonicsChart.ts
@@ -16,10 +16,10 @@ import DiscreteAxisDescriptions from '../../discrete/model/DiscreteAxisDescripti
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FMWConstants from '../FMWConstants.js';
 import AxisDescription from './AxisDescription.js';
+import Domain from './Domain.js';
 import DomainChart from './DomainChart.js';
 import EmphasizedHarmonics from './EmphasizedHarmonics.js';
 import FourierSeries from './FourierSeries.js';
-import Domain from './Domain.js';
 import SeriesType from './SeriesType.js';
 
 export default class HarmonicsChart extends DomainChart {

diff --git a/js/common/model/InteractiveAmplitudesChart.ts b/js/common/model/InteractiveAmplitudesChart.ts
@@ -14,8 +14,8 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import Property from '../../../../axon/js/Property.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
-import FourierSeries from './FourierSeries.js';
 import EmphasizedHarmonics from './EmphasizedHarmonics.js';
+import FourierSeries from './FourierSeries.js';
 
 export default class InteractiveAmplitudesChart {
 

diff --git a/js/common/model/SumChart.ts b/js/common/model/SumChart.ts
@@ -16,9 +16,9 @@ import Tandem from '../../../../tandem/js/Tandem.js';
 import DiscreteAxisDescriptions from '../../discrete/model/DiscreteAxisDescriptions.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import AxisDescription from './AxisDescription.js';
+import Domain from './Domain.js';
 import DomainChart from './DomainChart.js';
 import FourierSeries from './FourierSeries.js';
-import Domain from './Domain.js';
 import SeriesType from './SeriesType.js';
 
 export default class SumChart extends DomainChart {

diff --git a/js/common/view/AmplitudeKeypadDialog.ts b/js/common/view/AmplitudeKeypadDialog.ts
@@ -7,27 +7,27 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
 import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import Bounds2 from '../../../../dot/js/Bounds2.js';
 import Range from '../../../../dot/js/Range.js';
 import Utils from '../../../../dot/js/Utils.js';
+import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
+import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import Keypad from '../../../../scenery-phet/js/keypad/Keypad.js';
 import PhetColorScheme from '../../../../scenery-phet/js/PhetColorScheme.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import { Node, NodeOptions, Rectangle, RectangleOptions, RichText, RichTextOptions, Text, TPaint, VBox } from '../../../../scenery/js/imports.js';
 import RectangularPushButton from '../../../../sun/js/buttons/RectangularPushButton.js';
 import Dialog, { DialogOptions } from '../../../../sun/js/Dialog.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js';
 import FMWConstants from '../FMWConstants.js';
 import FMWSymbols from '../FMWSymbols.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js';
-import Bounds2 from '../../../../dot/js/Bounds2.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
-import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 
 // constants
 const TITLE_FONT = new PhetFont( 18 );

diff --git a/js/common/view/AmplitudeNumberDisplay.ts b/js/common/view/AmplitudeNumberDisplay.ts
@@ -8,22 +8,22 @@
  */
 
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
+import optionize from '../../../../phet-core/js/optionize.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
+import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import NumberDisplay, { NumberDisplayOptions } from '../../../../scenery-phet/js/NumberDisplay.js';
 import PhetColorScheme from '../../../../scenery-phet/js/PhetColorScheme.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import { InteractiveHighlighting, NodeTranslationOptions, PressListener, RichText, VBox, VBoxOptions } from '../../../../scenery/js/imports.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FMWConstants from '../FMWConstants.js';
 import FMWQueryParameters from '../FMWQueryParameters.js';
 import FMWSymbols from '../FMWSymbols.js';
 import EmphasizedHarmonics from '../model/EmphasizedHarmonics.js';
 import Harmonic from '../model/Harmonic.js';
 import AmplitudeKeypadDialog from './AmplitudeKeypadDialog.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import optionize from '../../../../phet-core/js/optionize.js';
-import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
-import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
 
 // constants
 const DEFAULT_FONT = new PhetFont( 14 );

diff --git a/js/common/view/AmplitudeSlider.ts b/js/common/view/AmplitudeSlider.ts
@@ -9,11 +9,15 @@
 
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Dimension2 from '../../../../dot/js/Dimension2.js';
 import Range from '../../../../dot/js/Range.js';
 import Utils from '../../../../dot/js/Utils.js';
 import { Shape } from '../../../../kite/js/imports.js';
+import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import Orientation from '../../../../phet-core/js/Orientation.js';
+import PickOptional from '../../../../phet-core/js/types/PickOptional.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import { Color, Node, NodeTranslationOptions, Path, PressListener, Rectangle } from '../../../../scenery/js/imports.js';
 import Slider, { SliderOptions } from '../../../../sun/js/Slider.js';
 import SliderTrack, { SliderTrackOptions } from '../../../../sun/js/SliderTrack.js';
@@ -22,10 +26,6 @@ import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FMWConstants from '../FMWConstants.js';
 import EmphasizedHarmonics from '../model/EmphasizedHarmonics.js';
 import Harmonic from '../model/Harmonic.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import PickOptional from '../../../../phet-core/js/types/PickOptional.js';
 
 // constants
 const TRACK_WIDTH = 40; // track height is specified in constructor options

diff --git a/js/common/view/CalipersNode.ts b/js/common/view/CalipersNode.ts
@@ -9,12 +9,12 @@
  */
 
 import { Shape } from '../../../../kite/js/imports.js';
+import optionize from '../../../../phet-core/js/optionize.js';
+import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import BackgroundNode, { BackgroundNodeOptions } from '../../../../scenery-phet/js/BackgroundNode.js';
 import { Node, NodeOptions, Path, PathOptions, Rectangle, RichText, RichTextOptions, TPaint } from '../../../../scenery/js/imports.js';
 import FMWConstants from '../../common/FMWConstants.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
-import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
-import optionize from '../../../../phet-core/js/optionize.js';
 
 // These constants determine the shape of the beam and jaws.
 const BEAM_THICKNESS = 5;

diff --git a/js/common/view/DomainChartNode.ts b/js/common/view/DomainChartNode.ts
@@ -12,7 +12,10 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 import Multilink from '../../../../axon/js/Multilink.js';
+import NumberProperty from '../../../../axon/js/NumberProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import AxisLine, { AxisLineOptions } from '../../../../bamboo/js/AxisLine.js';
 import ChartRectangle, { ChartRectangleOptions } from '../../../../bamboo/js/ChartRectangle.js';
 import ChartTransform, { ChartTransformOptions } from '../../../../bamboo/js/ChartTransform.js';
@@ -22,23 +25,20 @@ import TickMarkSet, { TickMarkSetOptions } from '../../../../bamboo/js/TickMarkS
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import Range from '../../../../dot/js/Range.js';
 import { Shape } from '../../../../kite/js/imports.js';
+import optionize from '../../../../phet-core/js/optionize.js';
 import Orientation from '../../../../phet-core/js/Orientation.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
+import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import PlusMinusZoomButtonGroup from '../../../../scenery-phet/js/PlusMinusZoomButtonGroup.js';
 import { Node, NodeOptions, RichText, RichTextOptions } from '../../../../scenery/js/imports.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js';
 import FMWColors from '../FMWColors.js';
 import FMWConstants from '../FMWConstants.js';
+import FMWDerivedStrings from '../FMWDerivedStrings.js';
 import Domain from '../model/Domain.js';
 import DomainChart from '../model/DomainChart.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import NumberProperty from '../../../../axon/js/NumberProperty.js';
-import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
-import optionize from '../../../../phet-core/js/optionize.js';
-import FMWDerivedStrings from '../FMWDerivedStrings.js';
-import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
 
 const DEFAULT_EDGE = 'min';
 

diff --git a/js/common/view/DomainComboBox.ts b/js/common/view/DomainComboBox.ts
@@ -7,13 +7,13 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import Property from '../../../../axon/js/Property.js';
 import { Node } from '../../../../scenery/js/imports.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
+import FMWDerivedStrings from '../FMWDerivedStrings.js';
 import Domain from '../model/Domain.js';
 import FMWComboBox, { FMWComboBoxChoice } from './FMWComboBox.js';
-import Property from '../../../../axon/js/Property.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
-import FMWDerivedStrings from '../FMWDerivedStrings.js';
 
 // This format is specific to FMWComboBox.
 const CHOICES: FMWComboBoxChoice<Domain>[] = [

diff --git a/js/common/view/EquationMarkup.ts b/js/common/view/EquationMarkup.ts
@@ -7,13 +7,13 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js';
 import EquationForm from '../../discrete/model/EquationForm.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FMWSymbols from '../FMWSymbols.js';
 import Domain from '../model/Domain.js';
 import SeriesType from '../model/SeriesType.js';
-import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 
 // constants
 const HIDDEN_STRING = ''; // string for EquationForm.HIDDEN

diff --git a/js/common/view/FMWComboBox.ts b/js/common/view/FMWComboBox.ts
@@ -9,13 +9,13 @@
  */
 
 import Property from '../../../../axon/js/Property.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import optionize from '../../../../phet-core/js/optionize.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import { Node, RichText, RichTextOptions } from '../../../../scenery/js/imports.js';
 import ComboBox, { ComboBoxItem, ComboBoxOptions } from '../../../../sun/js/ComboBox.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FMWConstants from '../FMWConstants.js';
-import optionize from '../../../../phet-core/js/optionize.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 type SelfOptions = {
   textOptions?: RichTextOptions;

diff --git a/js/common/view/FMWIconFactory.ts b/js/common/view/FMWIconFactory.ts
@@ -8,6 +8,8 @@
 
 import Range from '../../../../dot/js/Range.js';
 import ScreenIcon from '../../../../joist/js/ScreenIcon.js';
+import { combineOptions } from '../../../../phet-core/js/optionize.js';
+import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import { HBox, Image, Line, Node, NodeOptions, Rectangle, Text } from '../../../../scenery/js/imports.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
@@ -20,8 +22,6 @@ import FMWConstants from '../FMWConstants.js';
 import EmphasizedHarmonics from '../model/EmphasizedHarmonics.js';
 import Harmonic from '../model/Harmonic.js';
 import AmplitudeSlider from './AmplitudeSlider.js';
-import { combineOptions } from '../../../../phet-core/js/optionize.js';
-import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 
 const FMWIconFactory = {
 

diff --git a/js/common/view/HarmonicsChartNode.ts b/js/common/view/HarmonicsChartNode.ts
@@ -9,12 +9,12 @@
 
 import ChartCanvasNode from '../../../../bamboo/js/ChartCanvasNode.js';
 import { Shape } from '../../../../kite/js/imports.js';
+import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import { Color } from '../../../../scenery/js/imports.js';
 import HarmonicPlot from '../../discrete/view/HarmonicPlot.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import HarmonicsChart from '../model/HarmonicsChart.js';
 import DomainChartNode, { DomainChartNodeOptions } from './DomainChartNode.js';
-import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 
 // constants
 const NORMAL_LINE_WIDTH = 1;

diff --git a/js/common/view/InteractiveAmplitudesChartNode.ts b/js/common/view/InteractiveAmplitudesChartNode.ts
@@ -18,7 +18,10 @@ import GridLineSet from '../../../../bamboo/js/GridLineSet.js';
 import TickLabelSet from '../../../../bamboo/js/TickLabelSet.js';
 import Range from '../../../../dot/js/Range.js';
 import Utils from '../../../../dot/js/Utils.js';
+import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js';
 import Orientation from '../../../../phet-core/js/Orientation.js';
+import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
+import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import { Node, NodeOptions, RichText, Text } from '../../../../scenery/js/imports.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js';
@@ -29,9 +32,6 @@ import InteractiveAmplitudesChart from '../model/InteractiveAmplitudesChart.js';
 import AmplitudeKeypadDialog from './AmplitudeKeypadDialog.js';
 import AmplitudeNumberDisplay, { AmplitudeNumberDisplayOptions } from './AmplitudeNumberDisplay.js';
 import AmplitudeSlider, { AmplitudeSliderOptions } from './AmplitudeSlider.js';
-import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
-import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js';
 
 // constants
 const X_MARGIN = 0.5; // x-axis margins, in model coordinates

diff --git a/js/common/view/LabeledExpandCollapseButton.ts b/js/common/view/LabeledExpandCollapseButton.ts
@@ -6,16 +6,16 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import { FireListener, HBox, HBoxOptions, Text, TextOptions } from '../../../../scenery/js/imports.js';
-import ExpandCollapseButton from '../../../../sun/js/ExpandCollapseButton.js';
-import fourierMakingWaves from '../../fourierMakingWaves.js';
-import FMWConstants from '../FMWConstants.js';
+import Property from '../../../../axon/js/Property.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import Property from '../../../../axon/js/Property.js';
 import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
+import { FireListener, HBox, HBoxOptions, Text, TextOptions } from '../../../../scenery/js/imports.js';
+import ExpandCollapseButton from '../../../../sun/js/ExpandCollapseButton.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
+import fourierMakingWaves from '../../fourierMakingWaves.js';
+import FMWConstants from '../FMWConstants.js';
 
 type SelfOptions = {
   textOptions?: StrictOmit<TextOptions, 'tandem'>;