diff --git a/.a0proj/memory/index.faiss b/.a0proj/memory/index.faiss index a57c209..145094b 100644 Binary files a/.a0proj/memory/index.faiss and b/.a0proj/memory/index.faiss differ diff --git a/.a0proj/memory/index.pkl b/.a0proj/memory/index.pkl index 0656cba..ea18618 100644 Binary files a/.a0proj/memory/index.pkl and b/.a0proj/memory/index.pkl differ diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index ea25a4f..022e669 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -25,7 +25,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' - cache: 'npm' - name: Install Dependencies run: npm ci @@ -71,7 +70,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' - cache: 'npm' - name: Install Dependencies run: npm ci @@ -97,7 +95,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' - cache: 'npm' - name: Install Dependencies run: npm ci diff --git a/css/styles.css b/css/styles.css index 3930d33..9f03bb3 100644 --- a/css/styles.css +++ b/css/styles.css @@ -119,3 +119,87 @@ button.active { pointer-events: none; font-size: 0.85rem; } + +/* === Train Controls Section === */ +#trainControls { + background: var(--panel-bg); + padding: 15px; + margin-top: 20px; + border-radius: 8px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3); +} + +#trainControls h3 { + color: var(--primary-color); + margin-bottom: 15px; + font-size: 1.1rem; + border-bottom: 2px solid var(--primary-color); + padding-bottom: 8px; +} + +.train-btn { + display: block; + width: 100%; + padding: 12px; + margin-bottom: 10px; + background: linear-gradient(135deg, var(--secondary-color) 0%, var(--secondary-color-dark) 100%); + border: 2px solid var(--secondary-color); + color: white; + font-weight: bold; + border-radius: 6px; + cursor: pointer; + transition: all 0.3s ease; + text-align: center; + font-size: 0.9rem; +} + +.train-btn:hover { + background: linear-gradient(135deg, var(--primary-color) 0%, var(--secondary-color-dark) 100%); + border-color: var(--primary-color); + transform: translateY(-2px); + box-shadow: 0 4px 12px rgba(255, 107, 0, 0.4); +} + +.train-btn:active { + transform: translateY(0); + box-shadow: 0 2px 6px rgba(255, 107, 0, 0.3); +} + +#trainStatus { + background: rgba(255, 255, 255, 0.1); + padding: 12px; + margin-top: 12px; + border-radius: 6px; + font-size: 0.85rem; + border-left: 4px solid var(--primary-color); +} + +#trainStatus p { + margin: 5px 0; + line-height: 1.5; +} + +#trainStatus strong { + color: var(--primary-color); +} + +/* Train animation indicator */ +.train-moving-indicator { + display: inline-block; + width: 8px; + height: 8px; + background: #00ff00; + border-radius: 50%; + margin-right: 8px; + animation: blink 1s infinite; +} + +@keyframes blink { + 0%, 100% { opacity: 1; } + 50% { opacity: 0.3; } +} + +/* Train status colors */ +.status-moving { color: #00ff00; } +.status-stopped { color: #ff0000; } +.status-reversing { color: #ff8800; } diff --git a/index.html b/index.html index 1d8053f..773f365 100644 --- a/index.html +++ b/index.html @@ -5,29 +5,74 @@ Railtrack Pro + + + + + + + + +
-
+

🚂 Railtrack Pro

- -
-
-
-
-
+
+ +
+
+
+

Select Track Type

+ + + + +
+ +
+

Track Controls

+ + +
+ +
+

🚂 Train Controls

+ + + + +
+

Status: Stopped

+

Speed: 0 units/s

+
+
+ +
+

Statistics

+

Total Tracks: 0

+
+
+ +
+
+
+
+
+ +
+
+

Click tracks to place/remove. Select a track type to start building!

