@fjall/deploy-core 0.89.5 → 0.89.6

package/dist/src/services/infrastructure/ICdkProcessManager.d.ts

@@ -0,0 +1,27 @@
+import type { Result } from "@fjall/generator";
+import type { CdkOptions, CdkOutput } from "./CdkService.js";
+/**
+ * Interface for CDK process management, enabling constructor injection.
+ *
+ * The concrete CdkProcessManager uses `import.meta.url` to resolve the
+ * `aws-cdk` binary from the calling package's node_modules. By programming
+ * against this interface, callers (CLI, webapp worker) can provide their
+ * own implementation with the correct binary resolution context.
+ */
+export interface ICdkProcessManager {
+    /** Run a CDK command and capture stdout/stderr output. */
+    runCdkCommand(workingDir: string, args: string[], options?: CdkOptions & {
+        ignoreExitCode?: boolean;
+        skipProjectCheck?: boolean;
+        extraEnv?: Record<string, string>;
+        combineOutput?: boolean;
+    }): Promise<Result<CdkOutput, string>>;
+    /** Run a CDK command with stdio passed through to the terminal. */
+    runCdkCommandPassthrough(workingDir: string, args: string[], options?: CdkOptions & {
+        ignoreExitCode?: boolean;
+    }): Promise<Result<CdkOutput, string>>;
+    /** Kill all tracked child processes and clean up resources. */
+    cleanup(): void;
+    /** Clean up resources and deregister process signal handlers. */
+    dispose(): void;
+}

package/dist/src/services/infrastructure/ICdkProcessManager.js

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

package/dist/src/services/infrastructure/__tests__/cloudFormationTestHelpers.d.ts

@@ -0,0 +1,9 @@
+import type { AwsProvider } from "../../../aws/AwsProvider.js";
+import { CloudFormationService } from "../CloudFormationService.js";
+export declare function createCfnService(): {
+    service: CloudFormationService;
+    mockSend: import("vitest").Mock<(...args: any[]) => any>;
+    mockAws: AwsProvider;
+};
+export declare function createValidationError(message: string): Error;
+export declare function createStackNotFoundError(): Error;

package/dist/src/services/infrastructure/__tests__/cloudFormationTestHelpers.js

@@ -0,0 +1 @@
+import{vi as e}from"vitest";import{createAwsError as o}from"../../../__test-utils__/awsMockHelpers.js";import{CloudFormationService as n}from"../CloudFormationService.js";function u(){const r=e.fn(),t={getClient:e.fn().mockReturnValue({send:r})};return{service:new n(t),mockSend:r,mockAws:t}}function c(r){return o("ValidationError",r)}function f(){return c("Stack with id my-stack does not exist")}export{u as createCfnService,f as createStackNotFoundError,c as createValidationError};

package/dist/src/services/infrastructure/cdkServiceHelpers.d.ts

@@ -0,0 +1,9 @@
+import type { DeploymentContext } from "../../types/deployment/DeploymentTypes.js";
+import type { CdkContext } from "./CdkServiceTypes.js";
+/** Delay before falling back to the predicted stack name for CloudFormation monitoring */
+export declare const STACK_DETECTION_FALLBACK_MS = 5000;
+export declare function resolveStackName(stackPattern: string | undefined, context: DeploymentContext): string | undefined;
+export declare function getFallbackStackName(context: DeploymentContext): string;
+export declare function buildDeploymentCdkContext(context: DeploymentContext, accountId: string | undefined, region: string, options?: {
+    includeImageVersion?: boolean;
+}): CdkContext;

package/dist/src/services/infrastructure/cdkServiceHelpers.js

@@ -0,0 +1 @@
+import{getApplicationStackName as r,getOrganisationStackName as p,isApplicationStack as d}from"../../types/operations.js";const l=5e3;function t(e,o){if(e&&!e.includes("*"))return e;if(e){const a=e.match(/\*?(\w+)\*?/);if(a?.[1]){const n=a[1],i=o.target??"app";return d(n)?r(i,n):`${i}${n}`}return e}}function u(e){const o=e.deployType;return o==="organisation"||o==="platform"||o==="account"?p(o):`${e.target??"app"}Network`}function m(e,o,a,n){return{accountId:o,region:a,managedAccount:e.isManagedAccount,...n?.includeImageVersion!==!1&&{imageVersion:e.imageVersion},orgId:e.orgId,rootId:e.rootId,managementAccountId:e.managementAccountId,ipamPoolId:e.ipamPoolId,fjallOrgId:e.fjallOrgId,fjallOidcConfigured:e.fjallOidcConfigured?"true":void 0,orgConfig:e.orgConfig}}export{l as STACK_DETECTION_FALLBACK_MS,m as buildDeploymentCdkContext,u as getFallbackStackName,t as resolveStackName};

