First step in cleaning up the Playground feature

RussellLVP · RussellLVP · commit 9f99a17dc2f0 · 2020-07-30T20:15:48.000+01:00
diff --git a/javascript/features/playground/command.js b/javascript/features/playground/command.js
@@ -1,10 +1,10 @@
-// Copyright 2016 Las Venturas Playground. All rights reserved.
+// Copyright 2020 Las Venturas Playground. All rights reserved.
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-// The Command class forms the base class of all commands that can be toggled with the `/lvp access`
-// command, and has knowledge of several common objects.
-class Command {
+// The Command class forms the base class of all the fun commands that are provided through the
+// commands/ directory in this feature.
+export class Command {
     constructor(announce, nuwani) {
         this.announce_ = announce;
         this.nuwani_ = nuwani;
@@ -29,5 +29,3 @@ class Command {
 
     dispose() {}
 }
-
-export default Command;
diff --git a/javascript/features/playground/commands/autohello.js b/javascript/features/playground/commands/autohello.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 // Minimum and maximum waits for a greet, in seconds.
diff --git a/javascript/features/playground/commands/autohello.test.js b/javascript/features/playground/commands/autohello.test.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import MockPlaygroundCommands from 'features/playground/test/mock_playground_commands.js';
+import { MockPlaygroundCommands } from 'features/playground/test/mock_playground_commands.js';
 
 describe('AutoHello', (it, beforeEach, afterEach) => {
     let commands = null;
diff --git a/javascript/features/playground/commands/boost.js b/javascript/features/playground/commands/boost.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 // Command: /boost [player] [factor]
diff --git a/javascript/features/playground/commands/engine.js b/javascript/features/playground/commands/engine.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 // Command: /engine [player]
diff --git a/javascript/features/playground/commands/fancy.js b/javascript/features/playground/commands/fancy.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 import { ScopedCallbacks } from 'base/scoped_callbacks.js';
 
diff --git a/javascript/features/playground/commands/fancy.test.js b/javascript/features/playground/commands/fancy.test.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import MockPlaygroundCommands from 'features/playground/test/mock_playground_commands.js';
+import { MockPlaygroundCommands } from 'features/playground/test/mock_playground_commands.js';
 
 describe('FancyCommand', (it, beforeEach, afterEach) => {
     let commands = null;
diff --git a/javascript/features/playground/commands/flap.js b/javascript/features/playground/commands/flap.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 import { random } from 'base/random.js';
diff --git a/javascript/features/playground/commands/fly.js b/javascript/features/playground/commands/fly.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 import { ScopedCallbacks } from 'base/scoped_callbacks.js';
 
diff --git a/javascript/features/playground/commands/indicators.js b/javascript/features/playground/commands/indicators.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 // Command: /indicators [player]
diff --git a/javascript/features/playground/commands/isolate.js b/javascript/features/playground/commands/isolate.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 import { ScopedCallbacks } from 'base/scoped_callbacks.js';
 
diff --git a/javascript/features/playground/commands/isolate.test.js b/javascript/features/playground/commands/isolate.test.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import MockPlaygroundCommands from 'features/playground/test/mock_playground_commands.js';
+import { MockPlaygroundCommands } from 'features/playground/test/mock_playground_commands.js';
 
 describe('Isolate', (it, beforeEach, afterEach) => {
     let commands = null;
diff --git a/javascript/features/playground/commands/jetpack.js b/javascript/features/playground/commands/jetpack.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 import { VirtualWorld } from 'entities/virtual_world.js';
 
diff --git a/javascript/features/playground/commands/jetpack.test.js b/javascript/features/playground/commands/jetpack.test.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import MockPlaygroundCommands from 'features/playground/test/mock_playground_commands.js';
+import { MockPlaygroundCommands } from 'features/playground/test/mock_playground_commands.js';
 import { VirtualWorld } from 'entities/virtual_world.js';
 
 describe('JetpackCommand', (it, beforeEach, afterEach) => {
diff --git a/javascript/features/playground/commands/kickflip.js b/javascript/features/playground/commands/kickflip.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 // Command: /kickflip [player]
diff --git a/javascript/features/playground/commands/lagcompmode.js b/javascript/features/playground/commands/lagcompmode.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 // Command: /lagcompmode [player] [0-2]?
diff --git a/javascript/features/playground/commands/player_settings.js b/javascript/features/playground/commands/player_settings.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { Menu } from 'components/menu/menu.js';
 import { MessageBox } from 'components/dialogs/message_box.js';
 
diff --git a/javascript/features/playground/commands/player_settings.test.js b/javascript/features/playground/commands/player_settings.test.js
@@ -3,7 +3,7 @@
 // be found in the LICENSE file.
 
 import { PlayerSetting } from 'entities/player_setting.js';
-import MockPlaygroundCommands from 'features/playground/test/mock_playground_commands.js';
+import { MockPlaygroundCommands } from 'features/playground/test/mock_playground_commands.js';
 
 describe('PlayerSettingsCommands', (it, beforeEach, afterEach) => {
     let commands = null;
diff --git a/javascript/features/playground/commands/rampcar.js b/javascript/features/playground/commands/rampcar.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 import { ScopedEntities } from 'entities/scoped_entities.js';
 
diff --git a/javascript/features/playground/commands/skipdamage.js b/javascript/features/playground/commands/skipdamage.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 // Command: /skipdamage [player]
diff --git a/javascript/features/playground/commands/slow.js b/javascript/features/playground/commands/slow.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 
 // Command: /slow [player]? [factor]
diff --git a/javascript/features/playground/playground.js b/javascript/features/playground/playground.js
@@ -3,14 +3,14 @@
 // be found in the LICENSE file.
 
 import { Feature } from 'components/feature_manager/feature.js';
-import PlaygroundAccessTracker from 'features/playground/playground_access_tracker.js';
-import PlaygroundCommands from 'features/playground/playground_commands.js';
-import PlaygroundManager from 'features/playground/playground_manager.js';
+import { PlaygroundAccessTracker } from 'features/playground/playground_access_tracker.js';
+import { PlaygroundCommands } from 'features/playground/playground_commands.js';
+import { PlaygroundManager } from 'features/playground/playground_manager.js';
 import { PlaygroundNuwaniCommands } from 'features/playground/playground_nuwani_commands.js';
 
 // Implementation of the feature that contains a number of options and features giving Las Venturas
 // Playground its unique identity.
-class Playground extends Feature {
+export default class Playground extends Feature {
     constructor() {
         super();
 
@@ -77,5 +77,3 @@ class Playground extends Feature {
         this.access_.dispose();
     }
 }
-
-export default Playground;
diff --git a/javascript/features/playground/playground_access_tracker.js b/javascript/features/playground/playground_access_tracker.js
@@ -12,7 +12,7 @@ const ExceptionReconnectTimeoutMs = 5 /* minutes */ * 60 * 1000;
 //
 // Basic protection has been built in for people timing out and having to reconnect: their access
 // exceptions will be remembered for up to a few minutes.
-class PlaygroundAccessTracker {
+export class PlaygroundAccessTracker {
     constructor() {
         this.commandLevelDefaults_ = new Map();
         this.commandLevels_ = new Map();
@@ -217,5 +217,3 @@ class PlaygroundAccessTracker {
         this.exceptions_.clear();
     }
 }
-
-export default PlaygroundAccessTracker;
diff --git a/javascript/features/playground/playground_access_tracker.test.js b/javascript/features/playground/playground_access_tracker.test.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import PlaygroundAccessTracker from 'features/playground/playground_access_tracker.js';
+import { PlaygroundAccessTracker } from 'features/playground/playground_access_tracker.js';
 
 describe('PlaygroundAccessTracker', (it, beforeEach, afterEach) => {
     let tracker = null;
diff --git a/javascript/features/playground/playground_commands.js b/javascript/features/playground/playground_commands.js
@@ -1,12 +1,11 @@
-// Copyright 2016 Las Venturas Playground. All rights reserved.
+// Copyright 2020 Las Venturas Playground. All rights reserved.
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import Command from 'features/playground/command.js';
+import { Command } from 'features/playground/command.js';
 import { CommandBuilder } from 'components/command_manager/command_builder.js';
 import { Menu } from 'components/menu/menu.js';
 import { MessageBox } from 'components/dialogs/message_box.js';
-import PlaygroundAccessTracker from 'features/playground/playground_access_tracker.js';
 import { Question } from 'components/dialogs/question.js';
 import { Setting } from 'entities/setting.js';
 
@@ -23,7 +22,7 @@ function capitalizeFirstLetter(string) {
 }
 
 // A series of general commands that don't fit in any particular
-class PlaygroundCommands {
+export class PlaygroundCommands {
     constructor(access, announce, communication, nuwani, settings) {
         this.announce_ = announce;
         this.communication_ = communication;
@@ -901,5 +900,3 @@ class PlaygroundCommands {
         this.commands_.clear();
     }
 }
-
-export default PlaygroundCommands;
diff --git a/javascript/features/playground/playground_commands.test.js b/javascript/features/playground/playground_commands.test.js
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import PlaygroundAccessTracker from 'features/playground/playground_access_tracker.js';
-import PlaygroundCommands from 'features/playground/playground_commands.js';
+import { PlaygroundAccessTracker } from 'features/playground/playground_access_tracker.js';
+import { PlaygroundCommands } from 'features/playground/playground_commands.js';
 import { Setting } from 'entities/setting.js';
 
 describe('PlaygroundCommands', (it, beforeEach, afterEach) => {
diff --git a/javascript/features/playground/playground_manager.js b/javascript/features/playground/playground_manager.js
@@ -2,12 +2,12 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import FreeVip from 'features/playground/traits/free_vip.js';
-import PirateShipParty from 'features/playground/traits/pirate_ship_party.js';
+import { FreeVip } from 'features/playground/traits/free_vip.js';
+import { PirateShipParty } from 'features/playground/traits/pirate_ship_party.js';
 
 // The playground manager provides back-end logic for the features provided as part of this module.
 // It controls all settings, as well as the default values for the settings.
-class PlaygroundManager {
+export class PlaygroundManager {
     constructor(settings) {
         this.settings_ = settings;
 
@@ -72,5 +72,3 @@ class PlaygroundManager {
         }
     }
 }
-
-export default PlaygroundManager;
diff --git a/javascript/features/playground/playground_manager.test.js b/javascript/features/playground/playground_manager.test.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import PlaygroundManager from 'features/playground/playground_manager.js';
+import { PlaygroundManager } from 'features/playground/playground_manager.js';
 
 describe('PlaygroundManager', (it, beforeEach, afterEach) => {
     let manager = null;
diff --git a/javascript/features/playground/test/mock_playground.js b/javascript/features/playground/test/mock_playground.js
@@ -3,10 +3,10 @@
 // be found in the LICENSE file.
 
 import { Feature } from 'components/feature_manager/feature.js';
-import PlaygroundAccessTracker from 'features/playground/playground_access_tracker.js';
+import { PlaygroundAccessTracker } from 'features/playground/playground_access_tracker.js';
 
 // Mocked implementation of the Playground feature's API.
-class MockPlayground extends Feature {
+export default class MockPlayground extends Feature {
     constructor() {
         super();
 
@@ -43,5 +43,3 @@ class MockPlayground extends Feature {
         this.access_.dispose();
     }
 }
-
-export default MockPlayground;
diff --git a/javascript/features/playground/test/mock_playground_commands.js b/javascript/features/playground/test/mock_playground_commands.js
@@ -2,12 +2,12 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import PlaygroundAccessTracker from 'features/playground/playground_access_tracker.js';
-import PlaygroundCommands from 'features/playground/playground_commands.js';
+import { PlaygroundAccessTracker } from 'features/playground/playground_access_tracker.js';
+import { PlaygroundCommands } from 'features/playground/playground_commands.js';
 
 // The MockPlaygroundCommands class is exactly the same as the PlaygroundCommands class, with the
 // exception that the arguments required for the constructor are automatically injected.
-class MockPlaygroundCommands extends PlaygroundCommands {
+export class MockPlaygroundCommands extends PlaygroundCommands {
     constructor() {
         const announce = server.featureManager.loadFeature('announce');
         const communication = server.featureManager.loadFeature('communication');
@@ -16,5 +16,3 @@ class MockPlaygroundCommands extends PlaygroundCommands {
         super(new PlaygroundAccessTracker(), () => announce, () => communication, () => nuwani);
     }
 };
-
-export default MockPlaygroundCommands;
diff --git a/javascript/features/playground/traits/free_vip.js b/javascript/features/playground/traits/free_vip.js
@@ -4,7 +4,7 @@
 
 // Trait that, when enabled, hands out VIP to players who haven't donated already. A simple message
 // will be shown telling them that it'll go away in January.
-class FreeVip {
+export class FreeVip {
     constructor() {
         server.playerManager.addObserver(this, false /* replayHistory */);
     }
@@ -33,5 +33,3 @@ class FreeVip {
         server.playerManager.removeObserver(this);
     }
 };
-
-export default FreeVip;
diff --git a/javascript/features/playground/traits/free_vip.test.js b/javascript/features/playground/traits/free_vip.test.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license, a copy of which can
 // be found in the LICENSE file.
 
-import PlaygroundManager from 'features/playground/playground_manager.js';
+import { PlaygroundManager } from 'features/playground/playground_manager.js';
 
 describe('FreeVip', (it, beforeEach, afterEach) => {
     let gunther = null;
diff --git a/javascript/features/playground/traits/pirate_ship_party.js b/javascript/features/playground/traits/pirate_ship_party.js
