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

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

@@ -21,6 +21,25 @@ function cleanFunctionName(functionName: string) {
   return functionName?.split('<')[0];
 }
 
+// Extract the type parameter from a function name, e.g., 'useFetcher<{ data: UserData }>()' -> '{ data: UserData }'
+function getTypeParameter(functionName: string): string | null {
+  if (!functionName) return null;
+  const openBracket = functionName.indexOf('<');
+  if (openBracket === -1) return null;
+  // Find matching closing bracket, accounting for nested brackets
+  let depth = 0;
+  for (let i = openBracket; i < functionName.length; i++) {
+    if (functionName[i] === '<') depth++;
+    else if (functionName[i] === '>') {
+      depth--;
+      if (depth === 0) {
+        return functionName.slice(openBracket + 1, i);
+      }
+    }
+  }
+  return null;
+}
+
 // Check if schemaPathPart matches or is a function call variant of pathPart
 // e.g., 'isEntityBeingAnalyzed(entity.sha)' matches 'isEntityBeingAnalyzed'
 function pathPartMatches(pathPart: string, schemaPathPart: string): boolean {
@@ -74,47 +93,6 @@ export default function mergeInDependentDataStructure({
     };
   };
 }) {
-  // writeFile(
-  //   'mergeInDependentDataStructure-debug.json',
-  //   JSON.stringify(
-  //     {
-  //       importedExports: importedExports.map((d) => ({
-  //         filePath: d.filePath,
-  //         name: d.name,
-  //         isMocked: d.isMocked,
-  //       })),
-  //       dependentAnalyses: Object.keys(dependentAnalyses).reduce(
-  //         (pathAcc: Record<string, any>, filePath) => {
-  //           pathAcc[filePath] = Object.keys(dependentAnalyses[filePath]).reduce(
-  //             (nameAcc, name) => {
-  //               nameAcc[name] = {
-  //                 metadata: {
-  //                   mergedDataStructure:
-  //                     dependentAnalyses[filePath][name].metadata
-  //                       .mergedDataStructure,
-  //                 },
-  //               };
-  //               return nameAcc;
-  //             },
-  //             {} as { [name: string]: {
-  //               metadata?: {
-  //                 mergedDataStructure?: ReadonlyAnalysis['metadata']['mergedDataStructure'];
-  //               };
-  //             } },
-  //           );
-  //           return pathAcc;
-  //         },
-  //         {},
-  //       ),
-  //       rootScopeName,
-  //       dataStructure,
-  //       dependencySchemas,
-  //     },
-  //     null,
-  //     2,
-  //   ),
-  // ).catch(() => {});
-
   const mergedDataStructure: Omit<
     DataStructure,
     'equivalentSignatureVariables'
@@ -127,6 +105,44 @@ export default function mergeInDependentDataStructure({
     environmentVariables: [...(dataStructure.environmentVariables || [])],
   };
 
+  // Build a set of functions that have multiple DIFFERENT type parameters.
+  // For these functions, we must NOT normalize paths to avoid merging different schemas.
+  // e.g., if we have both useFetcher<{ data: UserData }>() and useFetcher<{ data: ConfigData }>(),
+  // they must stay separate and not both become 'returnValue'.
+  const functionsWithMultipleTypeParams = new Set<string>();
+  const typeParamsByFunction: Record<string, Set<string>> = {};
+
+  // Helper to scan a schema for type parameters
+  const scanSchemaForTypeParams = (schema: { [key: string]: string }) => {
+    for (const schemaPath of Object.keys(schema ?? {})) {
+      const parts = splitOutsideParenthesesAndArrays(schemaPath);
+      if (parts.length > 0) {
+        const firstPart = parts[0];
+        const typeParam = getTypeParameter(firstPart);
+        if (typeParam) {
+          const baseName = cleanFunctionName(firstPart);
+          typeParamsByFunction[baseName] ||= new Set();
+          typeParamsByFunction[baseName].add(typeParam);
+          if (typeParamsByFunction[baseName].size > 1) {
+            functionsWithMultipleTypeParams.add(baseName);
+          }
+        }
+      }
+    }
+  };
+
+  // Scan the root entity's schema
+  scanSchemaForTypeParams(dataStructure.returnValueSchema);
+
+  // Also scan all dependency schemas for type parameters
+  for (const filePath of Object.keys(dependencySchemas ?? {})) {
+    for (const name of Object.keys(dependencySchemas[filePath] ?? {})) {
+      scanSchemaForTypeParams(
+        dependencySchemas[filePath][name]?.returnValueSchema,
+      );
+    }
+  }
+
   let equivalentSchemaPaths: {
     equivalentRoots: {
       schemaRootPath: string;
@@ -185,6 +201,15 @@ export default function mergeInDependentDataStructure({
       const pathParts = splitOutsideParenthesesAndArrays(path);
       if (pathParts.length > 1) {
         if (pathParts[1].startsWith('functionCallReturnValue')) {
+          // Check if this function has multiple DIFFERENT type parameters.
+          // If so, DON'T normalize to returnValue - keep the full path to avoid
+          // merging different type-parameterized variants together.
+          // e.g., useFetcher<{ data: UserData }>().functionCallReturnValue.data
+          // should NOT be merged with useFetcher<{ data: ConfigData }>().functionCallReturnValue.data
+          const baseName = cleanFunctionName(pathParts[0]);
+          if (functionsWithMultipleTypeParams.has(baseName)) {
+            return path; // Keep the original path with type parameters
+          }
           // functionCallReturnValue immediately follows - normalize to returnValue
           // e.g., useAuth().functionCallReturnValue.user -> returnValue.user
           return joinParenthesesAndArrays([
@@ -324,10 +349,14 @@ export default function mergeInDependentDataStructure({
                 splitOutsideParenthesesAndArrays(schemaPath);
 
               if (schemaPathParts[0].startsWith(functionName)) {
-                schemaPathParts =
-                  schemaPathParts[1] === 'functionCallReturnValue'
-                    ? ['returnValue', ...schemaPathParts.slice(2)]
-                    : schemaPathParts.slice(1);
+                // Only normalize if the function doesn't have multiple different type parameters
+                const baseName = cleanFunctionName(schemaPathParts[0]);
+                if (!functionsWithMultipleTypeParams.has(baseName)) {
+                  schemaPathParts =
+                    schemaPathParts[1] === 'functionCallReturnValue'
+                      ? ['returnValue', ...schemaPathParts.slice(2)]
+                      : schemaPathParts.slice(1);
+                }
               }
 
               if (schemaPathParts.length < pathParts.length) continue;
@@ -927,6 +956,87 @@ export default function mergeInDependentDataStructure({
     cleanSchema(depSchema.returnValueSchema);
   }
 
+  // Process the input dependencySchemas FIRST (before child dependentAnalyses).
+  // This ensures the parent entity's direct usage of dependencies takes precedence.
+  // When both parent and child use the same dependency (e.g., useLoaderData),
+  // the parent's schema paths are preserved, and child's paths are merged in later.
+  //
+  // Some dependencies (like .d.ts type declaration files) may not have:
+  // - Equivalencies with the root scope
+  // - A dependent analysis (they're just type declarations)
+  // - Be marked as mocked
+  // Without this, their schemas would be lost entirely.
+  for (const filePath in dependencySchemas) {
+    for (const name in dependencySchemas[filePath]) {
+      const srcSchema = dependencySchemas[filePath][name];
+      if (!srcSchema) continue;
+
+      // Skip mocked dependencies - they were already processed above with path normalization
+      if (mockedDependencies.has(`${filePath}::${name}`)) {
+        continue;
+      }
+
+      // Check if this dependency was already processed by equivalencies
+      const existingSchema =
+        mergedDataStructure.dependencySchemas[filePath]?.[name];
+
+      // Only add if no existing schema (equivalencies didn't process it)
+      if (!existingSchema) {
+        const depSchema = findOrCreateDependentSchemas({ filePath, name });
+        for (const path in srcSchema.returnValueSchema) {
+          depSchema.returnValueSchema[path] = srcSchema.returnValueSchema[path];
+        }
+        for (const path in srcSchema.signatureSchema) {
+          depSchema.signatureSchema[path] = srcSchema.signatureSchema[path];
+        }
+
+        // Clean known object functions (like String.prototype.replace, Array.prototype.map)
+        // from the copied schema. Without this, method call paths on primitives like
+        // "projectSlug.replace(...)" would cause convertDotNotation to create nested
+        // object structures instead of preserving the primitive type.
+        cleanSchema(depSchema.returnValueSchema);
+      }
+
+      // For functions with multiple different type parameters, also create separate entries
+      // for each type-parameterized variant. This allows gatherDataForMocks to look up
+      // the specific schema for each call signature.
+      // This runs regardless of whether the base entry already existed, since we need
+      // the separate variant entries for proper schema lookup.
+      const baseName = cleanFunctionName(name);
+      if (functionsWithMultipleTypeParams.has(baseName)) {
+        // Find all unique type-parameterized call signatures in the schema
+        const typeParamVariants = new Set<string>();
+        for (const path of Object.keys(srcSchema.returnValueSchema)) {
+          const parts = splitOutsideParenthesesAndArrays(path);
+          if (
+            parts.length > 0 &&
+            parts[0].includes('<') &&
+            parts[0].endsWith(')')
+          ) {
+            typeParamVariants.add(parts[0]);
+          }
+        }
+
+        // Create a separate entry for each type-parameterized variant
+        for (const variant of typeParamVariants) {
+          const variantSchema = findOrCreateDependentSchemas({
+            filePath,
+            name: variant,
+          });
+
+          // Copy only paths that belong to this variant
+          for (const path in srcSchema.returnValueSchema) {
+            if (path.startsWith(variant)) {
+              variantSchema.returnValueSchema[path] =
+                srcSchema.returnValueSchema[path];
+            }
+          }
+          cleanSchema(variantSchema.returnValueSchema);
+        }
+      }
+    }
+  }
+
   // Ensure ALL dependencies from dependentAnalyses are included in dependencySchemas,
   // even if they have no equivalencies with the root scope.
   // This preserves nested functionCallReturnValue paths that would otherwise be lost.
@@ -1002,39 +1112,5 @@ export default function mergeInDependentDataStructure({
     }
   }
 
-  // Ensure ALL dependencies from the input dependencySchemas are preserved.
-  // Some dependencies (like .d.ts type declaration files) may not have:
-  // - Equivalencies with the root scope
-  // - A dependent analysis (they're just type declarations)
-  // - Be marked as mocked
-  // Without this, their schemas would be lost entirely.
-  //
-  // IMPORTANT: Only add schemas for dependencies that weren't already processed.
-  // If a dependency has an existing schema (even an empty one), it means the
-  // existing processing (mocked dependencies, equivalencies, dependentAnalyses)
-  // has already handled it and may have intentionally filtered out certain paths.
-  for (const filePath in dependencySchemas) {
-    for (const name in dependencySchemas[filePath]) {
-      const srcSchema = dependencySchemas[filePath][name];
-      if (!srcSchema) continue;
-
-      // Check if this dependency was already processed by any other mechanism
-      const existingSchema =
-        mergedDataStructure.dependencySchemas[filePath]?.[name];
-
-      // Only add if no existing schema at all - this means the dependency
-      // wasn't processed through equivalencies, mocked dependencies, or dependentAnalyses
-      if (!existingSchema) {
-        const depSchema = findOrCreateDependentSchemas({ filePath, name });
-        for (const path in srcSchema.returnValueSchema) {
-          depSchema.returnValueSchema[path] = srcSchema.returnValueSchema[path];
-        }
-        for (const path in srcSchema.signatureSchema) {
-          depSchema.signatureSchema[path] = srcSchema.signatureSchema[path];
-        }
-      }
-    }
-  }
-
   return mergedDataStructure;
 }

package/analyzer-template/packages/aws/codebuild/index.ts

@@ -4,3 +4,4 @@ export { default as codebuildCheckProject } from '../src/lib/codebuild/checkForC
 export { default as codebuildCreateProject } from '../src/lib/codebuild/createCodeBuildProject';
 export { default as codebuildTrigger } from '../src/lib/codebuild/triggerCodeBuild';
 export { default as codebuildWaitForBuild } from '../src/lib/codebuild/waitForBuild';
+export type { BuildResult } from '../src/lib/codebuild/waitForBuild';

package/analyzer-template/packages/aws/dist/src/lib/codebuild/waitForBuild.d.ts

@@ -1,2 +1,12 @@
-export default function waitForBuild(buildId: string): Promise<'SUCCEEDED' | 'FAILED' | 'TIMED_OUT'>;
+export interface BuildResult {
+    status: 'SUCCEEDED' | 'FAILED' | 'TIMED_OUT';
+    buildId: string;
+    consoleUrl: string;
+    failedPhase?: {
+        phaseType: string;
+        statusCode?: string;
+        message?: string;
+    };
+}
+export default function waitForBuild(buildId: string): Promise<BuildResult>;
 //# sourceMappingURL=waitForBuild.d.ts.map

package/analyzer-template/packages/aws/dist/src/lib/codebuild/waitForBuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"waitForBuild.d.ts","sourceRoot":"","sources":["../../../../src/lib/codebuild/waitForBuild.ts"],"names":[],"mappings":"AAKA,wBAA8B,YAAY,CACxC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAC,CAuD/C"}
+{"version":3,"file":"waitForBuild.d.ts","sourceRoot":"","sources":["../../../../src/lib/codebuild/waitForBuild.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAC;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE;QACZ,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAUD,wBAA8B,YAAY,CACxC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,CAAC,CA4DtB"}

package/analyzer-template/packages/aws/dist/src/lib/codebuild/waitForBuild.js

@@ -1,4 +1,11 @@
-import { CodeBuildClient, BatchGetBuildsCommand, } from '@aws-sdk/client-codebuild';
+import { BatchGetBuildsCommand, CodeBuildClient, } from '@aws-sdk/client-codebuild';
+function getConsoleUrl(buildId) {
+    // buildId format: project-name:uuid
+    // ARN format: arn:aws:codebuild:region:account:build/project-name:uuid
+    const region = process.env.AWS_REGION || 'us-east-1';
+    const encodedBuildId = encodeURIComponent(buildId);
+    return `https://${region}.console.aws.amazon.com/codesuite/codebuild/projects/${buildId.split(':')[0]}/build/${encodedBuildId}/log`;
+}
 export default async function waitForBuild(buildId) {
     const codeBuildClient = new CodeBuildClient({});
     let attempts = 0;
@@ -12,31 +19,31 @@ export default async function waitForBuild(buildId) {
         if (!build) {
             throw new Error(`Build ${buildId} not found`);
         }
+        const consoleUrl = getConsoleUrl(buildId);
         switch (build.buildStatus) {
             case 'SUCCEEDED':
-                return 'SUCCEEDED';
+                return { status: 'SUCCEEDED', buildId, consoleUrl };
             case 'FAILED':
             case 'FAULT':
             case 'STOPPED': {
                 // Find the first failed phase
                 const failedPhase = build.phases?.find((phase) => phase.phaseStatus === 'FAILED');
-                if (failedPhase) {
-                    const context = failedPhase.contexts?.[0];
-                    console.log('Build failed:', {
-                        phase: failedPhase.phaseType,
-                        statusCode: context?.statusCode,
-                        message: context?.message,
-                    });
-                    // Also log full phases for debugging if needed
-                    console.log('Full build phases:', build.phases);
-                }
-                else {
-                    console.log('Build failed but no failed phase found:', build.phases);
-                }
-                return 'FAILED';
+                const context = failedPhase?.contexts?.[0];
+                return {
+                    status: 'FAILED',
+                    buildId,
+                    consoleUrl,
+                    failedPhase: failedPhase
+                        ? {
+                            phaseType: failedPhase.phaseType ?? 'UNKNOWN',
+                            statusCode: context?.statusCode,
+                            message: context?.message,
+                        }
+                        : undefined,
+                };
             }
             case 'TIMED_OUT':
-                return 'TIMED_OUT';
+                return { status: 'TIMED_OUT', buildId, consoleUrl };
             case 'IN_PROGRESS':
                 await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
                 attempts++;
@@ -45,6 +52,10 @@ export default async function waitForBuild(buildId) {
                 throw new Error(`Unknown build status: ${build.buildStatus}`);
         }
     }
-    return 'TIMED_OUT';
+    return {
+        status: 'TIMED_OUT',
+        buildId,
+        consoleUrl: getConsoleUrl(buildId),
+    };
 }
 //# sourceMappingURL=waitForBuild.js.map

package/analyzer-template/packages/aws/dist/src/lib/codebuild/waitForBuild.js.map

@@ -1 +1 @@
-{"version":3,"file":"waitForBuild.js","sourceRoot":"","sources":["../../../../src/lib/codebuild/waitForBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,OAAe;IAEf,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;IAEhD,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,sCAAsC;IAE/D,OAAO,QAAQ,GAAG,WAAW,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAAC;YAC3C,GAAG,EAAE,CAAC,OAAO,CAAC;SACf,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,SAAS,OAAO,YAAY,CAAC,CAAC;QAChD,CAAC;QAED,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC;YAC1B,KAAK,WAAW;gBACd,OAAO,WAAW,CAAC;YACrB,KAAK,QAAQ,CAAC;YACd,KAAK,OAAO,CAAC;YACb,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,8BAA8B;gBAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,CACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,QAAQ,CAC1C,CAAC;gBACF,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;oBAC1C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;wBAC3B,KAAK,EAAE,WAAW,CAAC,SAAS;wBAC5B,UAAU,EAAE,OAAO,EAAE,UAAU;wBAC/B,OAAO,EAAE,OAAO,EAAE,OAAO;qBAC1B,CAAC,CAAC;oBAEH,+CAA+C;oBAC/C,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBAClD,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBACvE,CAAC;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,KAAK,WAAW;gBACd,OAAO,WAAW,CAAC;YACrB,KAAK,aAAa;gBAChB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,kBAAkB;gBAC9E,QAAQ,EAAE,CAAC;gBACX,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"waitForBuild.js","sourceRoot":"","sources":["../../../../src/lib/codebuild/waitForBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AAanC,SAAS,aAAa,CAAC,OAAe;IACpC,oCAAoC;IACpC,uEAAuE;IACvE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,WAAW,CAAC;IACrD,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACnD,OAAO,WAAW,MAAM,wDAAwD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,cAAc,MAAM,CAAC;AACtI,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,OAAe;IAEf,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;IAEhD,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,sCAAsC;IAE/D,OAAO,QAAQ,GAAG,WAAW,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAAC;YAC3C,GAAG,EAAE,CAAC,OAAO,CAAC;SACf,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,SAAS,OAAO,YAAY,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAE1C,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC;YAC1B,KAAK,WAAW;gBACd,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;YACtD,KAAK,QAAQ,CAAC;YACd,KAAK,OAAO,CAAC;YACb,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,8BAA8B;gBAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,CACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,QAAQ,CAC1C,CAAC;gBACF,MAAM,OAAO,GAAG,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC3C,OAAO;oBACL,MAAM,EAAE,QAAQ;oBAChB,OAAO;oBACP,UAAU;oBACV,WAAW,EAAE,WAAW;wBACtB,CAAC,CAAC;4BACE,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,SAAS;4BAC7C,UAAU,EAAE,OAAO,EAAE,UAAU;4BAC/B,OAAO,EAAE,OAAO,EAAE,OAAO;yBAC1B;wBACH,CAAC,CAAC,SAAS;iBACd,CAAC;YACJ,CAAC;YACD,KAAK,WAAW;gBACd,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;YACtD,KAAK,aAAa;gBAChB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,kBAAkB;gBAC9E,QAAQ,EAAE,CAAC;gBACX,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,EAAE,WAAW;QACnB,OAAO;QACP,UAAU,EAAE,aAAa,CAAC,OAAO,CAAC;KACnC,CAAC;AACJ,CAAC"}

package/analyzer-template/packages/aws/dist/src/lib/ecs/ecsDefineContainer.d.ts

@@ -1,11 +1,11 @@
 import { ContainerDefinition } from '@aws-sdk/client-ecs';
-export default function ecsDefineContainer({ containerName, containerImage, environmentVariables, openPort, dependsOn, }: {
+export default function ecsDefineContainer({ containerName, containerImage, environmentVariables, openPort, command, }: {
     containerName: string;
     containerImage: string;
     environmentVariables?: {
         [key: string]: string;
     };
     openPort?: number;
-    dependsOn?: ContainerDefinition['dependsOn'];
+    command?: string[];
 }): ContainerDefinition;
 //# sourceMappingURL=ecsDefineContainer.d.ts.map

package/analyzer-template/packages/aws/dist/src/lib/ecs/ecsDefineContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ecsDefineContainer.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/ecsDefineContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,aAAa,EACb,cAAc,EACd,oBAAyB,EACzB,QAAQ,EACR,SAAS,GACV,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC;CAC9C,GAAG,mBAAmB,CA4BtB"}
+{"version":3,"file":"ecsDefineContainer.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/ecsDefineContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,aAAa,EACb,cAAc,EACd,oBAAyB,EACzB,QAAQ,EACR,OAAO,GACR,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,GAAG,mBAAmB,CA4BtB"}

package/analyzer-template/packages/aws/dist/src/lib/ecs/ecsDefineContainer.js

@@ -1,8 +1,9 @@
-export default function ecsDefineContainer({ containerName, containerImage, environmentVariables = {}, openPort, dependsOn, }) {
+export default function ecsDefineContainer({ containerName, containerImage, environmentVariables = {}, openPort, command, }) {
     return {
         name: containerName,
         image: containerImage,
         essential: true,
+        command,
         environment: Object.entries(environmentVariables).map(([name, value]) => ({
             name,
             value,
@@ -24,7 +25,6 @@ export default function ecsDefineContainer({ containerName, containerImage, envi
                 'awslogs-stream-prefix': `${process.env.ECS_CLUSTER_NAME}`,
             },
         },
-        dependsOn,
     };
 }
 //# sourceMappingURL=ecsDefineContainer.js.map

package/analyzer-template/packages/aws/dist/src/lib/ecs/ecsDefineContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ecsDefineContainer.js","sourceRoot":"","sources":["../../../../src/lib/ecs/ecsDefineContainer.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,aAAa,EACb,cAAc,EACd,oBAAoB,GAAG,EAAE,EACzB,QAAQ,EACR,SAAS,GAOV;IACC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,cAAc;QACrB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACxE,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;QACH,YAAY,EAAE,QAAQ;YACpB,CAAC,CAAC;gBACE;oBACE,aAAa,EAAE,QAAQ;oBACvB,QAAQ,EAAE,QAAQ;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACb,gBAAgB,EAAE;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE;gBACP,sBAAsB,EAAE,MAAM;gBAC9B,eAAe,EAAE,kBAAkB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACxE,gBAAgB,EAAE,WAAW;gBAC7B,uBAAuB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;aAC3D;SACF;QACD,SAAS;KACV,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ecsDefineContainer.js","sourceRoot":"","sources":["../../../../src/lib/ecs/ecsDefineContainer.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,aAAa,EACb,cAAc,EACd,oBAAoB,GAAG,EAAE,EACzB,QAAQ,EACR,OAAO,GAOR;IACC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,cAAc;QACrB,SAAS,EAAE,IAAI;QACf,OAAO;QACP,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACxE,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;QACH,YAAY,EAAE,QAAQ;YACpB,CAAC,CAAC;gBACE;oBACE,aAAa,EAAE,QAAQ;oBACvB,QAAQ,EAAE,QAAQ;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACb,gBAAgB,EAAE;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE;gBACP,sBAAsB,EAAE,MAAM;gBAC9B,eAAe,EAAE,kBAAkB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACxE,gBAAgB,EAAE,WAAW;gBAC7B,uBAAuB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;aAC3D;SACF;KACF,CAAC;AACJ,CAAC"}

package/analyzer-template/packages/aws/dist/src/lib/ecs/ecsTaskFactory.d.ts

@@ -4,31 +4,21 @@ export type EcsStartConfig = {
     containerEnvironmentVariables: Array<[string, Record<string, string>]>;
 };
 /**
- * Prepare to run an ECS task for the classical analysis-then-capture flow
- * which uses a 'project' image for analysis and a 'playwright' image for capture.
+ * Prepare to run an ECS task for analysis with distributed capture orchestration.
+ * Uses the unified 'combo' image which includes both analysis and capture capabilities.
  */
-export declare function getEcsStartConfigForAnalysisThenCapture(projectEnvironmentVariables: Record<string, string>, playwrightEnvironmentVariables: Record<string, string>): EcsStartConfig;
-/**
- * Prepare to run an ECS task for the new analysis flow with distributed capture
- * tasks orchestrated from only a 'project' image.
- */
-export declare function getEcsStartConfigFoAnalysisWithOrchestration(environmentVariables: Record<string, string>): EcsStartConfig;
+export declare function getEcsStartConfigForAnalysis(environmentVariables: Record<string, string>): EcsStartConfig;
 /**
  * Prepare to run an ECS worker task that implements the capture portion of the
- * distributed orchestration, which uses a 'combo' image. This task is launched
- * from a task created with `getEcsStartConfigFoAnalysisWithOrchestration()`
+ * distributed orchestration. Uses the same unified 'combo' image.
+ * This task is launched from a task created with `getEcsStartConfigForAnalysis()`
  */
 export declare function getEcsStartConfigForOrchestrationTask(environmentVariables: Record<string, string>): EcsStartConfig;
 export declare enum EcsTaskDefinitionUse {
-    AnalyzeThenCapture = "analyze-then-capture",
-    AnalyzeWithOrchestration = "analyze-with-orchestration",
+    Analysis = "analysis",
     OrchestrationTask = "orchestration-task"
 }
 export declare function getEcsTaskDefinitionName(forUse: EcsTaskDefinitionUse): string;
-export declare enum EcsImageType {
-    Project = "project",
-    Playwright = "playwright",
-    Combo = "combo"
-}
-export declare function getEcsImageNameForType(type: EcsImageType): string;
+/** Returns the name of the unified Docker image used for all ECS tasks. */
+export declare function getEcsImageName(): string;
 //# sourceMappingURL=ecsTaskFactory.d.ts.map

package/analyzer-template/packages/aws/dist/src/lib/ecs/ecsTaskFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ecsTaskFactory.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/ecsTaskFactory.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,6BAA6B,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;CACxE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,uCAAuC,CACrD,2BAA2B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnD,8BAA8B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACrD,cAAc,CAgBhB;AAED;;;GAGG;AACH,wBAAgB,4CAA4C,CAC1D,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,cAAc,CAShB;AAED;;;;GAIG;AACH,wBAAgB,qCAAqC,CACnD,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,cAAc,CAShB;AAED,oBAAY,oBAAoB;IAE9B,kBAAkB,yBAAyB;IAE3C,wBAAwB,+BAA+B;IAEvD,iBAAiB,uBAAuB;CACzC;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAW7E;AAED,oBAAY,YAAY;IAEtB,OAAO,YAAY;IAEnB,UAAU,eAAe;IAEzB,KAAK,UAAU;CAChB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAWjE"}
+{"version":3,"file":"ecsTaskFactory.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/ecsTaskFactory.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,6BAA6B,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;CACxE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,cAAc,CAKhB;AAED;;;;GAIG;AACH,wBAAgB,qCAAqC,CACnD,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,cAAc,CAOhB;AAED,oBAAY,oBAAoB;IAE9B,QAAQ,aAAa;IAErB,iBAAiB,uBAAuB;CACzC;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAS7E;AAED,2EAA2E;AAC3E,wBAAgB,eAAe,IAAI,MAAM,CAExC"}

package/analyzer-template/packages/aws/dist/src/lib/ecs/ecsTaskFactory.js

@@ -1,87 +1,43 @@
 /**
- * Prepare to run an ECS task for the classical analysis-then-capture flow
- * which uses a 'project' image for analysis and a 'playwright' image for capture.
+ * Prepare to run an ECS task for analysis with distributed capture orchestration.
+ * Uses the unified 'combo' image which includes both analysis and capture capabilities.
  */
-export function getEcsStartConfigForAnalysisThenCapture(projectEnvironmentVariables, playwrightEnvironmentVariables) {
+export function getEcsStartConfigForAnalysis(environmentVariables) {
     return {
-        taskDefinition: getEcsTaskDefinitionName(EcsTaskDefinitionUse.AnalyzeThenCapture),
-        containerEnvironmentVariables: [
-            [
-                getEcsImageNameForType(EcsImageType.Project),
-                projectEnvironmentVariables,
-            ],
-            [
-                getEcsImageNameForType(EcsImageType.Playwright),
-                playwrightEnvironmentVariables,
-            ],
-        ],
-    };
-}
-/**
- * Prepare to run an ECS task for the new analysis flow with distributed capture
- * tasks orchestrated from only a 'project' image.
- */
-export function getEcsStartConfigFoAnalysisWithOrchestration(environmentVariables) {
-    return {
-        taskDefinition: getEcsTaskDefinitionName(EcsTaskDefinitionUse.AnalyzeWithOrchestration),
-        containerEnvironmentVariables: [
-            [getEcsImageNameForType(EcsImageType.Project), environmentVariables],
-        ],
+        taskDefinition: getEcsTaskDefinitionName(EcsTaskDefinitionUse.Analysis),
+        containerEnvironmentVariables: [[getEcsImageName(), environmentVariables]],
     };
 }
 /**
  * Prepare to run an ECS worker task that implements the capture portion of the
- * distributed orchestration, which uses a 'combo' image. This task is launched
- * from a task created with `getEcsStartConfigFoAnalysisWithOrchestration()`
+ * distributed orchestration. Uses the same unified 'combo' image.
+ * This task is launched from a task created with `getEcsStartConfigForAnalysis()`
  */
 export function getEcsStartConfigForOrchestrationTask(environmentVariables) {
     return {
         taskDefinition: getEcsTaskDefinitionName(EcsTaskDefinitionUse.OrchestrationTask),
-        containerEnvironmentVariables: [
-            [getEcsImageNameForType(EcsImageType.Combo), environmentVariables],
-        ],
+        containerEnvironmentVariables: [[getEcsImageName(), environmentVariables]],
     };
 }
 export var EcsTaskDefinitionUse;
 (function (EcsTaskDefinitionUse) {
-    /* A 'project' image runs analysis while a 'playwright' image captures the entities. */
-    EcsTaskDefinitionUse["AnalyzeThenCapture"] = "analyze-then-capture";
-    /* A 'project' image runs analysis while firing up distributed capture orchestration. */
-    EcsTaskDefinitionUse["AnalyzeWithOrchestration"] = "analyze-with-orchestration";
-    /* A worker task that combines 'project' and 'playwright' code, launched by orchestration. */
+    /* Main analysis task - runs analysis and fires up distributed capture orchestration. */
+    EcsTaskDefinitionUse["Analysis"] = "analysis";
+    /* A worker task launched by orchestration to capture scenarios. */
     EcsTaskDefinitionUse["OrchestrationTask"] = "orchestration-task";
 })(EcsTaskDefinitionUse || (EcsTaskDefinitionUse = {}));
 export function getEcsTaskDefinitionName(forUse) {
     switch (forUse) {
-        case EcsTaskDefinitionUse.AnalyzeThenCapture:
-            return `${process.env.ECR_REPOSITORY_NAME}-project-and-playwright`;
-        case EcsTaskDefinitionUse.AnalyzeWithOrchestration:
-            return `${process.env.ECR_REPOSITORY_NAME}-project`;
+        case EcsTaskDefinitionUse.Analysis:
+            return `${process.env.ECR_REPOSITORY_NAME}-analysis`;
         case EcsTaskDefinitionUse.OrchestrationTask:
-            return `${process.env.ECR_REPOSITORY_NAME}-combo`;
+            return `${process.env.ECR_REPOSITORY_NAME}-orchestration`;
         default:
             throw new Error(`Unknown task definition use: ${forUse}`);
     }
 }
-export var EcsImageType;
-(function (EcsImageType) {
-    /* The virtualized server that runs the project code. */
-    EcsImageType["Project"] = "project";
-    /* The playwright capture process which waits for the project to be ready. */
-    EcsImageType["Playwright"] = "playwright";
-    /* A combo image that combines both project and playwright code, used by orchestration. */
-    EcsImageType["Combo"] = "combo";
-})(EcsImageType || (EcsImageType = {}));
-export function getEcsImageNameForType(type) {
-    switch (type) {
-        case EcsImageType.Project:
-            return `${process.env.ECR_REPOSITORY_NAME}-project`;
-        case EcsImageType.Playwright:
-            return `${process.env.ECR_REPOSITORY_NAME}-playwright`;
-        case EcsImageType.Combo:
-            return `${process.env.ECR_REPOSITORY_NAME}-combo`;
-        default:
-            throw new Error(`Unknown image type: ${type}`);
-    }
+/** Returns the name of the unified Docker image used for all ECS tasks. */
+export function getEcsImageName() {
+    return `${process.env.ECR_REPOSITORY_NAME}-combo`;
 }
 //# sourceMappingURL=ecsTaskFactory.js.map

package/analyzer-template/packages/aws/dist/src/lib/ecs/ecsTaskFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ecsTaskFactory.js","sourceRoot":"","sources":["../../../../src/lib/ecs/ecsTaskFactory.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,UAAU,uCAAuC,CACrD,2BAAmD,EACnD,8BAAsD;IAEtD,OAAO;QACL,cAAc,EAAE,wBAAwB,CACtC,oBAAoB,CAAC,kBAAkB,CACxC;QACD,6BAA6B,EAAE;YAC7B;gBACE,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC;gBAC5C,2BAA2B;aAC5B;YACD;gBACE,sBAAsB,CAAC,YAAY,CAAC,UAAU,CAAC;gBAC/C,8BAA8B;aAC/B;SACF;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,4CAA4C,CAC1D,oBAA4C;IAE5C,OAAO;QACL,cAAc,EAAE,wBAAwB,CACtC,oBAAoB,CAAC,wBAAwB,CAC9C;QACD,6BAA6B,EAAE;YAC7B,CAAC,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC;SACrE;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qCAAqC,CACnD,oBAA4C;IAE5C,OAAO;QACL,cAAc,EAAE,wBAAwB,CACtC,oBAAoB,CAAC,iBAAiB,CACvC;QACD,6BAA6B,EAAE;YAC7B,CAAC,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,oBAAoB,CAAC;SACnE;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAN,IAAY,oBAOX;AAPD,WAAY,oBAAoB;IAC9B,uFAAuF;IACvF,mEAA2C,CAAA;IAC3C,wFAAwF;IACxF,+EAAuD,CAAA;IACvD,6FAA6F;IAC7F,gEAAwC,CAAA;AAC1C,CAAC,EAPW,oBAAoB,KAApB,oBAAoB,QAO/B;AAED,MAAM,UAAU,wBAAwB,CAAC,MAA4B;IACnE,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,oBAAoB,CAAC,kBAAkB;YAC1C,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,yBAAyB,CAAC;QACrE,KAAK,oBAAoB,CAAC,wBAAwB;YAChD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,UAAU,CAAC;QACtD,KAAK,oBAAoB,CAAC,iBAAiB;YACzC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,CAAC;QACpD;YACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED,MAAM,CAAN,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,wDAAwD;IACxD,mCAAmB,CAAA;IACnB,6EAA6E;IAC7E,yCAAyB,CAAA;IACzB,0FAA0F;IAC1F,+BAAe,CAAA;AACjB,CAAC,EAPW,YAAY,KAAZ,YAAY,QAOvB;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAkB;IACvD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,YAAY,CAAC,OAAO;YACvB,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,UAAU,CAAC;QACtD,KAAK,YAAY,CAAC,UAAU;YAC1B,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,aAAa,CAAC;QACzD,KAAK,YAAY,CAAC,KAAK;YACrB,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,CAAC;QACpD;YACE,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC;AACH,CAAC"}
+{"version":3,"file":"ecsTaskFactory.js","sourceRoot":"","sources":["../../../../src/lib/ecs/ecsTaskFactory.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAC1C,oBAA4C;IAE5C,OAAO;QACL,cAAc,EAAE,wBAAwB,CAAC,oBAAoB,CAAC,QAAQ,CAAC;QACvE,6BAA6B,EAAE,CAAC,CAAC,eAAe,EAAE,EAAE,oBAAoB,CAAC,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qCAAqC,CACnD,oBAA4C;IAE5C,OAAO;QACL,cAAc,EAAE,wBAAwB,CACtC,oBAAoB,CAAC,iBAAiB,CACvC;QACD,6BAA6B,EAAE,CAAC,CAAC,eAAe,EAAE,EAAE,oBAAoB,CAAC,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED,MAAM,CAAN,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,wFAAwF;IACxF,6CAAqB,CAAA;IACrB,mEAAmE;IACnE,gEAAwC,CAAA;AAC1C,CAAC,EALW,oBAAoB,KAApB,oBAAoB,QAK/B;AAED,MAAM,UAAU,wBAAwB,CAAC,MAA4B;IACnE,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,oBAAoB,CAAC,QAAQ;YAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,WAAW,CAAC;QACvD,KAAK,oBAAoB,CAAC,iBAAiB;YACzC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,gBAAgB,CAAC;QAC5D;YACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,eAAe;IAC7B,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,CAAC;AACpD,CAAC"}

package/analyzer-template/packages/aws/dist/src/lib/s3/uploadFileToS3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFileToS3.d.ts","sourceRoot":"","sources":["../../../../src/lib/s3/uploadFileToS3.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,UAAU,kBAAkB;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,IAAI,GAAG,WAAW,CAAC;CAC7E;AAED,wBAA8B,cAAc,CAAC,EAC3C,UAAU,EACV,GAAG,EACH,IAAI,GACL,EAAE,kBAAkB,iBAqBpB"}
+{"version":3,"file":"uploadFileToS3.d.ts","sourceRoot":"","sources":["../../../../src/lib/s3/uploadFileToS3.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,UAAU,kBAAkB;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,IAAI,GAAG,WAAW,CAAC;CAC7E;AAED,wBAA8B,cAAc,CAAC,EAC3C,UAAU,EACV,GAAG,EACH,IAAI,GACL,EAAE,kBAAkB,iBA4BpB"}

package/analyzer-template/packages/aws/dist/src/lib/s3/uploadFileToS3.js

@@ -11,10 +11,17 @@ export default async function uploadFileToS3({ bucketName, key, body, }) {
         },
     });
     try {
+        let lastLoggedMB = 0;
         upload.on('httpUploadProgress', (progress) => {
-            console.log(progress);
+            const loadedMB = Math.floor((progress.loaded ?? 0) / (1024 * 1024));
+            // Log every 10MB to avoid spam
+            if (loadedMB >= lastLoggedMB + 10) {
+                lastLoggedMB = loadedMB;
+                console.log(`Uploading ${key}... ${loadedMB}MB`);
+            }
         });
         await upload.done();
+        console.log(`Uploaded ${key}`);
     }
     catch (error) {
         console.log('Error. File not uploaded.', error);

package/analyzer-template/packages/aws/dist/src/lib/s3/uploadFileToS3.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFileToS3.js","sourceRoot":"","sources":["../../../../src/lib/s3/uploadFileToS3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAS9C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAAC,EAC3C,UAAU,EACV,GAAG,EACH,IAAI,GACe;IACnB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE;YACN,MAAM,EAAE,UAAU;YAClB,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,IAAI;SACX;KACF,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC3C,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QAChD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"uploadFileToS3.js","sourceRoot":"","sources":["../../../../src/lib/s3/uploadFileToS3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAS9C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAAC,EAC3C,UAAU,EACV,GAAG,EACH,IAAI,GACe;IACnB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE;YACN,MAAM,EAAE,UAAU;YAClB,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,IAAI;SACX;KACF,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;YACpE,+BAA+B;YAC/B,IAAI,QAAQ,IAAI,YAAY,GAAG,EAAE,EAAE,CAAC;gBAClC,YAAY,GAAG,QAAQ,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,OAAO,QAAQ,IAAI,CAAC,CAAC;YACnD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QAChD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}