package/dist/src/services/infrastructure/constructMapEnrichment.d.ts

@@ -0,0 +1,7 @@
+import type { ResourceEvent } from "../../aws/utils/cloudformationEvents.js";
+/**
+ * Read the construct map from fjall-manifest.json (written during synth)
+ * and return a wrapped callback that enriches resource events with
+ * group and constructPath fields.
+ */
+export declare function wrapWithConstructMapEnrichment(projectPath: string, onResourceProgress?: (event: ResourceEvent) => void): ((event: ResourceEvent) => void) | undefined;

package/dist/src/services/infrastructure/constructMapEnrichment.js

@@ -0,0 +1 @@
+import{existsSync as u,readFileSync as s}from"fs";import{join as p}from"path";import{logger as i}from"@fjall/util/logger";import{enrichFromConstructMap as a,recordToConstructMap as f,FJALL_MANIFEST_FILENAME as d}from"@fjall/util/constructMap";import{getErrorMessage as m}from"@fjall/util";function C(n,c){if(!c)return;const t=p(n,"cdk.out",d);let e;try{if(u(t)){const r=JSON.parse(s(t,"utf-8")),o=typeof r=="object"&&r!==null?r.resourceMap:void 0;h(o)&&(e=f(o)),e&&e.size>0&&i.debug("CdkService",`Loaded construct map with ${e.size} entries`)}}catch(r){i.debug("CdkService",`Could not read construct map: ${m(r)}`)}return!e||e.size===0?c:r=>{const o=a(r.logicalId,r.resourceType,e);c({...r,...o.group!==void 0?{group:o.group}:{},...o.constructPath!==void 0?{constructPath:o.constructPath}:{}})}}function h(n){if(typeof n!="object"||n===null||Array.isArray(n))return!1;const c=Object.values(n);if(c.length===0)return!0;const t=c[0];return typeof t=="object"&&t!==null&&"constructPath"in t&&"group"in t&&"resourceType"in t}export{C as wrapWithConstructMapEnrichment};

package/dist/src/services/infrastructure/index.d.ts

@@ -1,5 +1,7 @@
 export { CdkService } from "./CdkService.js";
-export type { CdkContext, CdkOptions, CdkOutput, CheckDifferencesResult, CdkServiceOptions } from "./CdkService.js";
+export type { CheckDifferencesResult } from "./CdkCommandRunner.js";
+export type { CdkContext, CdkOptions, CdkOutput, CdkServiceOptions } from "./CdkServiceTypes.js";
+export type { ICdkProcessManager } from "./ICdkProcessManager.js";
 export { CdkArgumentBuilder } from "./CdkArgumentBuilder.js";
 export { CdkProcessManager } from "./CdkProcessManager.js";
 export { CdkEventMonitor, startStackMonitoring, DEFAULT_DEPLOY_TIMEOUT_MS } from "./CdkEventMonitoring.js";

package/dist/src/services/infrastructure/index.js

@@ -1,7 +1 @@
-export { CdkService } from "./CdkService.js";
-export { CdkArgumentBuilder } from "./CdkArgumentBuilder.js";
-export { CdkProcessManager } from "./CdkProcessManager.js";
-export { CdkEventMonitor, startStackMonitoring, DEFAULT_DEPLOY_TIMEOUT_MS } from "./CdkEventMonitoring.js";
-export { isCdkError, formatInfrastructureError, getStructuralHint, getSourceContext } from "./CdkErrorFormatter.js";
-export { hasCdkDifferences, parseDiffOutput } from "./CdkOutputParser.js";
-export { CloudFormationService, CloudFormationError } from "./CloudFormationService.js";
+import{CdkService as t}from"./CdkService.js";import{CdkArgumentBuilder as f}from"./CdkArgumentBuilder.js";import{CdkProcessManager as n}from"./CdkProcessManager.js";import{CdkEventMonitor as m,startStackMonitoring as u,DEFAULT_DEPLOY_TIMEOUT_MS as d}from"./CdkEventMonitoring.js";import{isCdkError as C,formatInfrastructureError as c,getStructuralHint as s,getSourceContext as x}from"./CdkErrorFormatter.js";import{hasCdkDifferences as E,parseDiffOutput as S}from"./CdkOutputParser.js";import{CloudFormationService as M,CloudFormationError as l}from"./CloudFormationService.js";export{f as CdkArgumentBuilder,m as CdkEventMonitor,n as CdkProcessManager,t as CdkService,l as CloudFormationError,M as CloudFormationService,d as DEFAULT_DEPLOY_TIMEOUT_MS,c as formatInfrastructureError,x as getSourceContext,s as getStructuralHint,E as hasCdkDifferences,C as isCdkError,S as parseDiffOutput,u as startStackMonitoring};

