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

phetsims · Nov 27, 2024 · a859a81 · a859a81
1 parent e8a3550
commit a859a81
Show file tree

Hide file tree

Showing 50 changed files with 297 additions and 297 deletions.
diff --git a/js/quadrilateral/QuadrilateralScreen.ts b/js/quadrilateral/QuadrilateralScreen.ts
@@ -6,13 +6,13 @@
  */
 
 import Screen, { ScreenOptions } from '../../../joist/js/Screen.js';
-import QuadrilateralColors from '../QuadrilateralColors.js';
+import optionize, { EmptySelfOptions } from '../../../phet-core/js/optionize.js';
 import quadrilateral from '../quadrilateral.js';
+import QuadrilateralColors from '../QuadrilateralColors.js';
 import QuadrilateralModel from './model/QuadrilateralModel.js';
-import QuadrilateralScreenView from './view/QuadrilateralScreenView.js';
 import QuadrilateralOptionsModel from './model/QuadrilateralOptionsModel.js';
-import optionize, { EmptySelfOptions } from '../../../phet-core/js/optionize.js';
 import QuadrilateralKeyboardHelpContent from './view/QuadrilateralKeyboardHelpContent.js';
+import QuadrilateralScreenView from './view/QuadrilateralScreenView.js';
 
 export default class QuadrilateralScreen extends Screen<QuadrilateralModel, QuadrilateralScreenView> {
   public constructor( optionsModel: QuadrilateralOptionsModel, providedOptions: ScreenOptions ) {

diff --git a/js/quadrilateral/model/ParallelSideChecker.ts b/js/quadrilateral/model/ParallelSideChecker.ts
@@ -8,14 +8,14 @@
  */
 
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
-import { TReadOnlyEmitter } from '../../../../axon/js/TEmitter.js';
 import Property from '../../../../axon/js/Property.js';
+import { TReadOnlyEmitter } from '../../../../axon/js/TEmitter.js';
 import Utils from '../../../../dot/js/Utils.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
 import quadrilateral from '../../quadrilateral.js';
 import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js';
-import QuadrilateralSidePair from './QuadrilateralSidePair.js';
 import QuadrilateralShapeModel from './QuadrilateralShapeModel.js';
+import QuadrilateralSidePair from './QuadrilateralSidePair.js';
 
 export default class ParallelSideChecker {
 

diff --git a/js/quadrilateral/model/QuadrilateralModel.ts b/js/quadrilateral/model/QuadrilateralModel.ts
@@ -9,21 +9,21 @@
  */
 
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
-import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js';
-import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from './QuadrilateralShapeModel.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
-import Utils from '../../../../dot/js/Utils.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import QuadrilateralOptionsModel from './QuadrilateralOptionsModel.js';
-import TProperty from '../../../../axon/js/TProperty.js';
-import Emitter from '../../../../axon/js/Emitter.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
+import Emitter from '../../../../axon/js/Emitter.js';
+import TProperty from '../../../../axon/js/TProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import Utils from '../../../../dot/js/Utils.js';
+import Vector2 from '../../../../dot/js/Vector2.js';
+import TModel from '../../../../joist/js/TModel.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import quadrilateral from '../../quadrilateral.js';
 import QuadrilateralConstants from '../../QuadrilateralConstants.js';
+import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js';
 import TangibleConnectionModel from './prototype/TangibleConnectionModel.js';
+import QuadrilateralOptionsModel from './QuadrilateralOptionsModel.js';
+import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from './QuadrilateralShapeModel.js';
 import QuadrilateralVisibilityModel from './QuadrilateralVisibilityModel.js';
-import TModel from '../../../../joist/js/TModel.js';
 
 export default class QuadrilateralModel implements TModel {
 

diff --git a/js/quadrilateral/model/QuadrilateralOptionsModel.ts b/js/quadrilateral/model/QuadrilateralOptionsModel.ts
@@ -8,8 +8,8 @@
  */
 
 import quadrilateral from '../../quadrilateral.js';
-import QuadrilateralSoundOptionsModel from './QuadrilateralSoundOptionsModel.js';
 import QuadrilateralTangibleOptionsModel from './prototype/QuadrilateralTangibleOptionsModel.js';
+import QuadrilateralSoundOptionsModel from './QuadrilateralSoundOptionsModel.js';
 
 export default class QuadrilateralOptionsModel {
   public readonly soundOptionsModel = new QuadrilateralSoundOptionsModel();

diff --git a/js/quadrilateral/model/QuadrilateralShapeDetector.ts b/js/quadrilateral/model/QuadrilateralShapeDetector.ts
@@ -11,8 +11,8 @@
  */
 
 import quadrilateral from '../../quadrilateral.js';
-import QuadrilateralShapeModel from './QuadrilateralShapeModel.js';
 import NamedQuadrilateral from './NamedQuadrilateral.js';
+import QuadrilateralShapeModel from './QuadrilateralShapeModel.js';
 
 // Set up the bits for each shape property.
 const CONCAVE_ANGLE = ( shapeModel: QuadrilateralShapeModel ) => _.some( shapeModel.vertices, vertex => vertex.angleProperty.value! > Math.PI );

diff --git a/js/quadrilateral/model/QuadrilateralShapeDetectorTests.ts b/js/quadrilateral/model/QuadrilateralShapeDetectorTests.ts
@@ -8,10 +8,10 @@
 
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
+import Vector2 from '../../../../dot/js/Vector2.js';
+import NamedQuadrilateral from './NamedQuadrilateral.js';
 import QuadrilateralShapeDetector from './QuadrilateralShapeDetector.js';
 import QuadrilateralShapeModel from './QuadrilateralShapeModel.js';
-import NamedQuadrilateral from './NamedQuadrilateral.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
 import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js';
 
 QUnit.module( 'BooleanProperty' );

diff --git a/js/quadrilateral/model/QuadrilateralShapeModel.ts b/js/quadrilateral/model/QuadrilateralShapeModel.ts
@@ -8,32 +8,32 @@
  * @author Jesse Greenberg (PhET Interactive Simulations)
  */
 
-import Property from '../../../../axon/js/Property.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
-import quadrilateral from '../../quadrilateral.js';
-import NamedQuadrilateral from './NamedQuadrilateral.js';
-import QuadrilateralSide from './QuadrilateralSide.js';
-import QuadrilateralVertex from './QuadrilateralVertex.js';
-import Utils from '../../../../dot/js/Utils.js';
 import Emitter from '../../../../axon/js/Emitter.js';
+import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js';
+import Multilink from '../../../../axon/js/Multilink.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
-import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js';
-import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js';
+import Property from '../../../../axon/js/Property.js';
+import TEmitter from '../../../../axon/js/TEmitter.js';
+import TProperty from '../../../../axon/js/TProperty.js';
+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 { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
+import quadrilateral from '../../quadrilateral.js';
+import QuadrilateralConstants from '../../QuadrilateralConstants.js';
+import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js';
+import NamedQuadrilateral from './NamedQuadrilateral.js';
 import ParallelSideChecker from './ParallelSideChecker.js';
-import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js';
-import TProperty from '../../../../axon/js/TProperty.js';
-import Multilink from '../../../../axon/js/Multilink.js';
-import TEmitter from '../../../../axon/js/TEmitter.js';
 import QuadrilateralShapeDetector from './QuadrilateralShapeDetector.js';
+import QuadrilateralSide from './QuadrilateralSide.js';
+import QuadrilateralSideLabel from './QuadrilateralSideLabel.js';
 import QuadrilateralSidePair from './QuadrilateralSidePair.js';
-import QuadrilateralVertexPair from './QuadrilateralVertexPair.js';
 import QuadrilateralUtils from './QuadrilateralUtils.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import QuadrilateralSideLabel from './QuadrilateralSideLabel.js';
-import QuadrilateralConstants from '../../QuadrilateralConstants.js';
-import { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
+import QuadrilateralVertex from './QuadrilateralVertex.js';
+import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js';
+import QuadrilateralVertexPair from './QuadrilateralVertexPair.js';
 
 // Used when verifying that QuadrilateralVertex positions are valid before setting to the model.
 export type VertexLabelToProposedPositionMap = Map<QuadrilateralVertexLabel, Vector2>;

diff --git a/js/quadrilateral/model/QuadrilateralShapeSnapshot.ts b/js/quadrilateral/model/QuadrilateralShapeSnapshot.ts
@@ -10,12 +10,12 @@
  * @author Jesse Greenberg (PhET Interactive Simulations)
  */
 
-import quadrilateral from '../../quadrilateral.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
+import quadrilateral from '../../quadrilateral.js';
+import NamedQuadrilateral from './NamedQuadrilateral.js';
 import QuadrilateralShapeModel from './QuadrilateralShapeModel.js';
 import QuadrilateralSideLabel from './QuadrilateralSideLabel.js';
 import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js';
-import NamedQuadrilateral from './NamedQuadrilateral.js';
 
 export default class QuadrilateralShapeSnapshot {
   public readonly isParallelogram: boolean;

diff --git a/js/quadrilateral/model/QuadrilateralSide.ts b/js/quadrilateral/model/QuadrilateralSide.ts
@@ -6,17 +6,17 @@
  * @author Jesse Greenberg (PhET Interactive Simulations)
  */
 
+import NumberProperty from '../../../../axon/js/NumberProperty.js';
+import Property from '../../../../axon/js/Property.js';
+import TProperty from '../../../../axon/js/TProperty.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
+import { Line as LineShape, Shape } from '../../../../kite/js/imports.js';
+import { Line } from '../../../../scenery/js/imports.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
 import quadrilateral from '../../quadrilateral.js';
-import QuadrilateralVertex from './QuadrilateralVertex.js';
-import { Line } from '../../../../scenery/js/imports.js';
-import { Line as LineShape, Shape } from '../../../../kite/js/imports.js';
-import NumberProperty from '../../../../axon/js/NumberProperty.js';
-import QuadrilateralSideLabel from './QuadrilateralSideLabel.js';
 import QuadrilateralMovable from './QuadrilateralMovable.js';
-import Property from '../../../../axon/js/Property.js';
-import TProperty from '../../../../axon/js/TProperty.js';
+import QuadrilateralSideLabel from './QuadrilateralSideLabel.js';
+import QuadrilateralVertex from './QuadrilateralVertex.js';
 
 export default class QuadrilateralSide extends QuadrilateralMovable {
 

diff --git a/js/quadrilateral/model/QuadrilateralSoundOptionsModel.ts b/js/quadrilateral/model/QuadrilateralSoundOptionsModel.ts
@@ -7,11 +7,11 @@
  * @author Jesse Greenberg (PhET Interactive Simulations)
  */
 
-import quadrilateral from '../../quadrilateral.js';
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js';
-import EnumerationValue from '../../../../phet-core/js/EnumerationValue.js';
 import Enumeration from '../../../../phet-core/js/Enumeration.js';
+import EnumerationValue from '../../../../phet-core/js/EnumerationValue.js';
+import quadrilateral from '../../quadrilateral.js';
 import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js';
 
 // Enumeration for the different sound designs available to the user.

diff --git a/js/quadrilateral/model/QuadrilateralVertex.ts b/js/quadrilateral/model/QuadrilateralVertex.ts
@@ -6,21 +6,21 @@
  * @author Jesse Greenberg
  */
 
+import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import Property from '../../../../axon/js/Property.js';
-import Vector2Property from '../../../../dot/js/Vector2Property.js';
-import quadrilateral from '../../quadrilateral.js';
-import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Bounds2 from '../../../../dot/js/Bounds2.js';
-import Tandem from '../../../../tandem/js/Tandem.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
+import Vector2Property from '../../../../dot/js/Vector2Property.js';
 import { Shape } from '../../../../kite/js/imports.js';
-import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.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 QuadrilateralMovable from './QuadrilateralMovable.js';
+import quadrilateral from '../../quadrilateral.js';
 import QuadrilateralConstants from '../../QuadrilateralConstants.js';
+import QuadrilateralMovable from './QuadrilateralMovable.js';
+import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js';
 
 const VERTEX_BOUNDS = new Bounds2( 0, 0, QuadrilateralConstants.VERTEX_WIDTH, QuadrilateralConstants.VERTEX_WIDTH );
 const HALF_WIDTH = VERTEX_BOUNDS.width / 2;

diff --git a/js/quadrilateral/model/prototype/QuadrilateralTangibleOptionsModel.ts b/js/quadrilateral/model/prototype/QuadrilateralTangibleOptionsModel.ts
@@ -7,12 +7,12 @@
  * @author Jesse Greenberg (PhET Interactive Simulations)
  */
 
+import BooleanProperty from '../../../../../axon/js/BooleanProperty.js';
 import NumberProperty from '../../../../../axon/js/NumberProperty.js';
-import quadrilateral from '../../../quadrilateral.js';
 import Range from '../../../../../dot/js/Range.js';
-import QuadrilateralQueryParameters from '../../QuadrilateralQueryParameters.js';
-import BooleanProperty from '../../../../../axon/js/BooleanProperty.js';
 import MediaPipeQueryParameters from '../../../../../tangible/js/mediaPipe/MediaPipeQueryParameters.js';
+import quadrilateral from '../../../quadrilateral.js';
+import QuadrilateralQueryParameters from '../../QuadrilateralQueryParameters.js';
 
 export default class QuadrilateralTangibleOptionsModel {
 

diff --git a/js/quadrilateral/model/prototype/TangibleConnectionModel.ts b/js/quadrilateral/model/prototype/TangibleConnectionModel.ts
@@ -27,9 +27,9 @@ import NullableIO from '../../../../../tandem/js/types/NullableIO.js';
 import quadrilateral from '../../../quadrilateral.js';
 import QuadrilateralConstants from '../../../QuadrilateralConstants.js';
 import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from '../QuadrilateralShapeModel.js';
-import QuadrilateralTangibleOptionsModel from './QuadrilateralTangibleOptionsModel.js';
-import MarkerDetectionModel from './MarkerDetectionModel.js';
 import QuadrilateralVertexLabel from '../QuadrilateralVertexLabel.js';
+import MarkerDetectionModel from './MarkerDetectionModel.js';
+import QuadrilateralTangibleOptionsModel from './QuadrilateralTangibleOptionsModel.js';
 
 export default class TangibleConnectionModel {
 

diff --git a/js/quadrilateral/view/CornerGuideNode.ts b/js/quadrilateral/view/CornerGuideNode.ts
@@ -13,18 +13,18 @@
  * @author Jesse Greenberg (PhET Interactive Simulations)
  */
 
-import quadrilateral from '../../quadrilateral.js';
-import { Node, Path } from '../../../../scenery/js/imports.js';
-import QuadrilateralVertex from '../model/QuadrilateralVertex.js';
+import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
+import Multilink from '../../../../axon/js/Multilink.js';
 import Utils from '../../../../dot/js/Utils.js';
+import Vector2 from '../../../../dot/js/Vector2.js';
 import { Line, Shape } from '../../../../kite/js/imports.js';
 import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
+import { Node, Path } from '../../../../scenery/js/imports.js';
+import quadrilateral from '../../quadrilateral.js';
 import QuadrilateralColors from '../../QuadrilateralColors.js';
-import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
-import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js';
-import Multilink from '../../../../axon/js/Multilink.js';
 import QuadrilateralConstants from '../../QuadrilateralConstants.js';
+import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js';
+import QuadrilateralVertex from '../model/QuadrilateralVertex.js';
 
 // constants
 // The size of each wedge of the angle guide, in radians

diff --git a/js/quadrilateral/view/MoveShapeHelpSection.ts b/js/quadrilateral/view/MoveShapeHelpSection.ts
@@ -9,9 +9,9 @@
 import KeyboardHelpIconFactory from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpIconFactory.js';
 import KeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpSection.js';
 import KeyboardHelpSectionRow from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpSectionRow.js';
+import { Text } from '../../../../scenery/js/imports.js';
 import quadrilateral from '../../quadrilateral.js';
 import QuadrilateralStrings from '../../QuadrilateralStrings.js';
-import { Text } from '../../../../scenery/js/imports.js';
 import QuadrilateralKeyboardHelpContent from './QuadrilateralKeyboardHelpContent.js';
 
 // constants - Voicing strings not translatable

diff --git a/js/quadrilateral/view/QuadrilateralAlerter.ts b/js/quadrilateral/view/QuadrilateralAlerter.ts
@@ -11,25 +11,25 @@
  * @author Jesse Greenberg (PhET Interactive Simulations)
  */
 
-import quadrilateral from '../../quadrilateral.js';
-import QuadrilateralModel from '../model/QuadrilateralModel.js';
-import Utterance from '../../../../utterance-queue/js/Utterance.js';
+import Utils from '../../../../dot/js/Utils.js';
+import Vector2 from '../../../../dot/js/Vector2.js';
+import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
+import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
 import Alerter from '../../../../scenery-phet/js/accessibility/describers/Alerter.js';
-import QuadrilateralScreenView from './QuadrilateralScreenView.js';
+import MovementAlerter from '../../../../scenery-phet/js/accessibility/describers/MovementAlerter.js';
 import { Voicing } from '../../../../scenery/js/imports.js';
 import ResponsePacket from '../../../../utterance-queue/js/ResponsePacket.js';
+import Utterance from '../../../../utterance-queue/js/Utterance.js';
+import quadrilateral from '../../quadrilateral.js';
 import QuadrilateralStrings from '../../QuadrilateralStrings.js';
+import NamedQuadrilateral from '../model/NamedQuadrilateral.js';
+import QuadrilateralModel from '../model/QuadrilateralModel.js';
+import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js';
 import QuadrilateralShapeSnapshot from '../model/QuadrilateralShapeSnapshot.js';
 import QuadrilateralSide from '../model/QuadrilateralSide.js';
-import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js';
-import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
-import MovementAlerter from '../../../../scenery-phet/js/accessibility/describers/MovementAlerter.js';
-import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
 import QuadrilateralVertex from '../model/QuadrilateralVertex.js';
-import Utils from '../../../../dot/js/Utils.js';
-import NamedQuadrilateral from '../model/NamedQuadrilateral.js';
 import QuadrilateralDescriber, { NullableQuadrilateralStringType } from './QuadrilateralDescriber.js';
-import Vector2 from '../../../../dot/js/Vector2.js';
+import QuadrilateralScreenView from './QuadrilateralScreenView.js';
 import QuadrilateralVertexDescriber from './QuadrilateralVertexDescriber.js';
 
 // constants - Voicing strings are not translatable so we just use the StringProperty initial value