create-appraisejs 0.3.1-alpha.0 → 0.3.1-alpha.1

package/templates/blank/src/services/report/report-service.test.ts

@@ -17,6 +17,7 @@ const {
   mockTestRunFindUnique,
   mockTestCaseFindMany,
   mockTestCaseMetricsFindMany,
+  mockTestSuiteFindMany,
   mockTestSuiteMetricsFindMany,
   mockUpdateTestSuiteMetrics,
 } = vi.hoisted(() => ({
@@ -33,6 +34,7 @@ const {
   mockTestRunFindUnique: vi.fn(),
   mockTestCaseFindMany: vi.fn(),
   mockTestCaseMetricsFindMany: vi.fn(),
+  mockTestSuiteFindMany: vi.fn(),
   mockTestSuiteMetricsFindMany: vi.fn(),
   mockUpdateTestSuiteMetrics: vi.fn(),
 }))
@@ -53,6 +55,7 @@ vi.mock('@/config/db-config', () => ({
     reportTestCase: { create: mockReportTestCaseCreate },
     testRun: { findUnique: mockTestRunFindUnique },
     testCase: { findMany: mockTestCaseFindMany },
+    testSuite: { findMany: mockTestSuiteFindMany },
     testCaseMetrics: { findMany: mockTestCaseMetricsFindMany },
     testSuiteMetrics: { findMany: mockTestSuiteMetricsFindMany },
   },
@@ -230,15 +233,76 @@ describe('getAllTestSuiteMetricsForFilter', () => {
 
   it('keeps suites never executed or last run before the recent window', async () => {
     const old = new Date('2025-06-01T12:00:00.000Z')
-    const recent = new Date('2025-06-10T12:00:00.000Z')
-    mockTestSuiteMetricsFindMany.mockResolvedValue([
-      { id: 'a', lastExecutedAt: null, testSuite: {} },
-      { id: 'b', lastExecutedAt: old, testSuite: {} },
-      { id: 'c', lastExecutedAt: recent, testSuite: {} },
+    const neverExecutedCreatedAt = new Date('2025-05-01T12:00:00.000Z')
+    mockTestSuiteFindMany.mockResolvedValue([
+      {
+        id: 'suite-a',
+        createdAt: neverExecutedCreatedAt,
+        updatedAt: neverExecutedCreatedAt,
+        metrics: null,
+      },
+      {
+        id: 'suite-b',
+        createdAt: old,
+        updatedAt: old,
+        metrics: {
+          id: 'metric-b',
+          lastExecutedAt: old,
+          createdAt: old,
+          updatedAt: old,
+        },
+      },
+      {
+        id: 'suite-c',
+        createdAt: neverExecutedCreatedAt,
+        updatedAt: neverExecutedCreatedAt,
+        metrics: {
+          id: 'metric-c',
+          lastExecutedAt: null,
+          createdAt: neverExecutedCreatedAt,
+          updatedAt: neverExecutedCreatedAt,
+        },
+      },
     ])
 
     const r = await getAllTestSuiteMetricsForFilter('notExecutedRecently')
-    expect(r.map(x => x.id).sort()).toEqual(['a', 'b'])
+    expect(mockTestSuiteFindMany).toHaveBeenCalledWith({
+      where: {
+        OR: [
+          {
+            metrics: {
+              is: null,
+            },
+          },
+          {
+            metrics: {
+              is: {
+                lastExecutedAt: null,
+              },
+            },
+          },
+          {
+            metrics: {
+              is: {
+                lastExecutedAt: {
+                  lt: new Date('2025-06-08T12:00:00.000Z'),
+                },
+              },
+            },
+          },
+        ],
+      },
+      include: {
+        tags: true,
+        testCases: true,
+        metrics: true,
+      },
+    })
+    expect(r.map(x => x.id).sort()).toEqual(['metric-b', 'metric-c', 'unexecuted-suite-a'])
+    expect(r.find(x => x.id === 'unexecuted-suite-a')).toMatchObject({
+      testSuiteId: 'suite-a',
+      lastExecutedAt: null,
+    })
     expect(RECENT_PERIOD_DAYS).toBe(7)
   })
 })

package/templates/blank/src/services/report/report-service.ts

@@ -428,7 +428,58 @@ export async function getAllTestCaseMetricsForFilter(filter: string) {
 }
 
 export async function getAllTestSuiteMetricsForFilter(filter: string) {
-  let testSuiteMetrics = await prisma.testSuiteMetrics.findMany({
+  if (filter === 'notExecutedRecently') {
+    const recentPeriodDate = new Date()
+    recentPeriodDate.setDate(recentPeriodDate.getDate() - RECENT_PERIOD_DAYS)
+
+    const testSuites = await prisma.testSuite.findMany({
+      where: {
+        OR: [
+          {
+            metrics: {
+              is: null,
+            },
+          },
+          {
+            metrics: {
+              is: {
+                lastExecutedAt: null,
+              },
+            },
+          },
+          {
+            metrics: {
+              is: {
+                lastExecutedAt: {
+                  lt: recentPeriodDate,
+                },
+              },
+            },
+          },
+        ],
+      },
+      include: {
+        tags: true,
+        testCases: true,
+        metrics: true,
+      },
+    })
+
+    return testSuites.map(testSuite => {
+      const metrics = testSuite.metrics
+
+      return {
+        id: metrics?.id ?? `unexecuted-${testSuite.id}`,
+        testSuiteId: testSuite.id,
+        lastExecutedAt: metrics?.lastExecutedAt ?? null,
+        createdAt: metrics?.createdAt ?? testSuite.createdAt,
+        updatedAt: metrics?.updatedAt ?? testSuite.updatedAt,
+        testSuite,
+      }
+    })
+  }
+
+  const testSuiteMetrics = await prisma.testSuiteMetrics.findMany({
     include: {
       testSuite: {
         include: {
@@ -438,13 +489,5 @@ export async function getAllTestSuiteMetricsForFilter(filter: string) {
       },
     },
   })
-  if (filter === 'notExecutedRecently') {
-    const recentPeriodDate = new Date()
-    recentPeriodDate.setDate(recentPeriodDate.getDate() - RECENT_PERIOD_DAYS)
-
-    testSuiteMetrics = testSuiteMetrics.filter(
-      ts => ts.lastExecutedAt === null || ts.lastExecutedAt < recentPeriodDate,
-    )
-  }
   return testSuiteMetrics
 }

package/templates/blank/src/services/shared/errors.ts

@@ -11,8 +11,7 @@ export class ServiceError extends Error {
     this.name = 'ServiceError'
     this.code = code
     this.statusCode =
-      statusCode ??
-      (code === 'NOT_FOUND' ? 404 : code === 'VALIDATION' ? 400 : code === 'CONFLICT' ? 409 : 500)
+      statusCode ?? (code === 'NOT_FOUND' ? 404 : code === 'VALIDATION' ? 400 : code === 'CONFLICT' ? 409 : 500)
   }
 }
 
@@ -31,8 +30,7 @@ export function serviceErrorToActionResponse(error: ServiceError): ActionRespons
  * Maps unknown errors to a 500 ActionResponse.
  */
 export function unknownErrorToActionResponse(error: unknown, logPrefix?: string): ActionResponse {
-  const message =
-    error instanceof Error ? error.message : typeof error === 'string' ? error : 'Unknown error'
+  const message = error instanceof Error ? error.message : typeof error === 'string' ? error : 'Unknown error'
   if (logPrefix) {
     console.error(`${logPrefix}`, error)
   }

package/templates/blank/src/services/template-step/template-step-service.ts

@@ -150,7 +150,9 @@ export async function updateTemplateStep(
   })
 
   const affectedGroupIds = new Set([currentStep.templateStepGroupId, updatedTemplateStep.templateStepGroupId])
-  await Promise.all(Array.from(affectedGroupIds).map(groupId => automationProjectionService.syncTemplateStepGroup(groupId)))
+  await Promise.all(
+    Array.from(affectedGroupIds).map(groupId => automationProjectionService.syncTemplateStepGroup(groupId)),
+  )
 
   return updatedTemplateStep
 }

package/templates/blank/src/services/template-step-group/template-step-group-service.ts

@@ -20,7 +20,9 @@ export async function listTemplateStepGroups(): Promise<TemplateStepGroup[]> {
   return prisma.templateStepGroup.findMany()
 }
 
-export async function createTemplateStepGroup(value: z.infer<typeof templateStepGroupSchema>): Promise<TemplateStepGroup> {
+export async function createTemplateStepGroup(
+  value: z.infer<typeof templateStepGroupSchema>,
+): Promise<TemplateStepGroup> {
   const type: TemplateStepGroupType = (value.type as string) === 'VALIDATION' ? 'VALIDATION' : 'ACTION'
   const description = normalizeOptionalText(value.description)
   const createdGroup = await prisma.templateStepGroup.create({

package/templates/blank/src/services/test-case/test-case-service.ts

@@ -101,11 +101,6 @@ export async function listTestCases() {
           parameters: true,
         },
       },
-      flowBlocks: {
-        include: {
-          nodes: true,
-        },
-      },
       TestSuite: true,
       tags: true,
     },

package/templates/blank/src/services/test-run/test-run-service.test.ts

@@ -499,18 +499,15 @@ describe('test run log storage', () => {
       where: { testRunId: 'run-1' },
       create: {
         testRunId: 'run-1',
-        logs:
-          '[2025-01-01T00:00:00.000Z] [STDOUT] line one\\nline two\n[2025-01-01T00:00:01.000Z] [STDERR] boom',
+        logs: '[2025-01-01T00:00:00.000Z] [STDOUT] line one\\nline two\n[2025-01-01T00:00:01.000Z] [STDERR] boom',
       },
       update: {
-        logs:
-          '[2025-01-01T00:00:00.000Z] [STDOUT] line one\\nline two\n[2025-01-01T00:00:01.000Z] [STDERR] boom',
+        logs: '[2025-01-01T00:00:00.000Z] [STDOUT] line one\\nline two\n[2025-01-01T00:00:01.000Z] [STDERR] boom',
       },
     })
 
     mockTestRunLogFindUnique.mockResolvedValue({
-      logs:
-        '[2025-01-01T00:00:00.000Z] [STDOUT] line one\\nline two\n[2025-01-01T00:00:01.000Z] [STDERR] boom',
+      logs: '[2025-01-01T00:00:00.000Z] [STDOUT] line one\\nline two\n[2025-01-01T00:00:01.000Z] [STDERR] boom',
     })
 
     await expect(getTestRunLogsService('run-1')).resolves.toEqual(logs)

package/templates/blank/src/services/test-run/test-run-service.ts

@@ -124,11 +124,7 @@ async function resolveTagExpressionAndTestCases(value: TestRunFormValue): Promis
   const isFilteringByTestSuites = value.testSuites.length > 0 && value.tags.length === 0
 
   if (!isFilteringByTags && !isFilteringByTestSuites) {
-    throw new ServiceError(
-      'Either tags or test suites must be provided to filter the test run.',
-      'VALIDATION',
-      400,
-    )
+    throw new ServiceError('Either tags or test suites must be provided to filter the test run.', 'VALIDATION', 400)
   }
 
   const { tagExpression, tags, testRunTestCases } = isFilteringByTags
@@ -439,7 +435,11 @@ async function persistLogsAndUpdateRunStatus(args: {
   }
 }
 
-async function storeReportAfterRunIfNeeded(testRunDbId: string, runId: string, reportPath: string | null | undefined): Promise<void> {
+async function storeReportAfterRunIfNeeded(
+  testRunDbId: string,
+  runId: string,
+  reportPath: string | null | undefined,
+): Promise<void> {
   const finalTestRunStatus = await prisma.testRun.findUnique({
     where: { id: testRunDbId },
     select: { status: true },
@@ -687,12 +687,15 @@ export async function deleteTestRunsByIds(ids: string[]): Promise<void> {
       reportPath: true,
       testCases: {
         select: {
+          testCaseId: true,
           tracePath: true,
         },
       },
     },
   })
 
+  const deletedRunTestCaseIds = testRuns.flatMap(testRun => testRun.testCases.map(testCase => testCase.testCaseId))
+
   for (const testRun of testRuns) {
     await fs.rm(getAutomationReportRunDir(testRun.runId), { recursive: true, force: true })
 
@@ -730,7 +733,9 @@ export async function deleteTestRunsByIds(ids: string[]): Promise<void> {
     },
   })
 
-  const allAffectedTestCaseIds = [...new Set(allRecentTestRunTestCases.map(trtc => trtc.testCaseId))]
+  const allAffectedTestCaseIds = [
+    ...new Set([...deletedRunTestCaseIds, ...allRecentTestRunTestCases.map(trtc => trtc.testCaseId)]),
+  ]
 
   if (allAffectedTestCaseIds.length > 0) {
     await recalculateMetricsForTestCases(allAffectedTestCaseIds)

package/templates/blank/src/services/test-suite/test-suite-service.test.ts

@@ -1,11 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { TagType } from '@prisma/client'
 import { automationProjectionService } from '@/lib/automation/projection-service'
-import {
-  createTestSuiteFromInput,
-  deleteTestSuitesByIds,
-  updateTestSuiteFromInput,
-} from './test-suite-service'
+import { createTestSuiteFromInput, deleteTestSuitesByIds, updateTestSuiteFromInput } from './test-suite-service'
 
 vi.mock('@/config/db-config', () => ({
   default: {

package/templates/blank/src/services/test-suite/test-suite-service.ts

@@ -65,6 +65,7 @@ export async function getTestSuiteByIdOrThrow(id: string) {
   const testSuite = await prisma.testSuite.findUnique({
     where: { id },
     include: {
+      module: true,
       testCases: true,
       tags: {
         where: {
@@ -133,10 +134,7 @@ export async function deleteTestSuitesByIds(ids: string[]): Promise<void> {
   }
 }
 
-export async function updateTestSuiteFromInput(
-  value: z.infer<typeof testSuiteSchema>,
-  id: string,
-): Promise<void> {
+export async function updateTestSuiteFromInput(value: z.infer<typeof testSuiteSchema>, id: string): Promise<void> {
   const currentTestSuite = await prisma.testSuite.findUnique({
     where: { id },
     include: {

package/templates/blank/src/types/form/actionHandler.ts

@@ -1,9 +1,5 @@
 /** Payload types for action `data` fields. */
-export type ActionResponseData =
-  | Record<string, unknown>
-  | Record<string, unknown>[]
-  | unknown[]
-  | unknown
+export type ActionResponseData = Record<string, unknown> | Record<string, unknown>[] | unknown[] | unknown
 
 /**
  * Server Action JSON return shape.

package/templates/blank/tsconfig.json

@@ -20,12 +20,12 @@
       "@locator-picker-companion/*": ["./packages/locator-picker-companion/src/*"]
     }
   },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts",
-    ".next/dev/types/**/*.ts"
-  ],
-  "exclude": ["node_modules", "packages/create-appraisejs", "packages/appraisejs", "templates/starter", "templates/blank"]
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts"],
+  "exclude": [
+    "node_modules",
+    "packages/create-appraisejs",
+    "packages/appraisejs",
+    "templates/starter",
+    "templates/blank"
+  ]
 }

package/templates/default/packages/locator-picker-companion/dist/cli.d.ts

@@ -1 +1 @@
-export {};
+export {}