package/dist/src/services/supporting/TemplateHashService.js

@@ -7,7 +7,7 @@
 import { createHash } from "crypto";
 import { readFile, readdir } from "fs/promises";
 import { join, basename } from "path";
-import { fileExists } from "../../util/fsHelpers.js";
+import { fileExists } from "@fjall/util/fsHelpers";
 import { success, failure } from "@fjall/generator";
 import { BaseServiceError } from "../../types/errors/ServiceError.js";
 import { readStateFile, writeStateFile, createEmptyState, updateTemplateHash, getStateFilePath } from "../../types/FjallState.js";

package/dist/src/services/supporting/helpers.js

@@ -1,81 +1 @@
-/**
- * Emits a progress event through the callbacks if available.
- */
-export function emitProgress(callbacks, message, type = "info") {
-    callbacks?.onProgress?.({ type, message });
-}
-/** Progress message constants — avoids magic string repetition */
-export const PROGRESS_MESSAGES = Object.freeze({
-    BUILD: "Building Next.js application",
-    SYNTH: "Synthesising infrastructure",
-    HASH: "Comparing template hashes",
-    DOCKER: "Validating Docker configuration",
-    SECRETS: "Validating SSM secrets"
-});
-/**
- * Parse Next.js/OpenNext build output to extract meaningful phase transitions.
- * Returns a clean status message for display instead of raw build output.
- *
- * Only updates when a meaningful phase change is detected to avoid UI flicker.
- */
-export function parseBuildPhase(message, currentPhase) {
-    const lowerMessage = message.toLowerCase();
-    if (lowerMessage.includes("creating next.js build") ||
-        lowerMessage.includes("creating an optimised production build")) {
-        return "Creating production build...";
-    }
-    if (lowerMessage.includes("compiling")) {
-        return "Compiling...";
-    }
-    if (lowerMessage.includes("linting")) {
-        return "Linting...";
-    }
-    if (lowerMessage.includes("checking validity of types")) {
-        return "Type checking...";
-    }
-    if (lowerMessage.includes("collecting page data")) {
-        return "Collecting page data...";
-    }
-    if (lowerMessage.includes("generating static pages")) {
-        return "Generating static pages...";
-    }
-    if (lowerMessage.includes("finalizing page optimization")) {
-        return "Optimising pages...";
-    }
-    if (lowerMessage.includes("open-next build complete") ||
-        lowerMessage.includes("build completed")) {
-        return "Build complete";
-    }
-    if (lowerMessage.includes("bundling")) {
-        return "Bundling functions...";
-    }
-    if (lowerMessage.includes("copying assets")) {
-        return "Copying assets...";
-    }
-    return currentPhase;
-}
-/**
- * Build the StepContext build configuration from a buildConfig object.
- * Extracts the database-related fields with defaults.
- */
-export function buildStepContextBuildConfig(buildConfig) {
-    if (!buildConfig)
-        return undefined;
-    return {
-        requiresDatabase: buildConfig.requiresDatabase ?? false,
-        databaseEnvVar: buildConfig.databaseEnvVar ?? "DATABASE_URL"
-    };
-}
-/**
- * Convert CloudFormation outputs array to a key-value record.
- * Filters out outputs without keys and handles undefined values.
- */
-export function convertCloudFormationOutputsToRecord(outputs) {
-    const result = {};
-    for (const output of outputs) {
-        if (output.OutputKey && output.OutputValue !== undefined) {
-            result[output.OutputKey] = output.OutputValue;
-        }
-    }
-    return result;
-}
+function n(i,t,e="info"){i?.onProgress?.({type:e,message:t})}const r=Object.freeze({BUILD:"Building Next.js application",SYNTH:"Synthesising infrastructure",HASH:"Comparing template hashes",DOCKER:"Validating Docker configuration",SECRETS:"Validating SSM secrets"});function u(i,t){const e=i.toLowerCase();return e.includes("creating next.js build")||e.includes("creating an optimised production build")?"Creating production build...":e.includes("compiling")?"Compiling...":e.includes("linting")?"Linting...":e.includes("checking validity of types")?"Type checking...":e.includes("collecting page data")?"Collecting page data...":e.includes("generating static pages")?"Generating static pages...":e.includes("finalizing page optimization")?"Optimising pages...":e.includes("open-next build complete")||e.includes("build completed")?"Build complete":e.includes("bundling")?"Bundling functions...":e.includes("copying assets")?"Copying assets...":t}function s(i){if(i)return{requiresDatabase:i.requiresDatabase??!1,databaseEnvVar:i.databaseEnvVar??"DATABASE_URL"}}function a(i){const t={};for(const e of i)e.OutputKey&&e.OutputValue!==void 0&&(t[e.OutputKey]=e.OutputValue);return t}export{r as PROGRESS_MESSAGES,s as buildStepContextBuildConfig,a as convertCloudFormationOutputsToRecord,n as emitProgress,u as parseBuildPhase};