+
+
- - - - - - diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000..eeb1ce1 --- /dev/null +++ b/jest.config.js @@ -0,0 +1,13 @@ +module.exports = { + testEnvironment: 'node', + testMatch: ['**/test/**/*.test.js'], + verbose: true, + clearMocks: true, + resetModules: true, + coverageReporters: ['text', 'lcov', 'html'], + collectCoverageFrom: [ + 'js/**/*.js', + '!js/**/__tests__/**', + '!js/**/*.test.js' + ] +}; diff --git a/js/game.js b/js/game.js index 156503d..90c5e77 100644 --- a/js/game.js +++ b/js/game.js @@ -1,228 +1,506 @@ /** - * Railtrack Pro - Game Logic - * Main game controller, UI interactions, and game state management - * @author Railtrack Pro Development Team + * Game Module + * Main game logic, UI interactions, and initialization + * Works in browser environment + * @module game */ +/** + * Game class - main game controller + */ class Game { constructor() { - this.renderer = null; - this.world = null; - this.selectedTrackType = 'straight'; - this.stats = { total: 0, straight: 0, curved: 0, junction: 0, signal: 0 }; - - this.init(); - } - - /** - * Initialize game - */ - init() { - console.log('[Game] Initializing Railtrack Pro...'); - - // Initialize renderer + // Initialize Three.js renderer this.renderer = new Renderer(); - // Initialize world + // Initialize world (track placement) this.world = new World(this.renderer); - // Setup UI controls - this.setupUIControls(); + // Initialize train system + this.trainController = new TrainController([]); + this.trainRenderer = new TrainRenderer(this.renderer.scene, { color: '#FF6B00' }); + this.trainRenderer.setController(this.trainController); + this.createTrain(); - // Initialize stats display - this.updateStats(0); + // Initialize controls + this.controls = new OrbitControls(this.renderer.camera, this.renderer.domElement); + this.controls.enableDamping = true; + this.controls.dampingFactor = 0.05; + this.controls.maxPolarAngle = Math.PI / 2.2; + this.controls.minDistance = 5; + this.controls.maxDistance = 100; + + // Input state + this.selectedTrackType = null; + this.keysPressed = {}; - // Highlight first track type as active - this.setActiveTrackType('straight'); + // Stats tracking + this.stats = { + totalTracks: 0, + trackCounts: {}, + lastUpdate: Date.now() + }; - console.log('[Game] Initialization complete'); + // Initialize UI elements + this.initializeUI(); + + // Bind events + this.bindEvents(); + + // Start game loop + this.lastTime = Date.now(); + this.animate(); + + console.log('🚂 Railtrack Pro initialized!'); } /** - * Setup UI controls and event listeners + * Create a train for the world */ - setupUIControls() { - const trackTypes = ['straight', 'curved', 'junction', 'signal']; - - trackTypes.forEach(type => { - const button = document.getElementById(`btn-${type}`); - if (button) { - button.addEventListener('click', () => this.setActiveTrackType(type)); - } - }); - } - - /** - * Set active track type for placement - */ - setActiveTrackType(type) { - this.selectedTrackType = type; - - // Update button states - document.querySelectorAll('#controls button').forEach(btn => { - btn.classList.remove('active'); + createTrain() { + const train = new Train({ + id: 'main-train', + speed: 0, + maxSpeed: 5, + direction: 1, + color: '#FF6B00' }); - const activeButton = document.getElementById(`btn-${type}`); - if (activeButton) { - activeButton.classList.add('active'); - } - - console.log(`[Game] Selected track type: ${type}`); + this.train = train; + this.trainMesh = this.trainRenderer.createTrainMesh('main-train'); + this.train.threeMesh = this.trainMesh; } /** - * Handle track click from renderer + * Initialize UI elements */ - static onTrackClick(trackMesh) { - if (trackMesh.userData.piece) { - Game.removeTrack(trackMesh.userData.piece); - } + initializeUI() { + // Stats panel + this.statsPanel = document.getElementById('statsPanel'); + this.trackStatsList = document.getElementById('trackStatsList'); + + // Train controls + this.trainControls = { + accelerateBtn: document.getElementById('accelerateTrain'), + brakeBtn: document.getElementById('brakeTrain'), + reverseBtn: document.getElementById('reverseTrain'), + stopBtn: document.getElementById('stopTrain'), + statusDiv: document.getElementById('trainStatus') + }; + + // Track type buttons + this.trackButtons = document.querySelectorAll('[data-track-type]'); + + // Info panel + this.infoPanel = document.getElementById('infoPanel'); + + // Update stats display + this.updateStatsDisplay(); + this.updateTrainStatus(); } /** - * Handle mouse click on viewport for track placement + * Bind event listeners */ - static onViewportClick(event) { - // Only handle placement if a track type is selected - if (!Game.instance.selectedTrackType) { - console.log('[Game] No track type selected'); - return; - } + bindEvents() { + // Track type selection + this.trackButtons.forEach(btn => { + btn.addEventListener('click', () => { + const trackType = btn.dataset.trackType; + this.selectTrackType(trackType, btn); + }); + }); - // Raycast for placement - const mouse = new THREE.Vector2(); - const rect = Game.instance.renderer.renderer.domElement.getBoundingClientRect(); - mouse.x = ((event.clientX - rect.left) / rect.width) * 2 - 1; - mouse.y = -((event.clientY - rect.top) / rect.height) * 2 + 1; + // Train control buttons + this.trainControls.accelerateBtn.addEventListener('click', () => this.accelerate()); + this.trainControls.brakeBtn.addEventListener('click', () => this.brake()); + this.trainControls.reverseBtn.addEventListener('click', () => this.reverse()); + this.trainControls.stopBtn.addEventListener('click', () => this.stop()); - Game.instance.renderer.raycaster.setFromCamera(mouse, Game.instance.renderer.camera); - - // Create plane for intersection - const plane = new THREE.Plane(new THREE.Vector3(0, 1, 0), 0); - const target = new THREE.Vector3(); - const intersectPoint = new THREE.Vector3(); - - Game.instance.renderer.raycaster.ray.intersectPlane(plane, intersectPoint); - - if (intersectPoint) { - // Snap to grid - const snappedPosition = Game.instance.world.snapToGrid(intersectPoint); + // Keyboard controls + document.addEventListener('keydown', (e) => { + this.keysPressed[e.code] = true; - // Check if placement is valid - if (Game.instance.world.isValidPlacement(snappedPosition)) { - // Calculate rotation based on selected type - const rotation = new THREE.Vector3(0, Math.PI / 2, 0); - - // Add track piece to world - Game.instance.world.addTrackPiece( - Game.instance.selectedTrackType, - snappedPosition, - rotation - ); + // Train controls via keyboard + switch(e.code) { + case 'KeyW': + case 'ArrowUp': + this.accelerate(); + break; + case 'KeyS': + case 'ArrowDown': + this.brake(); + break; + case 'KeyR': + case 'KeyD': + this.reverse(); + break; + case 'Space': + this.stop(); + break; + } + }); + + document.addEventListener('keyup', (e) => { + this.keysPressed[e.code] = false; + }); + + // Mouse click for track placement/removal + this.renderer.domElement.addEventListener('click', (event) => { + this.handleMouseClick(event); + }); + + // Handle window resize + window.addEventListener('resize', () => { + this.onWindowResize(); + }); + } + + /** + * Select track type for placement + * @param {string} trackType - Type of track to select + * @param {HTMLElement} button - Button element clicked + */ + selectTrackType(trackType, button) { + this.selectedTrackType = trackType; + + // Update button styles + this.trackButtons.forEach(btn => { + btn.classList.remove('selected'); + }); + button.classList.add('selected'); + + console.log(`Selected track type: ${trackType}`); + } + + /** + * Handle mouse click on canvas + * @param {MouseEvent} event - Mouse click event + */ + handleMouseClick(event) { + // Check if clicking on train first + const clickedMesh = event.target; + if (clickedMesh === this.trainMesh || clickedMesh.parent === this.trainMesh) { + // Train selected - show train info + this.showTrainInfo(); + return; + } + + // If no track type selected, show instruction + if (!this.selectedTrackType) { + this.showInfo('Select a track type to place! Click track buttons in the toolbar.'); + return; + } + + // Check if clicking on existing track (to remove) + const clickedTrack = this.checkClickedTrack(event); + if (clickedTrack) { + this.world.removeTrack(clickedTrack); + this.updateStatsDisplay(); + this.showInfo(`Removed track at ${clickedTrack.position.x}, ${clickedTrack.position.y}`); + return; + } + + // Check if clicking on canvas + if (this.world.isPlacementValid(event)) { + this.placeTrack(event); + } else { + this.showInfo('Click on the grid to place tracks. Click existing tracks to remove them.'); + } + } + + /** + * Check if mouse clicked on an existing track + * @param {MouseEvent} event - Mouse click event + * @returns {THREE.Object3D|null} Clicked track object or null + */ + checkClickedTrack(event) { + const mouse = new THREE.Vector2(); + mouse.x = (event.clientX / window.innerWidth) * 2 - 1; + mouse.y = -(event.clientY / window.innerHeight) * 2 + 1; + + const raycaster = new THREE.Raycaster(); + raycaster.setFromCamera(mouse, this.renderer.camera); + + const intersects = raycaster.intersectObjects(this.world.allTracks, true); + if (intersects.length > 0) { + // Find parent group (the actual track piece) + let parent = intersects[0].object; + while (parent && !parent.userData.type) { + parent = parent.parent; + } + if (parent && parent.userData.type) { + return parent; + } + } + return null; + } + + /** + * Place a track at the clicked location + * @param {MouseEvent} event - Mouse click event + */ + placeTrack(event) { + const gridPos = this.world.getGridPosition(event); + if (gridPos) { + const track = this.world.addTrack( + this.selectedTrackType, + gridPos.x, + gridPos.y, + this.renderer + ); + if (track) { + this.stats.totalTracks++; + this.stats.trackCounts[this.selectedTrackType] = (this.stats.trackCounts[this.selectedTrackType] || 0) + 1; + this.updateStatsDisplay(); + this.showInfo(`Placed ${this.selectedTrackType} at ${gridPos.x}, ${gridPos.y}`); } else { - console.log('[Game] Placement invalid - invalid position'); + this.showInfo(`Cannot place ${this.selectedTrackType} at that location.`, 'warning'); } } } /** - * Remove track piece + * Accelerate the train (W/Up arrow) */ - static removeTrack(trackPiece) { - if (Game.instance && Game.instance.world) { - Game.instance.world.removeTrackPiece(trackPiece); + accelerate() { + if (this.train) { + this.train.accelerate(); + this.updateTrainStatus(); + console.log('⚡ Train accelerating - Speed:', this.train.speed); } } /** - * Update stats display in info panel + * Brake the train (S/Down arrow) */ - static updateStats(count) { - if (!Game.instance) return; - - const stats = Game.instance.world.getStats(); - Game.instance.stats = stats; - - const statsElement = document.getElementById('stats'); - if (statsElement) { - statsElement.innerHTML = ` -

📊 Track Statistics

-

Total: ${stats.total}

-

âŦ‡ī¸ Straight: ${stats.straight}

-

âŦ‡ī¸ Curved: ${stats.curved}

-

âŦ‡ī¸ Junction: ${stats.junction}

-

âŦ‡ī¸ Signal: ${stats.signal}

- `; + brake() { + if (this.train) { + this.train.brake(); + this.updateTrainStatus(); + console.log('🛑 Train braking - Speed:', this.train.speed); } } /** - * Update selected track info display + * Reverse train direction (R/D) */ - static updateSelectedInfo(selectedMesh) { - if (!Game.instance) return; - - const infoElement = document.getElementById('selected-info'); - - if (!selectedMesh) { - infoElement.innerHTML = ` -

🔍 Selection

-

No track selected

- `; - return; + reverse() { + if (this.train) { + this.train.reverse(); + this.updateTrainStatus(); + console.log('🔄 Train reversed - Direction:', this.train.direction); } + } - const track = selectedMesh.userData.piece; - if (!track) return; + /** + * Stop the train (Space) + */ + stop() { + if (this.train) { + this.train.stop(); + this.updateTrainStatus(); + console.log('🛑 Train stopped'); + } + } - const config = TrackConfig.types[track.type] || { name: 'Unknown' }; - - infoElement.innerHTML = ` -

đŸ“Ļ Track Info

-

Type: ${config.name}

-

Position: ${track.position.x.toFixed(1)}, ${track.position.z.toFixed(1)}

-

Rotation: ${(track.rotation.y * 180 / Math.PI).toFixed(0)}°

-

Cost: $${config.cost || 0}

+ /** + * Show train information in info panel + */ + showTrainInfo() { + if (!this.train) return; + + this.infoPanel.innerHTML = ` +

🚂 Train Information

+

ID: ${this.train.id}

+

Speed: ${Math.abs(this.train.speed).toFixed(1)} units/s

+

Direction: ${this.train.direction > 0 ? 'âžĄī¸ Forward' : 'âŦ…ī¸ Reverse'}

+

Status: ${this.train.isMoving ? '🚂 Moving' : '🛑 Stopped'}

+

Keyboard: W/↑ = Accelerate, S/↓ = Brake, R/D = Reverse, SPACE = Stop

`; } /** - * Get current game instance + * Show information message in info panel + * @param {string} message - Message to display + * @param {string} type - Type (info, warning, error) */ - static getInstance() { - return this.instance; + showInfo(message, type = 'info') { + this.infoPanel.innerHTML = ` +

${type === 'warning' ? 'âš ī¸' : type === 'error' ? '❌' : 'â„šī¸'} ${type.toUpperCase()}

+

${message}

+ `; + + // Clear info after 3 seconds + setTimeout(() => { + if (this.infoPanel && this.infoPanel.innerHTML.includes(message)) { + this.infoPanel.innerHTML = '

Click tracks to place/remove. Select a track type to start building!

'; + } + }, 3000); } /** - * Initialize game on DOM ready + * Update stats display in UI */ - initGame() { - Game.instance = new Game(); - - // Add click handler to viewport - const viewport = document.getElementById('viewport'); - if (viewport) { - viewport.addEventListener('click', (event) => { - // Prevent placement if clicking on info panel - if (event.target.closest('#info-panel')) return; - Game.onViewportClick(event); - }); + updateStatsDisplay() { + if (!this.statsPanel) return; + + let statsHTML = ` +

📊 Statistics

+

Total Tracks: ${this.stats.totalTracks}

+ `; + + if (this.stats.trackCounts && Object.keys(this.stats.trackCounts).length > 0) { + statsHTML += ` +

Track Types:

+ `; } - console.log('[Game] Game instance created and ready'); + this.statsPanel.innerHTML = statsHTML; + } + + /** + * Update train status display in UI + */ + updateTrainStatus() { + if (!this.trainControls.statusDiv || !this.train) return; + + const status = this.train.isMoving ? '🚂 Moving' : '🛑 Stopped'; + const direction = this.train.direction > 0 ? 'âžĄī¸ Forward' : 'âŦ…ī¸ Reverse'; + + this.trainControls.statusDiv.innerHTML = ` +

Status: ${status}

+

Direction: ${direction}

+

Speed: ${Math.abs(this.train.speed).toFixed(1)} units/s

+ `; + } + + /** + * Handle window resize + */ + onWindowResize() { + this.renderer.onWindowResize(); + } + + /** + * Update game state based on input + * @param {number} deltaTime - Time delta in seconds + */ + update(deltaTime) { + // Update train controls based on keyboard + if (this.train) { + // Keyboard controls with smoothing + if (this.keysPressed['KeyW'] || this.keysPressed['ArrowUp']) { + this.accelerate(); + } + if (this.keysPressed['KeyS'] || this.keysPressed['ArrowDown']) { + this.brake(); + } + if (this.keysPressed['KeyR'] || this.keysPressed['KeyD']) { + this.reverse(); + } + + // Update train physics + this.train.update(deltaTime); + this.updateTrainStatus(); + + // Update train controller if we have a track path + if (this.trainController.trackPath.length > 0) { + this.trainController.update(deltaTime, this.train.speed); + + // Get current position and update train mesh + const currentPosition = this.trainController.getCurrentPosition(); + const rotation = this.getTrainRotation(); + this.trainRenderer.updateTrain('main-train', currentPosition, rotation); + } + } + + // Update controller + this.controls.update(); + } + + /** + * Calculate train rotation based on track direction + * @returns {number} Rotation angle in radians + */ + getTrainRotation() { + let rotation = 0; + + if (this.trainController && this.trainController.trackPath.length >= 2) { + const totalLength = this.trainController.totalPathLength; + const targetDistance = this.trainController.distance; + + let distance = 0; + for (let i = 0; i < this.trainController.trackPath.length - 1; i++) { + const p1 = this.trainController.trackPath[i]; + const p2 = this.trainController.trackPath[i + 1]; + const dist = this._distanceBetween(p1, p2); + + if (targetDistance >= distance && targetDistance <= distance + dist) { + const x1 = p1.x, y1 = p1.y; + const x2 = p2.x, y2 = p2.y; + rotation = Math.atan2(y2 - y1, x2 - x1); + // Adjust for train direction + if (this.train && this.train.direction < 0) { + rotation += Math.PI; + } + break; + } + distance += dist; + } + } + + return rotation; + } + + /** + * Calculate distance between two points + * @param {Object} p1 - First point {x, y, z} + * @param {Object} p2 - Second point {x, y, z} + * @returns {number} Distance + * @private + */ + _distanceBetween(p1, p2) { + const dx = p2.x - p1.x; + const dy = p2.y - p1.y; + const dz = p2.z - p1.z; + return Math.sqrt(dx * dx + dy * dy + dz * dz); + } + + /** + * Animation loop - main game loop + */ + animate() { + requestAnimationFrame(() => this.animate()); + + const now = Date.now(); + const deltaTime = (now - this.lastTime) / 1000; + this.lastTime = now; + + this.update(deltaTime); + this.renderer.render(); + } + + /** + * Set track path for train + * @param {Array} path - Array of {x, y, z} points + */ + setTrainPath(path) { + this.trainController.setTrackPath(path); + } + + /** + * Dispose game resources + */ + dispose() { + this.trainRenderer.dispose(); + this.world.dispose(); + this.renderer.dispose(); + window.removeEventListener('resize', this.onWindowResize); } } - -// Global game instance -Game.instance = null; - -// Initialize game when DOM is ready -document.addEventListener('DOMContentLoaded', () => { - Game.initGame(); -}); - -// Export for module usage -if (typeof module !== 'undefined' && module.exports) { - module.exports = Game; -} diff --git a/js/train.js b/js/train.js new file mode 100644 index 0000000..9c4cd05 --- /dev/null +++ b/js/train.js @@ -0,0 +1,229 @@ +/** + * Train Module + * Handles train model and controller for driving along tracks + * Works in browser environment with Three.js global + * @module train + */ + +/** + * Train class - represents a train that can move along tracks + */ +class Train { + /** + * Create a train instance + * @param {Object} options - Train configuration options + * @param {string} options.id - Unique identifier for the train + * @param {number} options.speed - Initial speed + * @param {number} options.maxSpeed - Maximum speed + * @param {number} options.direction - Direction (1 or -1) + * @param {number} options.length - Train length for display + * @param {string} options.color - Train body color + */ + constructor(options = {}) { + this.id = options.id || `train-${Date.now()}`; + this.speed = options.speed || 0; + this.maxSpeed = options.maxSpeed || 5; + this.acceleration = options.acceleration || 0.5; + this.brakeDeceleration = options.brakeDeceleration || 0.3; + this.direction = options.direction || 1; + this.length = options.length || 3; + + this.isMoving = false; + this.threeMesh = null; + this.color = options.color || '#FF6B00'; + } + + /** + * Accelerate the train + */ + accelerate() { + this.speed = Math.min(this.speed + this.acceleration * this.direction, this.maxSpeed * this.direction); + this.isMoving = this.speed !== 0; + } + + /** + * Brake the train + */ + brake() { + const brakeAmount = this.brakeDeceleration * this.direction; + const newSpeed = this.speed - brakeAmount; + + if (Math.abs(newSpeed) < Math.abs(this.brakeDeceleration)) { + this.speed = 0; + this.isMoving = false; + } else { + this.speed = newSpeed; + } + } + + /** + * Reverse direction + */ + reverse() { + this.direction *= -1; + } + + /** + * Stop the train + */ + stop() { + this.speed = 0; + this.isMoving = false; + } + + /** + * Update train physics based on speed + * @param {number} deltaTime - Time delta in seconds + */ + update(deltaTime) { + if (this.isMoving) { + this.speed = this.speed > 0 ? Math.max(this.speed - 0.1 * this.direction, 0) : Math.min(this.speed + 0.1 * this.direction, 0); + this.isMoving = this.speed !== 0; + } + } + + /** + * Get train velocity + * @returns {number} Train velocity + */ + getVelocity() { + return this.speed; + } +} + +/** + * TrainController class - manages train position along track path + */ +class TrainController { + /** + * Create a train controller + * @param {Array} trackPath - Array of {x, y, z} points defining the track path + */ + constructor(trackPath = []) { + this.trackPath = trackPath || []; + this.progress = 0; // 0.0 to 1.0 along the path + this.distance = 0; // Distance traveled along path + this.currentPosition = { x: 0, y: 0, z: 0 }; + this.totalPathLength = this._calculatePathLength(); + } + + /** + * Calculate total path length + * @returns {number} Total length of the track path + * @private + */ + _calculatePathLength() { + if (this.trackPath.length < 2) return 0; + + let totalLength = 0; + for (let i = 1; i < this.trackPath.length; i++) { + const p1 = this.trackPath[i - 1]; + const p2 = this.trackPath[i]; + const dx = p2.x - p1.x; + const dy = p2.y - p1.y; + const dz = p2.z - p1.z; + totalLength += Math.sqrt(dx * dx + dy * dy + dz * dz); + } + return totalLength; + } + + /** + * Set distance traveled along the path + * @param {number} distance - Distance to set + */ + setDistance(distance) { + this.distance = Math.max(0, Math.min(distance, this.totalPathLength)); + this.progress = this.totalPathLength > 0 ? this.distance / this.totalPathLength : 0; + this.updateCurrentPosition(); + } + + /** + * Get current position on the track path + * @returns {Object} Position {x, y, z} + */ + getCurrentPosition() { + return this.currentPosition; + } + + /** + * Update current position based on progress + * @private + */ + updateCurrentPosition() { + if (this.trackPath.length < 2) { + this.currentPosition = this.trackPath[0] || { x: 0, y: 0, z: 0 }; + return; + } + + const totalLength = this.totalPathLength; + const targetDistance = this.progress * totalLength; + + let distance = 0; + for (let i = 0; i < this.trackPath.length - 1; i++) { + const p1 = this.trackPath[i]; + const p2 = this.trackPath[i + 1]; + const p1Length = distance; + const p2Length = distance + this._distanceBetween(p1, p2); + + if (targetDistance >= p1Length && targetDistance <= p2Length) { + const segmentProgress = (targetDistance - p1Length) / (p2Length - p1Length); + this.currentPosition = { + x: p1.x + (p2.x - p1.x) * segmentProgress, + y: p1.y + (p2.y - p1.y) * segmentProgress, + z: p1.z + (p2.z - p1.z) * segmentProgress + }; + return; + } + distance += this._distanceBetween(p1, p2); + } + + // End of path + this.currentPosition = this.trackPath[this.trackPath.length - 1]; + } + + /** + * Calculate distance between two points + * @param {Object} p1 - First point {x, y, z} + * @param {Object} p2 - Second point {x, y, z} + * @returns {number} Distance + * @private + */ + _distanceBetween(p1, p2) { + const dx = p2.x - p1.x; + const dy = p2.y - p1.y; + const dz = p2.z - p1.z; + return Math.sqrt(dx * dx + dy * dy + dz * dz); + } + + /** + * Update controller based on train speed + * @param {number} deltaTime - Time delta in seconds + * @param {number} speed - Train speed + */ + update(deltaTime, speed) { + const distanceDelta = speed * deltaTime; + this.setDistance(this.distance + distanceDelta); + } + + /** + * Set track path + * @param {Array} path - Array of {x, y, z} points + */ + setTrackPath(path) { + this.trackPath = path; + this.totalPathLength = this._calculatePathLength(); + this.progress = 0; + this.distance = 0; + this.updateCurrentPosition(); + } +} + +// Export for browser global scope +if (typeof window !== 'undefined') { + window.Train = Train; + window.TrainController = TrainController; +} + +// Export for Node.js/Jest +module.exports = { Train, TrainController }; + diff --git a/js/trainRenderer.js b/js/trainRenderer.js new file mode 100644 index 0000000..520d99b --- /dev/null +++ b/js/trainRenderer.js @@ -0,0 +1,232 @@ +/** + * Train Renderer + * Handles Three.js visualization of train models + * Works in browser environment with Three.js global + * @module trainRenderer + */ + +/** + * TrainRenderer class - manages 3D train visualization + */ +class TrainRenderer { + /** + * Create a train renderer + * @param {THREE.Scene} scene - Three.js scene + * @param {Object} options - Configuration options + * @param {string} options.color - Train body color hex + */ + constructor(scene, options = {}) { + this.scene = scene; + this.trainMeshes = new Map(); + this.trainController = null; + + // Default train colors + this.colors = { + body: new THREE.Color(options.color || '#FF6B00'), + windows: new THREE.Color('#87CEEB'), + wheels: new THREE.Color('#333333'), + details: new THREE.Color('#FFFFFF') + }; + + this.trains = {}; + } + + /** + * Create a 3D train mesh + * @param {string} trainId - Unique train identifier + * @returns {THREE.Group} Train mesh group + */ + createTrainMesh(trainId) { + const trainGroup = new THREE.Group(); + trainGroup.userData.id = trainId; + + // Train body (main chassis) + const bodyGeometry = new THREE.BoxGeometry(2, 1.2, 4); + const bodyMaterial = new THREE.MeshPhongMaterial({ + color: this.colors.body, + shininess: 50 + }); + const body = new THREE.Mesh(bodyGeometry, bodyMaterial); + body.position.y = 0.6; + trainGroup.add(body); + + // Cab area (front) + const cabGeometry = new THREE.BoxGeometry(1.8, 0.8, 1); + const cabMaterial = new THREE.MeshPhongMaterial({ + color: this.colors.windows, + shininess: 30 + }); + const cab = new THREE.Mesh(cabGeometry, cabMaterial); + cab.position.set(0.9, 1.1, 0); + cab.rotation.y = Math.PI / 4; + trainGroup.add(cab); + + // Wheels (4 visible wheels) + const wheelGeometry = new THREE.CylinderGeometry(0.3, 0.3, 0.2, 16); + const wheelMaterial = new THREE.MeshPhongMaterial({ + color: this.colors.wheels, + shininess: 20 + }); + + const wheelPositions = [ + { x: 0.3, y: -0.3, z: 1.2, rotZ: Math.PI / 2 }, + { x: 0.3, y: -0.3, z: -1.2, rotZ: Math.PI / 2 }, + { x: -0.3, y: -0.3, z: 1.2, rotZ: Math.PI / 2 }, + { x: -0.3, y: -0.3, z: -1.2, rotZ: Math.PI / 2 } + ]; + + wheelPositions.forEach(pos => { + const wheel = new THREE.Mesh(wheelGeometry, wheelMaterial); + wheel.position.set(pos.x, pos.y, pos.z); + wheel.rotation.z = pos.rotZ; + trainGroup.add(wheel); + }); + + // Train front marker (red light) + const lightGeometry = new THREE.SphereGeometry(0.15); + const lightMaterial = new THREE.MeshBasicMaterial({ color: 0xFF0000 }); + const frontLight = new THREE.Mesh(lightGeometry, lightMaterial); + frontLight.position.set(1.01, 1.0, 0); + trainGroup.add(frontLight); + + // Train rear marker (red tail light) + const rearLight = new THREE.Mesh(lightGeometry, lightMaterial); + rearLight.position.set(-1.01, 1.0, 0); + trainGroup.add(rearLight); + + // Add train to scene + this.scene.add(trainGroup); + this.trainMeshes.set(trainId, trainGroup); + + return trainGroup; + } + + /** + * Remove a train from the scene + * @param {string} trainId - Train identifier to remove + */ + removeTrain(trainId) { + const mesh = this.trainMeshes.get(trainId); + if (mesh) { + this.scene.remove(mesh); + mesh.traverse(child => { + if (child.geometry) child.geometry.dispose(); + if (child.material) { + if (Array.isArray(child.material)) { + child.material.forEach(mat => mat.dispose()); + } else { + child.material.dispose(); + } + } + }); + this.trainMeshes.delete(trainId); + delete this.trains[trainId]; + } + } + + /** + * Update train mesh position and rotation based on train state + * @param {string} trainId - Train identifier + * @param {Object} position - Position {x, y, z} + * @param {number} rotation - Rotation angle in radians + */ + updateTrain(trainId, position, rotation) { + const mesh = this.trainMeshes.get(trainId); + if (mesh) { + mesh.position.set(position.x, position.y, position.z); + mesh.rotation.y = rotation; + } + } + + /** + * Update all train meshes based on train controller progress + * @param {number} deltaTime - Time delta in seconds + * @param {number} speed - Train speed + */ + updateAll(deltaTime, speed) { + const progress = this.trainController ? this.trainController.progress : 0; + const currentPos = this.trainController ? this.trainController.currentPosition : { x: 0, y: 0, z: 0 }; + + // Calculate orientation based on direction + let rotation = 0; + if (this.trainController && this.trainController.trackPath.length >= 2) { + const totalLength = this.trainController.totalPathLength; + const targetDistance = progress * totalLength; + + let distance = 0; + for (let i = 0; i < this.trainController.trackPath.length - 1; i++) { + const p1 = this.trainController.trackPath[i]; + const p2 = this.trainController.trackPath[i + 1]; + const dist = this._distanceBetween(p1, p2); + + if (targetDistance >= distance && targetDistance <= distance + dist) { + const segmentProgress = (targetDistance - distance) / dist; + const x1 = p1.x, y1 = p1.y; + const x2 = p2.x, y2 = p2.y; + rotation = Math.atan2(y2 - y1, x2 - x1); + break; + } + distance += dist; + } + } + + // Update mesh positions + this.trainMeshes.forEach((mesh, trainId) => { + this.updateTrain(trainId, currentPos, rotation); + }); + } + + /** + * Calculate distance between two points + * @param {Object} p1 - First point {x, y, z} + * @param {Object} p2 - Second point {x, y, z} + * @returns {number} Distance + * @private + */ + _distanceBetween(p1, p2) { + const dx = p2.x - p1.x; + const dy = p2.y - p1.y; + const dz = p2.z - p1.z; + return Math.sqrt(dx * dx + dy * dy + dz * dz); + } + + /** + * Set train controller reference + * @param {TrainController} controller - TrainController instance + */ + setController(controller) { + this.trainController = controller; + } + + /** + * Get all train meshes + * @returns {Map} Map of trainId to mesh + */ + getTrainMeshes() { + return this.trainMeshes; + } + + /** + * Dispose resources + */ + dispose() { + this.trainMeshes.forEach(mesh => { + mesh.traverse(child => { + if (child.geometry) child.geometry.dispose(); + if (child.material) { + if (Array.isArray(child.material)) { + child.material.forEach(mat => mat.dispose()); + } else { + child.material.dispose(); + } + } + }); + }); + this.trainMeshes.clear(); + } +} + +// Export for browser global scope +if (typeof window !== 'undefined') { + window.TrainRenderer = TrainRenderer; +} diff --git a/package-lock.json b/package-lock.json index df0ad03..a5a7437 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "devDependencies": { "@playwright/test": "^1.58.2", "jest": "^30.3.0", + "jest-environment-jsdom": "^29.7.0", "jsdom": "^28.1.0" } }, @@ -1202,6 +1203,15 @@ "@sinonjs/commons": "^3.0.1" } }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, "node_modules/@tybys/wasm-util": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", @@ -1277,6 +1287,29 @@ "@types/istanbul-lib-report": "*" } }, + "node_modules/@types/jsdom": { + "version": "20.0.1", + "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", + "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", + "dev": true, + "dependencies": { + "@types/node": "*", + "@types/tough-cookie": "*", + "parse5": "^7.0.0" + } + }, + "node_modules/@types/jsdom/node_modules/parse5": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", + "dev": true, + "dependencies": { + "entities": "^6.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/@types/node": { "version": "25.5.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz", @@ -1292,6 +1325,12 @@ "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", "dev": true }, + "node_modules/@types/tough-cookie": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", + "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", + "dev": true + }, "node_modules/@types/yargs": { "version": "17.0.35", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz", @@ -1563,6 +1602,47 @@ "win32" ] }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "deprecated": "Use your platform's native atob() and btoa() methods instead", + "dev": true + }, + "node_modules/acorn": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", + "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", + "dev": true, + "dependencies": { + "acorn": "^8.1.0", + "acorn-walk": "^8.0.2" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz", + "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==", + "dev": true, + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/agent-base": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", @@ -1648,6 +1728,12 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true + }, "node_modules/babel-jest": { "version": "30.3.0", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.3.0.tgz", @@ -1775,6 +1861,18 @@ "balanced-match": "^1.0.0" } }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/browserslist": { "version": "4.28.1", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", @@ -1823,6 +1921,19 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -2013,6 +2124,18 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -2052,6 +2175,12 @@ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" } }, + "node_modules/cssom": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", + "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", + "dev": true + }, "node_modules/cssstyle": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-6.2.0.tgz", @@ -2135,6 +2264,15 @@ "node": ">=0.10.0" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/detect-newline": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", @@ -2144,6 +2282,42 @@ "node": ">=8" } }, + "node_modules/domexception": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", + "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", + "deprecated": "Use your platform's native DOMException instead", + "dev": true, + "dependencies": { + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -2195,6 +2369,51 @@ "is-arrayish": "^0.2.1" } }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -2213,6 +2432,27 @@ "node": ">=8" } }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -2226,6 +2466,24 @@ "node": ">=4" } }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -2296,6 +2554,18 @@ "bser": "2.1.1" } }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -2325,6 +2595,22 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/form-data": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", + "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -2345,6 +2631,15 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -2363,6 +2658,30 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/get-package-type": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", @@ -2372,6 +2691,19 @@ "node": ">=8.0.0" } }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -2405,6 +2737,18 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -2420,6 +2764,45 @@ "node": ">=8" } }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/html-encoding-sniffer": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-6.0.0.tgz", @@ -2473,6 +2856,18 @@ "node": ">=10.17.0" } }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/import-local": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", @@ -2542,6 +2937,15 @@ "node": ">=6" } }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/is-potential-custom-element-name": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", @@ -2855,6 +3259,432 @@ "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, + "node_modules/jest-environment-jsdom": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz", + "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/jsdom": "^20.0.0", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0", + "jsdom": "^20.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jest-environment-jsdom/node_modules/@jest/environment": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", + "dev": true, + "dependencies": { + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/@jest/fake-timers": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/@sinclair/typebox": { + "version": "0.27.10", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.10.tgz", + "integrity": "sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==", + "dev": true + }, + "node_modules/jest-environment-jsdom/node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-environment-jsdom/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-environment-jsdom/node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-environment-jsdom/node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, + "node_modules/jest-environment-jsdom/node_modules/data-urls": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", + "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.6", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/html-encoding-sniffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", + "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", + "dev": true, + "dependencies": { + "whatwg-encoding": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-environment-jsdom/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-environment-jsdom/node_modules/jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/jest-mock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/jsdom": { + "version": "20.0.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz", + "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.6", + "acorn": "^8.8.1", + "acorn-globals": "^7.0.0", + "cssom": "^0.5.0", + "cssstyle": "^2.3.0", + "data-urls": "^3.0.2", + "decimal.js": "^10.4.2", + "domexception": "^4.0.0", + "escodegen": "^2.0.0", + "form-data": "^4.0.0", + "html-encoding-sniffer": "^3.0.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.1", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.2", + "parse5": "^7.1.1", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.1.2", + "w3c-xmlserializer": "^4.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^2.0.0", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0", + "ws": "^8.11.0", + "xml-name-validator": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jest-environment-jsdom/node_modules/parse5": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", + "dev": true, + "dependencies": { + "entities": "^6.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/jest-environment-jsdom/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/jest-environment-jsdom/node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/tough-cookie": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", + "dev": true, + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jest-environment-jsdom/node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/w3c-xmlserializer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", + "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", + "dev": true, + "dependencies": { + "xml-name-validator": "^4.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/jest-environment-jsdom/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dev": true, + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/xml-name-validator": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", + "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/jest-environment-node": { "version": "30.3.0", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.3.0.tgz", @@ -3384,6 +4214,15 @@ "tmpl": "1.0.5" } }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/mdn-data": { "version": "2.27.1", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz", @@ -3396,6 +4235,52 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -3489,6 +4374,12 @@ "node": ">=8" } }, + "node_modules/nwsapi": { + "version": "2.2.23", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz", + "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==", + "dev": true + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -3758,6 +4649,18 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/psl": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", + "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==", + "dev": true, + "dependencies": { + "punycode": "^2.3.1" + }, + "funding": { + "url": "https://github.com/sponsors/lupomontero" + } + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -3783,6 +4686,12 @@ } ] }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true + }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", @@ -3807,6 +4716,12 @@ "node": ">=0.10.0" } }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, "node_modules/resolve-cwd": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", @@ -3828,6 +4743,12 @@ "node": ">=8" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, "node_modules/saxes": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", @@ -4211,6 +5132,18 @@ "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/tough-cookie": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz", @@ -4278,6 +5211,15 @@ "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", "dev": true }, + "node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/unrs-resolver": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz", @@ -4342,6 +5284,16 @@ "browserslist": ">= 4.21.0" } }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "node_modules/v8-to-istanbul": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", @@ -4386,6 +5338,19 @@ "node": ">=20" } }, + "node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation", + "dev": true, + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/whatwg-mimetype": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz", @@ -4531,6 +5496,27 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/ws": { + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", + "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/xml-name-validator": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", diff --git a/package.json b/package.json index acaaddb..94dbdf8 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,27 @@ { "name": "railtrack_pro", "version": "1.0.0", - "description": "**A web-based railway construction game featuring track building, junctions, signals, and 3D driver's eye view.**", - "main": "index.js", + "description": "A web-based railway construction game featuring track building, junctions, signals, and 3D driver's eye view.", "directories": { "test": "test" }, "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "start": "python3 -m http.server 8080", + "test": "npm run test:unit", + "test:unit": "jest", + "test:e2e": "playwright test", + "test:all": "npm run test:unit && npm run test:e2e", + "test:coverage": "jest --coverage", + "test:watch": "jest --watch", + "test:report": "jest --coverage --coverageReporters=html" }, - "keywords": [], - "author": "", + "keywords": ["game", "railway", "threejs"], + "author": "Railtrack Pro Team", "license": "ISC", "devDependencies": { "@playwright/test": "^1.58.2", "jest": "^30.3.0", + "jest-environment-jsdom": "^29.7.0", "jsdom": "^28.1.0" } } diff --git a/playwright.config.js b/playwright.config.js new file mode 100644 index 0000000..b910f08 --- /dev/null +++ b/playwright.config.js @@ -0,0 +1,34 @@ +/** + * Playwright Configuration for Railtrack Pro + * E2E testing with video recording + */ +const { defineConfig, devices } = require('@playwright/test'); + +module.exports = defineConfig({ + testDir: './test/e2e', + fullyParallel: true, + forbidOnly: !!process.env.CI, + retries: process.env.CI ? 2 : 0, + workers: process.env.CI ? 1 : undefined, + reporter: 'html', + use: { + baseURL: 'http://localhost:8080', + trace: 'on-first-retry', + screenshot: 'only-on-failure', + video: 'on-first-retry' + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] } + }, + { + name: 'firefox', + use: { ...devices['Desktop Firefox'] } + }, + { + name: 'webkit', + use: { ...devices['Desktop Safari'] } + } + ] +}); diff --git a/test/e2e/railtrack.spec.js b/test/e2e/railtrack.spec.js new file mode 100644 index 0000000..f6061d4 --- /dev/null +++ b/test/e2e/railtrack.spec.js @@ -0,0 +1,41 @@ +/** + * Playwright E2E Tests for Railtrack Pro + * Tests core game functionality with video recording on failure + */ +const { test, expect } = require('@playwright/test'); + +test.describe('Railtrack Pro E2E Tests', () => { + + test.beforeEach(async ({ page }) => { + await page.goto('http://localhost:8080'); + }); + + test.afterEach(async ({ page }) => { + await page.close(); + }); + + test('should load game page successfully', async ({ page }) => { + await expect(page).toHaveTitle(/Railtrack Pro/i); + }); + + test('should render Three.js canvas', async ({ page }) => { + const canvas = page.locator('canvas'); + await expect(canvas).toBeVisible(); + }); + + test('should initialize game world', async ({ page }) => { + await page.waitForTimeout(2000); + const canvas = page.locator('canvas'); + const rect = await canvas.boundingBox(); + expect(rect).toBeTruthy(); + }); + + test('should respond to mouse interactions', async ({ page }) => { + await page.waitForTimeout(2000); + const canvas = page.locator('canvas'); + await canvas.hover(); + console.log('Mouse interaction successful'); + }); + +}); +console.log('Playwright E2E test file created successfully'); diff --git a/test/unit/train.test.js b/test/unit/train.test.js new file mode 100644 index 0000000..b3933fd --- /dev/null +++ b/test/unit/train.test.js @@ -0,0 +1,79 @@ +/** + * Train Module Unit Tests + * Tests for Train and TrainController classes + */ + +const { Train, TrainController } = require('../../js/train.js'); + +describe('Train Module', () => { + describe('Train Class', () => { + test('should create train with default properties', () => { + const train = new Train(); + expect(train.id).toBeDefined(); + expect(train.speed).toBe(0); + expect(train.maxSpeed).toBeGreaterThan(0); + }); + + test('should initialize with custom properties', () => { + const train = new Train({ id: 'TEST', speed: 10, maxSpeed: 20 }); + expect(train.id).toBe('TEST'); + expect(train.speed).toBe(10); + expect(train.maxSpeed).toBe(20); + }); + + test('should accelerate and brake', () => { + const train = new Train({ speed: 0, maxSpeed: 10 }); + + train.accelerate(); + expect(train.speed).toBeGreaterThan(0); + + train.brake(); + expect(train.speed).toBeLessThan(10); + }); + + test('should reverse direction', () => { + const train = new Train({ speed: 10, direction: 1 }); + + train.reverse(); + expect(train.direction).toBe(-1); + }); + }); + + describe('TrainController Class', () => { + test('should create controller with default config', () => { + const controller = new TrainController(); + expect(controller.trackPath).toEqual([]); + expect(controller.progress).toBe(0); + }); + + test('should accept track path configuration', () => { + const path = [ + { x: 0, y: 0 }, + { x: 10, y: 0 }, + { x: 10, y: 10 } + ]; + + const controller = new TrainController(path); + expect(controller.trackPath.length).toBe(3); + }); + + test('should calculate progress along track', () => { + const path = [{ x: 0, y: 0 }, { x: 10, y: 0 }]; + const controller = new TrainController(path); + + controller.setDistance(5); + expect(controller.progress).toBeGreaterThanOrEqual(0); + expect(controller.progress).toBeLessThan(1); + }); + + test('should return current position on track', () => { + const path = [{ x: 0, y: 0 }, { x: 10, y: 0 }]; + const controller = new TrainController(path); + + const position = controller.getCurrentPosition(); + expect(position).toBeDefined(); + expect(position.x).toBeGreaterThanOrEqual(0); + expect(position.x).toBeLessThanOrEqual(10); + }); + }); +});