fix schema

Author: going-confetti

src/codegen/browser/convertEventsToActions.ts

@@ -1,4 +1,3 @@
-import { ActionLocator } from '@/main/runner/schema'
 import { BrowserTestAction, LocatorOptions } from '@/schemas/browserTest/v1'
 import {
   BrowserEvent,
@@ -8,7 +7,7 @@ import {
 import { exhaustive } from '@/utils/typescript'
 
 function toLocatorOptions(selector: ElementSelector): LocatorOptions {
-  const values: Partial<Record<ActionLocator['type'], ActionLocator>> = {}
+  const values: LocatorOptions['values'] = {}
 
   values.css = { type: 'css', selector: selector.css }
 
@@ -50,7 +49,9 @@ function toLocatorOptions(selector: ElementSelector): LocatorOptions {
   return { current, values }
 }
 
-function pickBestLocatorType(selector: ElementSelector): ActionLocator['type'] {
+function pickBestLocatorType(
+  selector: ElementSelector
+): LocatorOptions['current'] {
   if (selector.role !== undefined) return 'role'
   if (selector.label !== undefined) return 'label'
   if (selector.alt !== undefined) return 'alt'

src/main/runner/schema.ts

@@ -13,12 +13,12 @@ function safe<T>(schema: z.ZodType<T>) {
 // Generic options schema to allow any options object. Should be refined later.
 const GenericOptions = z.unknown()
 
-const CssLocatorSchema = z.object({
+export const CssLocatorSchema = z.object({
   type: z.literal('css'),
   selector: z.string(),
 })
 
-const GetByRoleLocatorSchema = z.object({
+export const GetByRoleLocatorSchema = z.object({
   type: z.literal('role'),
   role: z.string(),
   options: z
@@ -29,7 +29,7 @@ const GetByRoleLocatorSchema = z.object({
     .optional(),
 })
 
-const GetByTestIdLocatorSchema = z.object({
+export const GetByTestIdLocatorSchema = z.object({
   type: z.literal('testid'),
   testId: z.string(),
 })
@@ -40,31 +40,31 @@ const TextLocatorOptions = z
   })
   .optional()
 
-const GetByAltTextLocatorSchema = z.object({
+export const GetByAltTextLocatorSchema = z.object({
   type: z.literal('alt'),
   text: z.string(),
   options: TextLocatorOptions,
 })
 
-const GetByLabelLocatorSchema = z.object({
+export const GetByLabelLocatorSchema = z.object({
   type: z.literal('label'),
   label: z.string(),
   options: TextLocatorOptions,
 })
 
-const GetByPlaceholderLocatorSchema = z.object({
+export const GetByPlaceholderLocatorSchema = z.object({
   type: z.literal('placeholder'),
   placeholder: z.string(),
   options: TextLocatorOptions,
 })
 
-const GetByTitleLocatorSchema = z.object({
+export const GetByTitleLocatorSchema = z.object({
   type: z.literal('title'),
   title: z.string(),
   options: TextLocatorOptions,
 })
 
-const GetByTextLocatorSchema = z.object({
+export const GetByTextLocatorSchema = z.object({
   type: z.literal('text'),
   text: z.string(),
   options: TextLocatorOptions,

src/schemas/browserTest/v1/index.ts

@@ -1,10 +1,17 @@
 import { z } from 'zod'
 
 import {
-  ActionLocatorSchema,
+  CssLocatorSchema,
   GenericBrowserContextActionSchema,
   GenericLocatorActionSchema,
   GenericPageActionSchema,
+  GetByAltTextLocatorSchema,
+  GetByLabelLocatorSchema,
+  GetByPlaceholderLocatorSchema,
+  GetByRoleLocatorSchema,
+  GetByTestIdLocatorSchema,
+  GetByTextLocatorSchema,
+  GetByTitleLocatorSchema,
   LocatorCheckActionSchema,
   LocatorClearActionSchema,
   LocatorClickActionSchema,
@@ -42,9 +49,20 @@ const ActionLocatorTypeSchema = z.enum([
   'text',
 ])
 
+const LocatorValuesSchema = z.object({
+  css: CssLocatorSchema.optional(),
+  role: GetByRoleLocatorSchema.optional(),
+  testid: GetByTestIdLocatorSchema.optional(),
+  alt: GetByAltTextLocatorSchema.optional(),
+  label: GetByLabelLocatorSchema.optional(),
+  placeholder: GetByPlaceholderLocatorSchema.optional(),
+  title: GetByTitleLocatorSchema.optional(),
+  text: GetByTextLocatorSchema.optional(),
+})
+
 export const LocatorOptionsSchema = z.object({
   current: ActionLocatorTypeSchema,
-  values: z.record(ActionLocatorTypeSchema, ActionLocatorSchema),
+  values: LocatorValuesSchema,
 })
 
 export type LocatorOptions = z.infer<typeof LocatorOptionsSchema>