little stabilizations around recorder

Author: toddtarsi

packages/selenium-ide/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/selenium-ide",
-  "version": "4.0.0-alpha.51",
+  "version": "4.0.0-alpha.52",
   "private": true,
   "description": "Selenium IDE electron app",
   "author": "Todd <[email protected]>",

packages/selenium-ide/src/main/session/controllers/Recorder/index.ts

@@ -1,6 +1,14 @@
 import { CommandShape } from '@seleniumhq/side-model'
-import { getActiveCommand, getActiveTest, getActiveCommandIndex } from '@seleniumhq/side-api/dist/helpers/getActiveData'
-import { LocatorFields, CoreSessionData, RecordNewCommandInput } from '@seleniumhq/side-api'
+import {
+  getActiveCommand,
+  getActiveTest,
+  getActiveCommandIndex,
+} from '@seleniumhq/side-api/dist/helpers/getActiveData'
+import {
+  LocatorFields,
+  CoreSessionData,
+  RecordNewCommandInput,
+} from '@seleniumhq/side-api'
 import { randomInt, randomUUID } from 'crypto'
 import { relative } from 'node:path'
 import BaseController from '../Base'
@@ -46,16 +54,17 @@ const getFrameTraversalCommands = (
 const getLastActiveWindowHandleId = (session: CoreSessionData): string => {
   const activeTest = getActiveTest(session)
   const activeIndex = getActiveCommandIndex(session)
-  console.log(activeTest, activeIndex)
-  const commands = activeTest.commands
-  for (let i = activeIndex; i >= 0; i--) {
-    let item = commands[i]
-    if (item.command == 'selectWindow') {
-      let target = item.target as string
-      return target.substring('handle=${'.length, target.length - 1)
-    }
-    if (item.command == 'storeWindowHandle') {
-      return item.target as string
+  if (activeIndex > -1) {
+    const commands = activeTest.commands
+    for (let i = activeIndex; i >= 0; i--) {
+      let item = commands[i]
+      if (item.command == 'selectWindow') {
+        let target = item.target as string
+        return target.substring('handle=${'.length, target.length - 1)
+      }
+      if (item.command == 'storeWindowHandle') {
+        return item.target as string
+      }
     }
   }
 
@@ -72,14 +81,12 @@ export default class RecorderController extends BaseController {
       return null
     }
     const commands = []
-    if (
-      getLastActiveWindowHandleId(session) != cmd.winHandleId 
-    ) {
+    if (getLastActiveWindowHandleId(session) != cmd.winHandleId) {
       const selectWindowCommand: CommandShape = {
         id: randomUUID(),
         command: 'selectWindow',
-        target: 'handle=${'+cmd.winHandleId+'}',
-        value: ''
+        target: 'handle=${' + cmd.winHandleId + '}',
+        value: '',
       }
       commands.push(selectWindowCommand)
     }
@@ -90,19 +97,21 @@ export default class RecorderController extends BaseController {
       targets: Array.isArray(cmd.target) ? cmd.target : [[cmd.target, '']],
       value: Array.isArray(cmd.value) ? cmd.value[0][0] : cmd.value,
     }
-    const windows = BrowserWindow.getAllWindows();
-    const newWindowIDs = windows.map((window) => window.id);
-    const opensWindow = this.windowIDs.length < newWindowIDs.length;
+    const windows = BrowserWindow.getAllWindows()
+    const newWindowIDs = windows.map((window) => window.id)
+    const opensWindow = this.windowIDs.length < newWindowIDs.length
     if (opensWindow) {
       mainCommand.opensWindow = true
       mainCommand.windowHandleName = `win${randomInt(1, 9999)}`
     }
-    this.windowIDs = windows.map((window) => window.id);
+    this.windowIDs = windows.map((window) => window.id)
 
-    commands.push(...getFrameTraversalCommands(
-      session.state.recorder.activeFrame,
-      cmd.frameLocation as string
-    ))
+    commands.push(
+      ...getFrameTraversalCommands(
+        session.state.recorder.activeFrame,
+        cmd.frameLocation as string
+      )
+    )
     commands.push(mainCommand)
     return commands
   }
@@ -137,16 +146,18 @@ export default class RecorderController extends BaseController {
     const activeTest = getActiveTest(session)
     const activeIndex = getActiveCommandIndex(session)
 
-    const commands = activeTest.commands
-    for (let i = activeIndex; i >= 0; i--) {
-      let item = commands[i]
-      if (item.opensWindow && item.windowHandleName) {
-        return item.windowHandleName
-      }
-
-      if (item.command == 'selectWindow') {
-        let target = item.target as string
-        return target.substring('handle=${'.length, target.length - 1)
+    if (activeIndex > -1) {
+      const commands = activeTest.commands
+      for (let i = activeIndex; i >= 0; i--) {
+        let item = commands[i]
+        if (item.opensWindow && item.windowHandleName) {
+          return item.windowHandleName
+        }
+
+        if (item.command == 'selectWindow') {
+          let target = item.target as string
+          return target.substring('handle=${'.length, target.length - 1)
+        }
       }
     }
     return 'root'
@@ -192,7 +203,6 @@ export default class RecorderController extends BaseController {
       }
       let url = new URL(currentCommand.target as string, state.project.url)
       playbackWindow.webContents.loadURL(url.toString())
-      
     }
     playbackWindow.focus()
     return null

packages/side-api/src/helpers/getActiveData.ts

@@ -38,8 +38,13 @@ export const getActiveCommand = (
   return activeTest.commands[activeCommandIndex] || defaultCommand
 }
 
-export const getActiveCommandIndex = (session: CoreSessionData): number =>
-  session.state.editor.selectedCommandIndexes.slice(-1)[0]
+export const getActiveCommandIndex = (session: CoreSessionData): number => {
+  const commands = getActiveTest(session).commands
+  if (!commands.length) {
+    return -1
+  }
+  return session.state.editor.selectedCommandIndexes.slice(-1)[0]
+}
 
 export const getCommandIndex = (
   session: CoreSessionData,