package/dist/src/services/supporting/index.js

@@ -1,3 +1 @@
-export { TemplateHashService, TemplateHashError } from "./TemplateHashService.js";
-export { CdkContextBuilder } from "./CdkContextBuilder.js";
-export { emitProgress, PROGRESS_MESSAGES, parseBuildPhase, buildStepContextBuildConfig, convertCloudFormationOutputsToRecord } from "./helpers.js";
+import{TemplateHashService as r,TemplateHashError as t}from"./TemplateHashService.js";import{CdkContextBuilder as p}from"./CdkContextBuilder.js";import{emitProgress as d,PROGRESS_MESSAGES as l,parseBuildPhase as m,buildStepContextBuildConfig as s,convertCloudFormationOutputsToRecord as u}from"./helpers.js";export{p as CdkContextBuilder,l as PROGRESS_MESSAGES,t as TemplateHashError,r as TemplateHashService,s as buildStepContextBuildConfig,u as convertCloudFormationOutputsToRecord,d as emitProgress,m as parseBuildPhase};

package/dist/src/steps/index.d.ts

@@ -0,0 +1 @@
+export { StepRegistry, getDestroyStepId } from "./stepRegistry.js";

package/dist/src/steps/index.js

@@ -0,0 +1 @@
+import{StepRegistry as r,getDestroyStepId as o}from"./stepRegistry.js";export{r as StepRegistry,o as getDestroyStepId};

package/dist/src/steps/stepRegistry.d.ts

@@ -0,0 +1,71 @@
+import { type StepDefinition, type StepDeploymentType, type Operation, type StepContext } from "../types/index.js";
+import type { AppResourceFlags } from "../types/index.js";
+import type { PatternType } from "@fjall/generator";
+/**
+ * Get the destroy step ID for a given stack type
+ */
+export declare function getDestroyStepId(stackType: string): string;
+/**
+ * Step registry providing step filtering and registry logic.
+ * Step definitions (STEP_IDS, STEP_NAMES, StepDefinition, StepContext)
+ * live in types/stepDefinitions.ts — the single source of truth.
+ *
+ * This class was moved from CLI to deploy-core so both CLI and webapp
+ * can use the same step registry.
+ */
+export declare class StepRegistry {
+    /**
+     * Unified deployment steps for ALL deployment types
+     * Key format: "{deploymentType}-{operation}"
+     */
+    private static readonly DEPLOYMENT_STEPS;
+    /**
+     * Get filtered steps based on deployment context
+     * This is the SINGLE method for getting steps for ANY deployment
+     */
+    static getSteps(context: StepContext): StepDefinition[];
+    /**
+     * Get step names for UI display
+     */
+    static getStepNames(context: StepContext): string[];
+    /**
+     * Get the index of a specific step in the filtered list
+     */
+    static getStepIndex(stepId: string, context: StepContext): number;
+    /**
+     * Get a step by ID from all steps
+     */
+    static getStepById(stepId: string, deploymentType?: StepDeploymentType): StepDefinition | undefined;
+    /**
+     * Check if a step should be included based on context
+     */
+    static isStepIncluded(stepId: string, context: StepContext): boolean;
+    /**
+     * Convenience method for creating context
+     */
+    static createContext(deploymentType: StepDeploymentType, operation: Operation, options?: {
+        deployOnly?: boolean;
+        infraOnly?: boolean;
+        isManagedAccount?: boolean;
+        hasDockerfile?: boolean;
+        pattern?: PatternType | null;
+        builderName?: string;
+        resources?: AppResourceFlags;
+    }): StepContext;
+    /**
+     * Get all deployment types
+     */
+    static getDeploymentTypes(): StepDeploymentType[];
+    /**
+     * Get stack names for a deployment type
+     */
+    static getStackNames(deploymentType: StepDeploymentType): string[];
+    /**
+     * Get infrastructure step IDs for skipping
+     */
+    static getInfraStepIds(): string[];
+    /**
+     * Get Docker step IDs for skipping
+     */
+    static getDockerStepIds(): string[];
+}