create-appraisejs 0.1.10-alpha.8 → 0.2.0-alpha.1

package/templates/default/scripts/sync-tags.ts

@@ -13,6 +13,7 @@ import { join } from 'path'
 import prisma from '../src/config/db-config'
 import { scanFeatureFiles, ParsedFeature } from '../src/lib/gherkin-parser'
 import { TagType } from '@prisma/client'
+import { getTagTypeFromName } from '../src/lib/tag-utils'
 
 interface TagData {
   name: string // Without @ prefix, for DB storage
@@ -90,8 +91,7 @@ function buildTagObjects(tagExpressions: Set<string>): TagData[] {
     // Strip @ prefix for name field
     const name = tagExpression.startsWith('@') ? tagExpression.substring(1) : tagExpression
 
-    // Determine type: IDENTIFIER if starts with tc_, otherwise FILTER
-    const type = name.startsWith('tc_') ? TagType.IDENTIFIER : TagType.FILTER
+    const type = getTagTypeFromName(name)
 
     tagObjects.push({
       name,
@@ -289,4 +289,3 @@ async function main() {
 }
 
 main()
-

package/templates/default/scripts/sync-template-step-groups.ts

@@ -151,7 +151,6 @@ function parseGroupJSDoc(content: string): StepGroupJSDoc | null {
  * Scans step definition files in actions and validations directories
  */
 async function scanStepFiles(baseDir: string): Promise<string[]> {
-  const _stepsDir = join(baseDir, 'src', 'tests', 'steps')
   const stepFiles: string[] = []
 
   try {
@@ -405,5 +404,3 @@ async function main() {
 }
 
 main()
-
-

package/templates/default/scripts/sync-template-steps.ts

@@ -16,6 +16,7 @@ import { parse } from '@babel/parser'
 import * as t from '@babel/types'
 import _traverse from '@babel/traverse'
 import type { NodePath } from '@babel/traverse'
+import prettier from 'prettier'
 
 // Handle both ESM and CJS exports
 const traverse = (_traverse as { default?: typeof _traverse }).default ?? _traverse
@@ -66,6 +67,33 @@ interface SyncResult {
   deletedSteps: Array<{ name: string; signature: string; group: string }>
 }
 
+function normalizeOptionalText(value: string | null | undefined): string | null {
+  const normalized = value?.trim()
+  return normalized ? normalized : null
+}
+
+async function normalizeFunctionDefinition(functionDefinition: string | null | undefined): Promise<string> {
+  const source = functionDefinition?.trim()
+  if (!source) {
+    return ''
+  }
+
+  try {
+    return (
+      await prettier.format(source, {
+        parser: 'typescript',
+        semi: true,
+        singleQuote: true,
+        trailingComma: 'es5',
+        printWidth: 80,
+        tabWidth: 2,
+      })
+    ).trim()
+  } catch {
+    return source
+  }
+}
+
 /**
  * Parses JSDoc comment to extract step group metadata
  * Reused from template-step-group-sync.ts
@@ -325,7 +353,6 @@ function extractFunctionDefinition(callExpr: t.CallExpression, keyword: string,
  * Parses a step definition file to extract steps
  */
 function parseStepFile(content: string, filePath: string): StepData | null {
-  // Parse group JSDoc
   const group = parseGroupJSDoc(content)
   if (!group) {
     return null
@@ -482,7 +509,6 @@ async function scanStepFiles(baseDir: string): Promise<string[]> {
  */
 async function syncStepsToDatabase(
   allSteps: Array<{ step: ParsedStep; groupName: string; filePath: string }>,
-  _baseDir: string,
 ): Promise<SyncResult> {
   const result: SyncResult = {
     stepsScanned: 0,
@@ -520,6 +546,8 @@ async function syncStepsToDatabase(
       // Determine step type from group type
       const stepType: TemplateStepType =
         stepGroup.type === TemplateStepGroupType.ACTION ? TemplateStepType.ACTION : TemplateStepType.ASSERTION
+      const description = normalizeOptionalText(step.jsdoc.description)
+      const functionDefinition = await normalizeFunctionDefinition(step.functionDefinition)
 
       // Check if step exists by signature
       const existingStep = await prisma.templateStep.findFirst({
@@ -535,9 +563,9 @@ async function syncStepsToDatabase(
         // Check if update is needed
         const needsUpdate =
           existingStep.name !== step.jsdoc.name ||
-          existingStep.description !== (step.jsdoc.description || '') ||
+          (existingStep.description ?? null) !== description ||
           existingStep.signature !== step.signature ||
-          existingStep.functionDefinition !== step.functionDefinition ||
+          (existingStep.functionDefinition ?? '') !== functionDefinition ||
           existingStep.icon !== step.jsdoc.icon ||
           existingStep.type !== stepType ||
           existingStep.templateStepGroupId !== stepGroup.id
@@ -548,9 +576,9 @@ async function syncStepsToDatabase(
             where: { id: existingStep.id },
             data: {
               name: step.jsdoc.name,
-              description: step.jsdoc.description || '',
+              description,
               signature: step.signature,
-              functionDefinition: step.functionDefinition,
+              functionDefinition,
               icon: step.jsdoc.icon,
               type: stepType,
               templateStepGroupId: stepGroup.id,
@@ -579,9 +607,9 @@ async function syncStepsToDatabase(
         await prisma.templateStep.create({
           data: {
             name: step.jsdoc.name,
-            description: step.jsdoc.description || '',
+            description,
             signature: step.signature,
-            functionDefinition: step.functionDefinition,
+            functionDefinition,
             icon: step.jsdoc.icon,
             type: stepType,
             templateStepGroupId: stepGroup.id,
@@ -790,7 +818,7 @@ async function main() {
 
     // Sync to database
     console.log('\n✅ Syncing template steps to database...')
-    const result = await syncStepsToDatabase(allSteps, baseDir)
+    const result = await syncStepsToDatabase(allSteps)
 
     // Add parsing errors to result
     result.errors.push(...errors)
@@ -813,5 +841,3 @@ async function main() {
 }
 
 main()
-
-

package/templates/default/scripts/sync-test-cases.ts

@@ -18,6 +18,11 @@ import {
 import { buildModuleHierarchy, findModuleByPath } from '../src/lib/module-hierarchy-builder'
 import { TemplateStepType, TemplateStepIcon, StepParameterType, TagType } from '@prisma/client'
 import { ensureAutomationWorkspaceReady, getAutomationFeaturesDir } from '../src/lib/automation/paths'
+import {
+  determineProjectedStepIcon,
+  getTestSuiteFilesystemKey,
+  normalizeProjectedDbTestCaseSteps,
+} from '../src/lib/sync/projected-feature-utils'
 
 interface TestCaseFromFS {
   identifierTag: string // @tc_... tag
@@ -39,6 +44,7 @@ interface ParameterMatch {
 
 interface TemplateStepMatch {
   templateStepId: string
+  signature: string
   parameters: ParameterMatch[]
 }
 
@@ -259,6 +265,7 @@ async function matchGherkinStepToTemplateStep(gherkinStep: ParsedStep): Promise<
       if (parameters !== null) {
         return {
           templateStepId: templateStep.id,
+          signature: templateStep.signature,
           parameters,
         }
       }
@@ -291,6 +298,22 @@ function determineStepTypeAndIcon(keyword: string): { type: TemplateStepType; ic
   }
 }
 
+function sameResolvedParameters(left: ParameterMatch[], right: ParameterMatch[]): boolean {
+  if (left.length !== right.length) {
+    return false
+  }
+
+  return left.every((parameter, index) => {
+    const other = right[index]
+    return (
+      parameter.name === other?.name &&
+      parameter.value === other?.value &&
+      parameter.order === other?.order &&
+      parameter.type === other?.type
+    )
+  })
+}
+
 /**
  * Finds or creates a tag by tag expression
  * If the tag exists but has a different type, updates it to the correct type
@@ -341,12 +364,18 @@ async function syncTestCaseSteps(testCaseId: string, steps: ParsedStep[], result
       where: { testCaseId },
       orderBy: { order: 'asc' },
       include: {
+        TemplateStep: {
+          select: {
+            signature: true,
+          },
+        },
         parameters: true,
       },
     })
 
     // Create a map of existing steps by order
     const existingStepsMap = new Map(existingSteps.map(step => [step.order, step]))
+    const projectedExistingStepsMap = new Map(normalizeProjectedDbTestCaseSteps(existingSteps).map(step => [step.order, step]))
 
     // Process each step from filesystem
     for (const step of steps) {
@@ -365,11 +394,22 @@ async function syncTestCaseSteps(testCaseId: string, steps: ParsedStep[], result
       const gherkinStep = `${step.keyword} ${step.text}`
 
       if (existingStep) {
+        const projectedExistingStep = projectedExistingStepsMap.get(step.order)
+        const matchesProjectedState =
+          projectedExistingStep != null &&
+          projectedExistingStep.gherkinStep === gherkinStep &&
+          projectedExistingStep.label === step.text &&
+          projectedExistingStep.icon === determineProjectedStepIcon(step.keyword) &&
+          projectedExistingStep.templateStepSignature === match.signature &&
+          sameResolvedParameters(projectedExistingStep.parameters, match.parameters)
+
         // Update existing step if needed
         const needsUpdate =
-          existingStep.gherkinStep !== gherkinStep ||
-          existingStep.templateStepId !== match.templateStepId ||
-          existingStep.label !== step.text
+          !matchesProjectedState &&
+          (existingStep.gherkinStep !== gherkinStep ||
+            existingStep.templateStepId !== match.templateStepId ||
+            existingStep.label !== step.text ||
+            existingStep.icon !== icon)
 
         if (needsUpdate) {
           await prisma.testCaseStep.update({
@@ -451,6 +491,7 @@ async function syncTestCasesToDatabase(testCasesFromFS: TestCaseFromFS[], result
 
   // Track test cases from filesystem (by identifier tag)
   const fsTestCaseTags = new Set<string>()
+  const suitesByModuleId = new Map<string, Array<{ id: string; name: string }>>()
 
   for (const testCase of testCasesFromFS) {
     try {
@@ -465,12 +506,23 @@ async function syncTestCasesToDatabase(testCasesFromFS: TestCaseFromFS[], result
       }
 
       // Find test suite
-      const testSuite = await prisma.testSuite.findFirst({
-        where: {
-          name: testCase.testSuiteName,
-          moduleId: moduleId,
-        },
-      })
+      let moduleSuites = suitesByModuleId.get(moduleId)
+      if (!moduleSuites) {
+        moduleSuites = await prisma.testSuite.findMany({
+          where: {
+            moduleId: moduleId,
+          },
+          select: {
+            id: true,
+            name: true,
+          },
+        })
+        suitesByModuleId.set(moduleId, moduleSuites)
+      }
+
+      const testSuite = moduleSuites.find(
+        suite => getTestSuiteFilesystemKey(suite.name) === getTestSuiteFilesystemKey(testCase.testSuiteName),
+      )
 
       if (!testSuite) {
         result.errors.push(`Test suite '${testCase.testSuiteName}' not found in module '${testCase.modulePath}'`)
@@ -509,8 +561,11 @@ async function syncTestCasesToDatabase(testCasesFromFS: TestCaseFromFS[], result
 
       if (identifierTag && identifierTag.testCases.length > 0) {
         // Test case exists - update it
+        const matchedExistingTestCaseSummary =
+          identifierTag.testCases.find(existingCase => existingCase.TestSuite.some(suite => suite.id === testSuite.id)) ??
+          identifierTag.testCases[0]
         const existingTestCase = await prisma.testCase.findUnique({
-          where: { id: identifierTag.testCases[0].id },
+          where: { id: matchedExistingTestCaseSummary.id },
           include: {
             tags: true,
             TestSuite: true,
@@ -531,16 +586,15 @@ async function syncTestCasesToDatabase(testCasesFromFS: TestCaseFromFS[], result
 
         const newFilterTagIds = filterTagIds.sort()
         const tagsChanged = JSON.stringify(currentFilterTagIds) !== JSON.stringify(newFilterTagIds)
+        const isAssociated = existingTestCase.TestSuite.some(ts => ts.id === testSuite.id)
 
         const needsUpdate =
           existingTestCase.title !== testCase.title ||
           existingTestCase.description !== testCase.description ||
-          tagsChanged
+          tagsChanged ||
+          !isAssociated
 
         if (needsUpdate) {
-          // Check if test case is already associated with this test suite
-          const isAssociated = existingTestCase.TestSuite.some(ts => ts.id === testSuite.id)
-
           await prisma.testCase.update({
             where: { id: existingTestCase.id },
             data: {
@@ -904,5 +958,3 @@ async function main() {
 
 main()
 
-
-

package/templates/default/scripts/sync-test-suites.ts

@@ -13,6 +13,7 @@ import prisma from '../src/config/db-config'
 import { scanFeatureFiles, extractModulePathFromFilePath, ParsedFeature } from '../src/lib/gherkin-parser'
 import { buildModuleHierarchy, findModuleByPath, getAllModulesWithPaths } from '../src/lib/module-hierarchy-builder'
 import { ensureAutomationWorkspaceReady, getAutomationFeaturesDir } from '../src/lib/automation/paths'
+import { getTestSuiteSyncIdentity, getTestSuiteFilesystemKey } from '../src/lib/sync/projected-feature-utils'
 
 interface TestSuiteFromFS {
   name: string // From filename (without .feature extension)
@@ -142,7 +143,7 @@ async function syncTestSuitesToDatabase(
   
   for (const testSuite of testSuitesFromFS) {
     try {
-      const key = `${testSuite.name}::${testSuite.modulePath}`
+      const key = getTestSuiteSyncIdentity(testSuite.name, testSuite.modulePath)
       fsTestSuiteKeys.add(key)
       
       // Ensure module exists
@@ -154,15 +155,17 @@ async function syncTestSuitesToDatabase(
       }
       
       // Find existing test suite by name and moduleId
-      const existingTestSuite = await prisma.testSuite.findFirst({
+      const existingTestSuites = await prisma.testSuite.findMany({
         where: {
-          name: testSuite.name,
           moduleId: moduleId,
         },
         include: {
           tags: true,
         },
       })
+      const existingTestSuite = existingTestSuites.find(
+        candidate => getTestSuiteFilesystemKey(candidate.name) === getTestSuiteFilesystemKey(testSuite.name),
+      )
       
       // Find tag IDs
       const tagIds = await findTagIdsByExpressions(testSuite.tags)
@@ -271,7 +274,7 @@ async function syncTestSuitesToDatabase(
   for (const dbTestSuite of allDbTestSuites) {
     try {
       const modulePath = modulePathMap.get(dbTestSuite.moduleId) || '/'
-      const key = `${dbTestSuite.name}::${modulePath}`
+      const key = getTestSuiteSyncIdentity(dbTestSuite.name, modulePath)
       
       if (!fsTestSuiteKeys.has(key)) {
         // Check if test suite has test cases (for logging)
@@ -411,4 +414,3 @@ async function main() {
 main()
 
 
-

package/templates/default/src/actions/conflict/conflict.action.ts

@@ -1,33 +1,33 @@
-'use server'
-
-import { ActionResponse } from '@/types/form/actionHandler'
-import prisma from '@/config/db-config'
-import { revalidatePath } from 'next/cache'
-
-export async function resolveConflictsAction(conflictIds: string[]): Promise<ActionResponse> {
-  try {
-    const updatedConflicts = await prisma.conflictResolution.updateMany({
-      where: { entityId: { in: conflictIds } },
-      data: { resolved: true },
-    })
-
-    revalidatePath('/locators')
-
-    if (updatedConflicts.count === 0) {
-      return {
-        status: 404,
-        error: 'No conflicts found',
-      }
-    }
-    return {
-      status: 200,
-      data: updatedConflicts.count,
-      message: 'Conflicts resolved successfully',
-    }
-  } catch (error) {
-    return {
-      status: 500,
-      error: `Server error occurred: ${error}`,
-    }
-  }
-}
+'use server'
+
+import { ActionResponse } from '@/types/form/actionHandler'
+import prisma from '@/config/db-config'
+import { revalidatePath } from 'next/cache'
+
+export async function resolveConflictsAction(conflictIds: string[]): Promise<ActionResponse> {
+  try {
+    const updatedConflicts = await prisma.conflictResolution.updateMany({
+      where: { entityId: { in: conflictIds } },
+      data: { resolved: true },
+    })
+
+    revalidatePath('/locators')
+
+    if (updatedConflicts.count === 0) {
+      return {
+        status: 404,
+        error: 'No conflicts found',
+      }
+    }
+    return {
+      status: 200,
+      data: updatedConflicts.count,
+      message: 'Conflicts resolved successfully',
+    }
+  } catch (error) {
+    return {
+      status: 500,
+      error: `Server error occurred: ${error}`,
+    }
+  }
+}