@codeyam/codeyam-cli 0.1.0-staging.b8a55ba → 0.1.0-staging.c90f8c9

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateScenarioData.ts

@@ -23,81 +23,52 @@ export interface GenerateScenarioDataArgs {
 }
 
 /**
- * Extract the hook/function name from any mock data key format.
- * Supports:
- * - Canonical: "EntityName::hookName::index" -> "hookName"
- * - Variable-qualified: "varName <- funcName" -> "funcName"
- * - Simple with parens: "funcName()" -> "funcName"
- * - Simple: "funcName" -> "funcName"
+ * Consolidates dataForMocks from the current analysis and all dependent analyses.
+ *
+ * Keys are preserved as original call signatures (e.g., 'useFetcher<UserData>()',
+ * 'db.select(usersQuery)'). When the same call signature appears from multiple
+ * analyses, schemas are merged.
  */
-function extractHookName(key: string): string | null {
-  // Canonical: "EntityName::hookName::index"
-  const canonicalMatch = key.match(/^[^:]+::([^:]+)::\d+$/);
-  if (canonicalMatch) return canonicalMatch[1];
-
-  // Variable-qualified: "varName <- funcName"
-  const varQualMatch = key.match(/<- (\w+)$/);
-  if (varQualMatch) return varQualMatch[1];
-
-  // Simple with parens: "funcName()" -> "funcName"
-  const simpleParensMatch = key.match(/^(\w+)\(\)$/);
-  if (simpleParensMatch) return simpleParensMatch[1];
-
-  // Simple: "funcName" (alphanumeric only)
-  const simpleMatch = key.match(/^(\w+)$/);
-  if (simpleMatch) return simpleMatch[1];
-
-  return null;
-}
-
-/**
- * Check if two schemas are structurally equivalent (same shape).
- * Uses JSON.stringify for deep comparison.
- */
-function schemasMatch(a: unknown, b: unknown): boolean {
-  return JSON.stringify(a) === JSON.stringify(b);
-}
-
 export function gatherDataForMocks(
   analysis: ReadonlyAnalysis,
   dependentAnalyses: ReadonlyAnalysisMap,
-  rootEntityName?: string,
+  _rootEntityName?: string, // Kept for API compatibility but no longer used for key transformation
 ): Analysis['metadata']['scenariosDataStructure']['dataForMocks'] {
   const dataForMocks: Analysis['metadata']['scenariosDataStructure']['dataForMocks'] =
     {};
   const analysesGathered = new Set<string>();
 
-  // Track hook indices for assigning new indices when schemas differ
-  const hookIndices: Record<string, number> = {};
-
   /**
-   * Find an existing key in dataForMocks that has the same hook name
-   * and matching schema. Returns the key if found, null otherwise.
+   * Helper to merge schemas (only works for objects, otherwise just returns new value)
    */
-  const findMatchingKey = (
-    hookName: string,
-    schema: unknown,
-  ): string | null => {
-    for (const existingKey of Object.keys(dataForMocks)) {
-      const existingHook = extractHookName(existingKey);
-      if (
-        existingHook === hookName &&
-        schemasMatch(dataForMocks[existingKey], schema)
-      ) {
-        return existingKey;
-      }
+  const mergeSchemas = (
+    existing: JsonTypeDefinition[keyof JsonTypeDefinition],
+    incoming: JsonTypeDefinition[keyof JsonTypeDefinition],
+  ): JsonTypeDefinition[keyof JsonTypeDefinition] => {
+    // Only merge if both are objects (not arrays, not primitives)
+    if (
+      typeof existing === 'object' &&
+      existing !== null &&
+      !Array.isArray(existing) &&
+      typeof incoming === 'object' &&
+      incoming !== null &&
+      !Array.isArray(incoming)
+    ) {
+      return mergeJsonTypeDefinitions(
+        existing as JsonTypeDefinition,
+        incoming as JsonTypeDefinition,
+      );
     }
-    return null;
+    // For primitives/arrays, just use the incoming value
+    return incoming;
   };
 
   /**
-   * Add mock data, consolidating by hook name and schema when rootEntityName is provided.
-   * - Same hook + same schema = merge into existing key
-   * - Same hook + different schema = new key with incremented index
-   * - All keys normalized to "RootEntity::hookName::index" format when rootEntityName provided
+   * Add mock data, preserving original call signature as key.
+   * Merges schemas when the same key appears from multiple sources.
    */
   const addMockData = (
-    originalKey: string,
+    key: string,
     schema: JsonTypeDefinition[keyof JsonTypeDefinition],
   ): void => {
     // Skip if schema is empty object
@@ -115,77 +86,11 @@ export function gatherDataForMocks(
       return;
     }
 
-    const typedSchema = schema as
-      | JsonTypeDefinition
-      | string
-      | string[]
-      | JsonTypeDefinition[];
-
-    // Helper to merge schemas (only works for objects, otherwise just returns new value)
-    const mergeSchemas = (
-      existing: JsonTypeDefinition[keyof JsonTypeDefinition],
-      incoming: typeof typedSchema,
-    ): JsonTypeDefinition[keyof JsonTypeDefinition] => {
-      // Only merge if both are objects (not arrays, not primitives)
-      if (
-        typeof existing === 'object' &&
-        existing !== null &&
-        !Array.isArray(existing) &&
-        typeof incoming === 'object' &&
-        incoming !== null &&
-        !Array.isArray(incoming)
-      ) {
-        return mergeJsonTypeDefinitions(
-          existing as JsonTypeDefinition,
-          incoming as JsonTypeDefinition,
-        );
-      }
-      // For primitives/arrays, just use the incoming value
-      return incoming;
-    };
-
-    // If no rootEntityName, use legacy behavior (preserve original key)
-    if (!rootEntityName) {
-      if (dataForMocks?.[originalKey]) {
-        dataForMocks[originalKey] = mergeSchemas(
-          dataForMocks[originalKey],
-          typedSchema,
-        );
-      } else if (dataForMocks) {
-        dataForMocks[originalKey] = typedSchema;
-      }
-      return;
-    }
-
-    // Extract hook name for consolidation
-    const hookName = extractHookName(originalKey);
-    if (!hookName) {
-      // Can't parse - preserve original key
-      if (dataForMocks?.[originalKey]) {
-        dataForMocks[originalKey] = mergeSchemas(
-          dataForMocks[originalKey],
-          typedSchema,
-        );
-      } else if (dataForMocks) {
-        dataForMocks[originalKey] = typedSchema;
-      }
-      return;
-    }
-
-    // Look for existing key with same hook and matching schema
-    const matchingKey = findMatchingKey(hookName, typedSchema);
-    if (matchingKey && dataForMocks) {
-      // Same hook + same schema - merge into existing key
-      dataForMocks[matchingKey] = mergeSchemas(
-        dataForMocks[matchingKey],
-        typedSchema,
-      );
-    } else if (dataForMocks) {
-      // Different schema or first occurrence - create new canonical key
-      const index = hookIndices[hookName] ?? 0;
-      hookIndices[hookName] = index + 1;
-      const targetKey = `${rootEntityName}::${hookName}::${index}`;
-      dataForMocks[targetKey] = typedSchema;
+    // Preserve original key (call signature), merge if exists
+    if (dataForMocks[key]) {
+      dataForMocks[key] = mergeSchemas(dataForMocks[key], schema);
+    } else {
+      dataForMocks[key] = schema;
     }
   };
 
@@ -286,6 +191,7 @@ export default async function generateScenarioData({
         entity,
         structure,
         scenarios,
+        executionFlows: analysis.metadata.executionFlows,
         analysis,
         model,
       }),

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateScenarios.ts

@@ -57,7 +57,7 @@ export default async function generateScenarios({
           description: 'The only external state the component can be in.',
           metadata: {
             testName: 'it("renders correctly")',
-            keyAttributeInstructions: {},
+            coveredFlows: [],
           },
         },
       ];
@@ -72,8 +72,7 @@ export default async function generateScenarios({
     () =>
       generateEntityScenarios({
         entity,
-        keyAttributes: analysis.metadata.keyAttributes,
-        dependentAnalyses,
+        executionFlows: analysis.metadata.executionFlows,
         analysis,
         error,
         model,