@codemation/host 0.1.6 → 0.2.0

package/src/presentation/http/routeHandlers/WorkflowHttpRouteHandler.ts

@@ -66,7 +66,8 @@ export class WorkflowHttpRouteHandler {
 
   async getWorkflowRuns(_: Request, params: ServerHttpRouteParams): Promise<Response> {
     try {
-      return Response.json(await this.queryBus.execute(new ListWorkflowRunsQuery(params.workflowId!)));
+      const runs = await this.queryBus.execute(new ListWorkflowRunsQuery(params.workflowId!));
+      return Response.json(runs);
     } catch (error) {
       return ServerHttpErrorResponseFactory.fromUnknown(error);
     }
@@ -74,7 +75,8 @@ export class WorkflowHttpRouteHandler {
 
   async getWorkflowDebuggerOverlay(_: Request, params: ServerHttpRouteParams): Promise<Response> {
     try {
-      return Response.json(await this.queryBus.execute(new GetWorkflowDebuggerOverlayQuery(params.workflowId!)));
+      const overlay = await this.queryBus.execute(new GetWorkflowDebuggerOverlayQuery(params.workflowId!));
+      return Response.json(overlay);
     } catch (error) {
       return ServerHttpErrorResponseFactory.fromUnknown(error);
     }

package/src/presentation/server/CodemationConsumerConfigLoader.ts

@@ -20,6 +20,11 @@ export type CodemationConsumerConfigResolution = Readonly<{
   workflowSources: ReadonlyArray<string>;
 }>;
 
+type ConsumerImportSession = Readonly<{
+  shouldResetImporter: boolean;
+  resetCacheKeys: Set<string>;
+}>;
+
 export class CodemationConsumerConfigLoader {
   private static readonly importerRegistrationsByTsconfig = new Map<string, NamespacedUnregister>();
   private static readonly importerNamespaceVersionByTsconfig = new Map<string, number>();
@@ -38,10 +43,13 @@ export class CodemationConsumerConfigLoader {
   ): Promise<CodemationConsumerConfigResolution> {
     const loadStarted = performance.now();
     let mark = loadStarted;
+    const importSession = this.createImportSession();
+    const phaseDurations = new Map<string, number>();
     const phaseMs = (label: string): void => {
       const now = performance.now();
       const delta = now - mark;
       mark = now;
+      phaseDurations.set(label, delta);
       this.performanceDiagnosticsLogger.info(
         `load.${label} +${delta.toFixed(1)}ms (cumulative ${(now - loadStarted).toFixed(1)}ms)`,
       );
@@ -53,7 +61,7 @@ export class CodemationConsumerConfigLoader {
         'Codemation config not found. Expected "codemation.config.ts" in the consumer project root or "src/".',
       );
     }
-    const moduleExports = await this.importModule(bootstrapSource);
+    const moduleExports = await this.importModule(bootstrapSource, importSession);
     phaseMs("importConfigModule");
     const rawConfig = this.configExportsResolver.resolveConfig(moduleExports);
     if (!rawConfig) {
@@ -64,7 +72,7 @@ export class CodemationConsumerConfigLoader {
     phaseMs("resolveWorkflowSources");
     const workflows = this.mergeWorkflows(
       config.workflows ?? [],
-      await this.loadDiscoveredWorkflows(args.consumerRoot, config, workflowSources),
+      await this.loadDiscoveredWorkflows(args.consumerRoot, config, workflowSources, importSession),
     );
     phaseMs("loadDiscoveredWorkflows");
     const resolvedConfig: NormalizedCodemationConfig = {
@@ -125,6 +133,7 @@ export class CodemationConsumerConfigLoader {
     consumerRoot: string,
     config: CodemationConfig,
     workflowSources: ReadonlyArray<string>,
+    importSession: ConsumerImportSession,
   ): Promise<ReadonlyArray<WorkflowDefinition>> {
     const workflowDiscoveryDirectories = config.workflowDiscovery?.directories ?? [];
     const workflowsById = new Map<string, WorkflowDefinition>();
@@ -136,7 +145,7 @@ export class CodemationConsumerConfigLoader {
           workflowDiscoveryDirectories,
           absoluteWorkflowModulePath: workflowSource,
         }),
-        moduleExports: await this.importModule(workflowSource),
+        moduleExports: await this.importModule(workflowSource, importSession),
       })),
     );
     for (const loadedWorkflowModule of loadedWorkflowModules) {
@@ -168,13 +177,20 @@ export class CodemationConsumerConfigLoader {
     return [...workflowsById.values()];
   }
 
-  private async importModule(modulePath: string): Promise<Record<string, unknown>> {
+  private async importModule(
+    modulePath: string,
+    importSession: ConsumerImportSession,
+  ): Promise<Record<string, unknown>> {
     if (this.shouldUseNativeRuntimeImport()) {
       return await this.importModuleWithNativeRuntime(modulePath);
     }
     const tsconfigPath = await this.resolveTsconfigPath(modulePath);
-    if (this.shouldResetImporterBeforeImport()) {
+    const cacheKey = tsconfigPath || "default";
+    const shouldResetImporter = importSession.shouldResetImporter;
+    const didResetImporterForThisImport = shouldResetImporter && !importSession.resetCacheKeys.has(cacheKey);
+    if (didResetImporterForThisImport) {
       await this.resetImporter(tsconfigPath);
+      importSession.resetCacheKeys.add(cacheKey);
     }
     const importSpecifier = await this.createImportSpecifier(modulePath);
     for (let attempt = 0; attempt < 3; attempt += 1) {
@@ -278,6 +294,13 @@ export class CodemationConsumerConfigLoader {
     return (process.env.CODEMATION_DEV_SERVER_TOKEN?.trim().length ?? 0) > 0;
   }
 
+  private createImportSession(): ConsumerImportSession {
+    return {
+      resetCacheKeys: new Set<string>(),
+      shouldResetImporter: this.shouldResetImporterBeforeImport(),
+    };
+  }
+
   private isStoppedTransformServiceError(error: unknown): boolean {
     return error instanceof Error && error.message.includes("The service is no longer running");
   }

package/src/presentation/server/CodemationPluginDiscovery.ts

@@ -142,14 +142,12 @@ export class CodemationPluginDiscovery {
   }
 
   private resolvePluginEntry(discoveredPackage: CodemationDiscoveredPluginPackage): string {
-    if (
+    const preferSource =
       process.env.CODEMATION_PREFER_PLUGIN_SOURCE_ENTRY === "true" &&
       typeof discoveredPackage.developmentEntry === "string" &&
-      discoveredPackage.developmentEntry.trim().length > 0
-    ) {
-      return discoveredPackage.developmentEntry;
-    }
-    return discoveredPackage.pluginEntry;
+      discoveredPackage.developmentEntry.trim().length > 0;
+    const selectedEntry = preferSource ? discoveredPackage.developmentEntry : discoveredPackage.pluginEntry;
+    return selectedEntry;
   }
 
   private async resolveDevelopmentPluginEntry(packageRoot: string): Promise<string | undefined> {