@fjall/deploy-core 0.94.1 → 0.95.0

package/dist/src/orchestration/applicationDeployHelpers.js

@@ -1,223 +1,4 @@
-import { success, failure } from "@fjall/generator";
-import { APPLICATION_STACKS, getApplicationDeployOrder, getApplicationStackName, getApplicationStepName, getApplicationStepId, PARALLEL_DEPLOY_GROUPS } from "../types/operations.js";
-import { emitProgress } from "../services/supporting/helpers.js";
-import { bootstrapOrFail, forwardOutput, forwardResourceProgress } from "./contextHelpers.js";
-import { hasDockerfile } from "../util/dockerfileDetection.js";
-import { runDockerBuild } from "./dockerBuildHelper.js";
-import { runWelcomeImageSetup } from "./welcomeImageHelper.js";
-/**
- * Identify Phase 2 stacks (Storage, Messaging, Database) that are consecutive
- * in the deploy order and have changes. Returns them for parallel deployment
- * only if there are at least 2.
- */
-export function getParallelPhase2Stacks(deployOrder, currentIndex, stackChanges, force) {
-    const phase2Set = new Set(PARALLEL_DEPLOY_GROUPS.PHASE_2.stacks);
-    const candidates = [];
-    for (let j = currentIndex; j < deployOrder.length; j++) {
-        if (phase2Set.has(deployOrder[j])) {
-            candidates.push(deployOrder[j]);
-        }
-        else {
-            break;
-        }
-    }
-    if (candidates.length < 2)
-        return [];
-    // Only include stacks that actually have changes (unless forced)
-    if (!force) {
-        const withChanges = candidates.filter((stack) => {
-            // stackChanges is keyed by full stack name but we only have the type here;
-            // since we don't know the app name, check all entries ending with the stack type
-            for (const [key, changed] of stackChanges) {
-                if (key.endsWith(stack) && !changed)
-                    return false;
-            }
-            return true;
-        });
-        return withChanges.length >= 2 ? withChanges : [];
-    }
-    return candidates;
-}
-/**
- * Deploy a group of stacks in parallel, reporting step events for each.
- */
-export async function deployParallelPhase(stacks, operation, services, context, callbacks, startIndex, totalSteps, detection, allOutputs, deployedHashes) {
-    // Emit step start for each parallel stack
-    for (let k = 0; k < stacks.length; k++) {
-        const stack = stacks[k];
-        const stepId = getApplicationStepId(stack, "deploy");
-        const stepName = getApplicationStepName(stack, "deploy");
-        callbacks.onStepStart?.(stepId, stepName, startIndex + k, totalSteps);
-    }
-    emitProgress(callbacks, "Deploying infrastructure in parallel…");
-    callbacks.onParallelPhaseStart?.(stacks, "Storage and database resources (parallel)");
-    const parallelResult = await services.stackService.deployStacksInParallel(stacks, context, {
-        onOutput: forwardOutput(callbacks),
-        onResourceProgress: (event, stackId) => {
-            callbacks.onResourceProgress?.(event);
-            if (stackId) {
-                callbacks.onParallelStackResourceProgress?.(stackId, event);
-            }
-        },
-        onStackComplete: (stack, stackSuccess, _duration, error) => {
-            const stepId = getApplicationStepId(stack, "deploy");
-            const stepName = getApplicationStepName(stack, "deploy");
-            const idx = startIndex + stacks.indexOf(stack);
-            callbacks.onStepComplete?.(stepId, stepName, stackSuccess ? "completed" : "error", idx, totalSteps);
-            if (!stackSuccess && error) {
-                callbacks.onError?.(error);
-            }
-        }
-    });
-    if (!parallelResult.success) {
-        callbacks.onParallelPhaseComplete?.([]);
-        return failure(parallelResult.error);
-    }
-    // Check for any failures
-    const failures = parallelResult.data.filter((r) => !r.success);
-    callbacks.onParallelPhaseComplete?.(parallelResult.data.map((r) => ({
-        stack: r.stack,
-        success: r.success,
-        error: r.error
-    })));
-    if (failures.length > 0) {
-        const failedStacks = failures.map((f) => f.stack).join(", ");
-        const errorDetails = failures
-            .map((f) => `${f.stack}: ${f.error?.message ?? "Unknown error"}`)
-            .join("\n");
-        return failure(new Error(`Failed to deploy stacks: ${failedStacks}\n\n${errorDetails}`));
-    }
-    // Collect outputs and track hashes for successful parallel stacks
-    for (const result of parallelResult.data) {
-        if (result.success && result.outputs) {
-            for (const [key, value] of Object.entries(result.outputs)) {
-                allOutputs[key] = String(value);
-            }
-        }
-        const stackName = getApplicationStackName(operation.appName, result.stack);
-        const hash = detection.currentHashes.get(stackName);
-        if (hash) {
-            deployedHashes.set(stackName, hash);
-        }
-    }
-    return success(undefined);
-}
-/**
- * Deploy a single stack with step lifecycle events and output collection.
- */
-export async function deployStackSequential(stack, services, context, callbacks, stepIndex, totalSteps, allOutputs) {
-    const stepId = getApplicationStepId(stack, "deploy");
-    const stepName = getApplicationStepName(stack, "deploy");
-    callbacks.onStepStart?.(stepId, stepName, stepIndex, totalSteps);
-    const result = await services.stackService.deployStack(stack, context, {
-        onOutput: forwardOutput(callbacks),
-        onResourceProgress: forwardResourceProgress(callbacks)
-    });
-    if (!result.success) {
-        callbacks.onStepComplete?.(stepId, stepName, "error", stepIndex, totalSteps);
-        callbacks.onError?.(result.error);
-        return failure(result.error);
-    }
-    callbacks.onStepComplete?.(stepId, stepName, "completed", stepIndex, totalSteps);
-    if (result.data.outputs) {
-        for (const [key, value] of Object.entries(result.data.outputs)) {
-            allOutputs[key] = String(value);
-        }
-    }
-    return success(undefined);
-}
-/**
- * Run Docker build/push or welcome image setup before the Compute stack.
- * Returns a failure Result if Docker operations fail, or null if not applicable/successful.
- */
-export async function runDockerPreCompute(stack, params, services, operation, callbacks, hasDockerfileOnDisk) {
-    if (stack !== APPLICATION_STACKS.COMPUTE || !params.dockerProvider)
-        return null;
-    if (hasDockerfileOnDisk) {
-        const dockerResult = await runDockerBuild(params, services, operation, callbacks);
-        if (!dockerResult.success)
-            return failure(dockerResult.error);
-    }
-    else {
-        const ecrInitResult = await runWelcomeImageSetup(params, services, operation, callbacks);
-        if (!ecrInitResult.success)
-            return failure(ecrInitResult.error);
-    }
-    return null;
-}
-/**
- * Deploy all stacks unconditionally (deployOnly mode).
- * Skips CDK synth/hash comparison — uses the framework registry to determine
- * deploy order, then deploys every stack sequentially.
- */
-export async function deployAllStacks(params, services, operation, context, startTime, plan) {
-    const { callbacks } = params;
-    // Use plan from registry if available, otherwise resolve now
-    let deployOrder;
-    if (plan) {
-        deployOrder = plan.deployOrder;
-    }
-    else {
-        const resolved = services.frameworkRegistry.resolve({
-            appPath: operation.path
-        });
-        if (resolved) {
-            const freshPlan = resolved.builder.plan({ appPath: operation.path }, resolved.detection);
-            deployOrder = freshPlan.deployOrder;
-        }
-        else {
-            deployOrder = getApplicationDeployOrder();
-        }
-    }
-    const totalSteps = deployOrder.length;
-    // Bootstrap
-    const bsResult = await bootstrapOrFail(services, context, callbacks);
-    if (!bsResult.success)
-        return bsResult;
-    // Deploy all stacks sequentially
-    const allOutputs = {};
-    for (let i = 0; i < deployOrder.length; i++) {
-        const stack = deployOrder[i];
-        // Docker operations before Compute stack
-        const dockerFailed = await runDockerPreCompute(stack, params, services, operation, callbacks, hasDockerfile(operation.path));
-        if (dockerFailed)
-            return dockerFailed;
-        const deployResult = await deployStackSequential(stack, services, context, callbacks, i, totalSteps, allOutputs);
-        if (!deployResult.success)
-            return failure(deployResult.error);
-    }
-    // Resolve website URL
-    const websiteUrl = await services.stackService.resolveWebsiteUrl(operation.appName);
-    if (websiteUrl) {
-        allOutputs.websiteUrl = websiteUrl;
-    }
-    return success({
-        target: operation.appName,
-        deploymentType: "application",
-        outputs: Object.keys(allOutputs).length > 0 ? allOutputs : undefined,
-        durationMs: Date.now() - startTime
-    });
-}
-/**
- * Bridge DeployCallbacks to BuildCallbacks.
- * Fires both legacy OpenNext-specific callbacks and generic build callbacks
- * for backwards compatibility during the transition period.
- */
-export function createBuildCallbacks(callbacks) {
-    return {
-        onBuildStart: (builderName) => {
-            callbacks.onOpenNextBuildStart?.();
-            callbacks.onLog?.(`${builderName} build started`, "info");
-        },
-        onBuildProgress: (_builderName, message) => {
-            callbacks.onOpenNextProgress?.(message);
-        },
-        onBuildComplete: (builderName) => {
-            callbacks.onOpenNextBuildComplete?.();
-            callbacks.onLog?.(`${builderName} build complete`, "info");
-        },
-        onBuildError: (_builderName, error) => {
-            callbacks.onOpenNextBuildError?.(error);
-        }
-    };
-}
+import{success as h,failure as P}from"@fjall/generator";import{APPLICATION_STACKS as R,getApplicationDeployOrder as A,getApplicationStackName as B,getApplicationStepName as y,getApplicationStepId as O,PARALLEL_DEPLOY_GROUPS as E}from"../types/operations.js";import{emitProgress as k}from"../services/supporting/helpers.js";import{bootstrapOrFail as x,forwardOutput as w,forwardResourceProgress as D}from"./contextHelpers.js";import{hasDockerfile as L}from"../util/dockerfileDetection.js";import{runDockerBuild as _}from"./dockerBuildHelper.js";import{runWelcomeImageSetup as j}from"./welcomeImageHelper.js";function q(t,o,s,i){const n=new Set(E.PHASE_2.stacks),a=[];for(let r=o;r<t.length&&n.has(t[r]);r++)a.push(t[r]);if(a.length<2)return[];if(!i){const r=a.filter(l=>{for(const[f,c]of s)if(f.endsWith(l)&&!c)return!1;return!0});return r.length>=2?r:[]}return a}async function G(t,o,s,i,n,a,r,l,f,c){for(let e=0;e<t.length;e++){const u=t[e],p=O(u,"deploy"),m=y(u,"deploy");n.onStepStart?.(p,m,a+e,r)}k(n,"Deploying infrastructure in parallel\u2026"),n.onParallelPhaseStart?.(t,"Storage and database resources (parallel)");const d=await s.stackService.deployStacksInParallel(t,i,{onOutput:w(n),onResourceProgress:(e,u)=>{n.onResourceProgress?.(e),u&&n.onParallelStackResourceProgress?.(u,e)},onStackComplete:(e,u,p,m)=>{const S=O(e,"deploy"),N=y(e,"deploy"),C=a+t.indexOf(e);n.onStepComplete?.(S,N,u?"completed":"error",C,r),!u&&m&&n.onError?.(m)}});if(!d.success)return n.onParallelPhaseComplete?.([]),P(d.error);const g=d.data.filter(e=>!e.success);if(n.onParallelPhaseComplete?.(d.data.map(e=>({stack:e.stack,success:e.success,error:e.error}))),g.length>0){const e=g.map(p=>p.stack).join(", "),u=g.map(p=>`${p.stack}: ${p.error?.message??"Unknown error"}`).join(`
+`);return P(new Error(`Failed to deploy stacks: ${e}
+
+${u}`))}for(const e of d.data){if(e.success&&e.outputs)for(const[m,S]of Object.entries(e.outputs))f[m]=String(S);const u=B(o.appName,e.stack),p=l.currentHashes.get(u);p&&c.set(u,p)}return h(void 0)}async function U(t,o,s,i,n,a,r){const l=O(t,"deploy"),f=y(t,"deploy");i.onStepStart?.(l,f,n,a);const c=await o.stackService.deployStack(t,s,{onOutput:w(i),onResourceProgress:D(i)});if(!c.success)return i.onStepComplete?.(l,f,"error",n,a),i.onError?.(c.error),P(c.error);if(i.onStepComplete?.(l,f,"completed",n,a),c.data.outputs)for(const[d,g]of Object.entries(c.data.outputs))r[d]=String(g);return h(void 0)}async function $(t,o,s,i,n,a){if(t!==R.COMPUTE||!o.dockerProvider)return null;if(a){const r=await _(o,s,i,n);if(!r.success)return P(r.error)}else{const r=await j(o,s,i,n);if(!r.success)return P(r.error)}return null}async function K(t,o,s,i,n,a){const{callbacks:r}=t;let l;if(a)l=a.deployOrder;else{const e=o.frameworkRegistry.resolve({appPath:s.path});e?l=e.builder.plan({appPath:s.path},e.detection).deployOrder:l=A()}const f=l.length,c=await x(o,i,r);if(!c.success)return c;const d={};for(let e=0;e<l.length;e++){const u=l[e],p=await $(u,t,o,s,r,L(s.path));if(p)return p;const m=await U(u,o,i,r,e,f,d);if(!m.success)return P(m.error)}const g=await o.stackService.resolveWebsiteUrl(s.appName);return g&&(d.websiteUrl=g),h({target:s.appName,deploymentType:"application",outputs:Object.keys(d).length>0?d:void 0,durationMs:Date.now()-n})}function Y(t){return{onBuildStart:o=>{t.onOpenNextBuildStart?.(),t.onLog?.(`${o} build started`,"info")},onBuildProgress:(o,s)=>{t.onOpenNextProgress?.(s)},onBuildComplete:o=>{t.onOpenNextBuildComplete?.(),t.onLog?.(`${o} build complete`,"info")},onBuildError:(o,s)=>{t.onOpenNextBuildError?.(s)}}}export{Y as createBuildCallbacks,K as deployAllStacks,G as deployParallelPhase,U as deployStackSequential,q as getParallelPhase2Stacks,$ as runDockerPreCompute};

package/dist/src/orchestration/applicationDestroy.js

@@ -1,131 +1 @@
-import { success, failure } from "@fjall/generator";
-import { logger } from "@fjall/util/logger";
-import { getApplicationDestroyOrder, getApplicationStepName, getApplicationStepId } from "../types/operations.js";
-import { stubCallerIdentity } from "../types/deployment/index.js";
-import { deriveResourcesFromManifestStacks } from "../types/patternDetection.js";
-import { CdkContextBuilder } from "../services/supporting/CdkContextBuilder.js";
-import { buildParamsContext } from "./contextHelpers.js";
-import { deleteStateFile, readStateFile } from "../types/FjallState.js";
-/**
- * Core application destruction orchestration.
- *
- * Detects application pattern, determines destroy order (reverse of deploy),
- * then destroys stacks sequentially or in parallel groups. Delegates all
- * CDK operations to the ApplicationStackService.destroyAllStacks() method,
- * which handles "stack doesn't exist" → success conversion and parallel
- * phase orchestration for OpenNext patterns.
- */
-export async function destroyApplication(params, services, operation) {
-    const { callbacks } = params;
-    const startTime = Date.now();
-    // 1. Detect pattern for correct destroy order
-    const resolved = services.frameworkRegistry.resolve({
-        appPath: operation.path
-    });
-    const pattern = resolved?.detection.pattern ?? null;
-    // Derive resources from state file (if available from prior deploy)
-    let destroyResources;
-    try {
-        const stateFile = await readStateFile(operation.path);
-        if (stateFile !== null) {
-            const stackNames = Object.keys(stateFile.templateHashes);
-            if (stackNames.length > 0) {
-                destroyResources = deriveResourcesFromManifestStacks(stackNames);
-            }
-        }
-    }
-    catch (err) {
-        logger.debug("applicationDestroy", "Could not read state file for resource detection", { error: err instanceof Error ? err.message : String(err) });
-        callbacks.onLog?.("Could not read state file for resource detection — falling back to pattern detection", "warn");
-    }
-    // 2. Build deployment context
-    const context = CdkContextBuilder.buildDeploymentContext({
-        deployType: "application",
-        target: operation.appName,
-        path: operation.path,
-        region: services.awsProvider.getRegion(),
-        callerIdentity: stubCallerIdentity(services.awsProvider.getAccountId()),
-        ...buildParamsContext({
-            orgConfig: params.orgConfig,
-            identity: params.identity
-        })
-    }, {
-        verbose: params.options?.verbose
-    }, params.orgConfig);
-    // 3. Determine destroy order
-    const destroyOrder = getApplicationDestroyOrder({
-        pattern,
-        resources: destroyResources
-    });
-    const totalSteps = destroyOrder.length;
-    callbacks.onLog?.(`Destroying ${operation.appName} (${totalSteps} stacks, ${pattern ?? "standard"} pattern)`, "info");
-    // 4. Destroy stacks via ApplicationStackService
-    const stacksDestroyed = [];
-    const skippedStacks = [];
-    const destroyResult = await services.stackService.destroyAllStacks(context, {
-        onOutput: (chunk) => {
-            callbacks.onOutput?.(chunk);
-        },
-        onResourceProgress: (event, stackId) => {
-            callbacks.onResourceProgress?.(event);
-            if (stackId) {
-                callbacks.onParallelStackResourceProgress?.(stackId, event);
-            }
-        },
-        onStackStart: (stackType, _stackName) => {
-            const stepId = getApplicationStepId(stackType, "destroy");
-            const stepName = getApplicationStepName(stackType, "destroy");
-            const stepIndex = destroyOrder.indexOf(stackType);
-            callbacks.onStepStart?.(stepId, stepName, stepIndex, totalSteps);
-        },
-        onStackComplete: async (stackType, result) => {
-            const stepId = getApplicationStepId(stackType, "destroy");
-            const stepName = getApplicationStepName(stackType, "destroy");
-            const stepIndex = destroyOrder.indexOf(stackType);
-            if (result.success) {
-                if (result.data?.skipped) {
-                    skippedStacks.push(result.data.stackName || stackType);
-                    callbacks.onStepComplete?.(stepId, stepName, "skipped", stepIndex, totalSteps);
-                }
-                else {
-                    stacksDestroyed.push(result.data?.stackName || stackType);
-                    callbacks.onStepComplete?.(stepId, stepName, "completed", stepIndex, totalSteps);
-                }
-            }
-            else {
-                callbacks.onStepComplete?.(stepId, stepName, "error", stepIndex, totalSteps);
-                callbacks.onError?.(result.error);
-            }
-        },
-        onParallelPhaseStart: (stacks, description) => {
-            callbacks.onLog?.(`Parallel phase: ${description}`, "info");
-            callbacks.onParallelPhaseStart?.(stacks, description);
-        },
-        onParallelPhaseComplete: (results) => {
-            const failed = results.filter((r) => !r.success);
-            if (failed.length > 0) {
-                callbacks.onLog?.(`Parallel phase completed with ${failed.length} failure(s)`, "warn");
-            }
-            callbacks.onParallelPhaseComplete?.(results);
-        }
-    }, destroyResources);
-    if (!destroyResult.success) {
-        callbacks.onError?.(destroyResult.error);
-        return failure(destroyResult.error);
-    }
-    // 5. Clean up state file after successful destroy
-    try {
-        await deleteStateFile(operation.path);
-    }
-    catch (err) {
-        logger.debug("applicationDestroy", "Failed to delete state file (non-critical)", { error: err instanceof Error ? err.message : String(err) });
-        callbacks.onLog?.("Failed to delete state file (non-critical)", "warn");
-    }
-    return success({
-        target: operation.appName,
-        deploymentType: "application",
-        stacksDestroyed,
-        skippedStacks,
-        durationMs: Date.now() - startTime
-    });
-}
+import{success as k,failure as w}from"@fjall/generator";import{logger as y}from"@fjall/util/logger";import{getApplicationDestroyOrder as b,getApplicationStepName as h,getApplicationStepId as S}from"../types/operations.js";import{stubCallerIdentity as N}from"../types/deployment/index.js";import{deriveResourcesFromManifestStacks as x}from"../types/patternDetection.js";import{CdkContextBuilder as D}from"../services/supporting/CdkContextBuilder.js";import{buildParamsContext as R}from"./contextHelpers.js";import{deleteStateFile as I,readStateFile as O}from"../types/FjallState.js";async function H(n,c,r){const{callbacks:o}=n,P=Date.now(),f=c.frameworkRegistry.resolve({appPath:r.path})?.detection.pattern??null;let p;try{const e=await O(r.path);if(e!==null){const t=Object.keys(e.templateHashes);t.length>0&&(p=x(t))}}catch(e){y.debug("applicationDestroy","Could not read state file for resource detection",{error:e instanceof Error?e.message:String(e)}),o.onLog?.("Could not read state file for resource detection \u2014 falling back to pattern detection","warn")}const C=D.buildDeploymentContext({deployType:"application",target:r.appName,path:r.path,region:c.awsProvider.getRegion(),callerIdentity:N(c.awsProvider.getAccountId()),...R({orgConfig:n.orgConfig,identity:n.identity})},{verbose:n.options?.verbose},n.orgConfig),d=b({pattern:f,resources:p}),s=d.length;o.onLog?.(`Destroying ${r.appName} (${s} stacks, ${f??"standard"} pattern)`,"info");const g=[],u=[],m=await c.stackService.destroyAllStacks(C,{onOutput:e=>{o.onOutput?.(e)},onResourceProgress:(e,t)=>{o.onResourceProgress?.(e),t&&o.onParallelStackResourceProgress?.(t,e)},onStackStart:(e,t)=>{const a=S(e,"destroy"),l=h(e,"destroy"),i=d.indexOf(e);o.onStepStart?.(a,l,i,s)},onStackComplete:async(e,t)=>{const a=S(e,"destroy"),l=h(e,"destroy"),i=d.indexOf(e);t.success?t.data?.skipped?(u.push(t.data.stackName||e),o.onStepComplete?.(a,l,"skipped",i,s)):(g.push(t.data?.stackName||e),o.onStepComplete?.(a,l,"completed",i,s)):(o.onStepComplete?.(a,l,"error",i,s),o.onError?.(t.error))},onParallelPhaseStart:(e,t)=>{o.onLog?.(`Parallel phase: ${t}`,"info"),o.onParallelPhaseStart?.(e,t)},onParallelPhaseComplete:e=>{const t=e.filter(a=>!a.success);t.length>0&&o.onLog?.(`Parallel phase completed with ${t.length} failure(s)`,"warn"),o.onParallelPhaseComplete?.(e)}},p);if(!m.success)return o.onError?.(m.error),w(m.error);try{await I(r.path)}catch(e){y.debug("applicationDestroy","Failed to delete state file (non-critical)",{error:e instanceof Error?e.message:String(e)}),o.onLog?.("Failed to delete state file (non-critical)","warn")}return k({target:r.appName,deploymentType:"application",stacksDestroyed:g,skippedStacks:u,durationMs:Date.now()-P})}export{H as destroyApplication};

package/dist/src/orchestration/builders/dockerBuilder.js

@@ -1,98 +1 @@
-/**
- * DockerBuilder — FrameworkBuilder implementation for standard Docker apps.
- *
- * Fallback builder (priority 100) that detects any Fjall app with an
- * infrastructure.ts file. Docker builds are NOT handled here — they are
- * handled by DockerProvider in the orchestration layer. This builder only
- * produces the deployment plan and resource detection.
- */
-import { existsSync, readFileSync } from "fs";
-import { join } from "path";
-import { success } from "@fjall/generator";
-import { logger } from "@fjall/util/logger";
-import { getErrorMessage } from "@fjall/util";
-import { hasDockerfile } from "../../util/dockerfileDetection.js";
-import { INFRASTRUCTURE_FILENAME } from "../../types/constants.js";
-import { getApplicationDeployOrder, getApplicationDestroyOrder } from "../../types/operations.js";
-/** Default resources when infrastructure.ts cannot be parsed */
-const DEFAULT_RESOURCES = {
-    hasNetwork: true,
-    hasCompute: true,
-    hasDatabase: false,
-    hasStorage: false,
-    hasMessaging: false,
-    hasCdn: false
-};
-/**
- * Read infrastructure.ts and derive resource flags from its content.
- */
-function detectResources(appPath) {
-    try {
-        const filePath = join(appPath, INFRASTRUCTURE_FILENAME);
-        if (!existsSync(filePath))
-            return { exists: false, hasDatabase: false };
-        const content = readFileSync(filePath, "utf-8");
-        const hasDatabase = content.includes("DatabaseFactory.build(");
-        return { exists: true, hasDatabase };
-    }
-    catch (error) {
-        logger.debug("dockerBuilder", "Failed to read infrastructure file", {
-            appPath,
-            error: getErrorMessage(error)
-        });
-        return { exists: false, hasDatabase: false };
-    }
-}
-/**
- * Docker FrameworkBuilder for standard containerised applications.
- *
- * Priority 100 — checked last as the fallback builder. Any Fjall app with
- * an infrastructure.ts file is a valid Docker app unless a higher-priority
- * builder (e.g. OpenNext) claims it first.
- */
-export const dockerBuilder = {
-    name: "docker",
-    priority: 100,
-    detect(context) {
-        const { exists, hasDatabase } = detectResources(context.appPath);
-        if (!exists) {
-            return {
-                detected: false,
-                pattern: null,
-                reason: "No infrastructure.ts found",
-                resources: DEFAULT_RESOURCES,
-                hasDatabase: false,
-                hasDockerfile: false
-            };
-        }
-        const dockerfile = hasDockerfile(context.appPath);
-        return {
-            detected: true,
-            pattern: null,
-            reason: dockerfile
-                ? "infrastructure.ts found with Dockerfile"
-                : "infrastructure.ts found (no Dockerfile)",
-            resources: { ...DEFAULT_RESOURCES, hasDatabase },
-            hasDatabase,
-            hasDockerfile: dockerfile
-        };
-    },
-    plan(_context, detection) {
-        const resources = detection.resources;
-        return {
-            builderName: "docker",
-            deployOrder: getApplicationDeployOrder({ resources }),
-            destroyOrder: getApplicationDestroyOrder({ resources }),
-            parallelDestroy: false,
-            preBuildCommands: [],
-            buildCommand: null,
-            requiresDockerBuild: detection.hasDockerfile,
-            resources
-        };
-    },
-    async build(_appPath, _plan, _callbacks, _options) {
-        // Docker builds are handled by DockerProvider in the orchestration layer,
-        // not by the builder. This is the correct separation of concerns.
-        return success(undefined);
-    }
-};
+import{existsSync as o,readFileSync as n}from"fs";import{join as i}from"path";import{success as l}from"@fjall/generator";import{logger as c}from"@fjall/util/logger";import{getErrorMessage as u}from"@fjall/util";import{hasDockerfile as f}from"../../util/dockerfileDetection.js";import{INFRASTRUCTURE_FILENAME as d}from"../../types/constants.js";import{getApplicationDeployOrder as p,getApplicationDestroyOrder as m}from"../../types/operations.js";const a={hasNetwork:!0,hasCompute:!0,hasDatabase:!1,hasStorage:!1,hasMessaging:!1,hasCdn:!1};function h(s){try{const e=i(s,d);return o(e)?{exists:!0,hasDatabase:n(e,"utf-8").includes("DatabaseFactory.build(")}:{exists:!1,hasDatabase:!1}}catch(e){return c.debug("dockerBuilder","Failed to read infrastructure file",{appPath:s,error:u(e)}),{exists:!1,hasDatabase:!1}}}const C={name:"docker",priority:100,detect(s){const{exists:e,hasDatabase:r}=h(s.appPath);if(!e)return{detected:!1,pattern:null,reason:"No infrastructure.ts found",resources:a,hasDatabase:!1,hasDockerfile:!1};const t=f(s.appPath);return{detected:!0,pattern:null,reason:t?"infrastructure.ts found with Dockerfile":"infrastructure.ts found (no Dockerfile)",resources:{...a,hasDatabase:r},hasDatabase:r,hasDockerfile:t}},plan(s,e){const r=e.resources;return{builderName:"docker",deployOrder:p({resources:r}),destroyOrder:m({resources:r}),parallelDestroy:!1,preBuildCommands:[],buildCommand:null,requiresDockerBuild:e.hasDockerfile,resources:r}},async build(s,e,r,t){return l(void 0)}};export{C as dockerBuilder};

package/dist/src/orchestration/builders/openNextBuilder.js

@@ -1,144 +1 @@
-/**
- * OpenNextBuilder — FrameworkBuilder implementation for Next.js and Payload apps.
- *
- * Detects OpenNext patterns from infrastructure.ts, produces a build plan with
- * the correct stack ordering, and delegates build execution to `runOpenNextBuild()`.
- *
- * BUILD ORDERING NOTE: The OpenNext build runs BEFORE the detection pipeline
- * because CDK synth needs the `.open-next/` directory to exist. This builder's
- * `build()` method is called early in the deployment flow, not after detection.
- * The plan's `buildCommand` is declarative — actual execution goes through
- * `runOpenNextBuild()` which handles binary resolution, timeouts, and cleanup.
- */
-import { basename } from "path";
-import { success } from "@fjall/generator";
-import { logger } from "@fjall/util/logger";
-import { OPENNEXT_DEPLOY_ORDER, OPENNEXT_DESTROY_ORDER } from "../../types/operations.js";
-import { readInfrastructureContent } from "../../types/patternDetection.js";
-import { runOpenNextBuild, BUILD_TIMEOUT_MS, IMPORT_MAP_TIMEOUT_MS } from "../openNextBuild.js";
-/** Resource flags for all OpenNext apps (hasDatabase is dynamic) */
-function openNextResources(hasDatabase) {
-    return {
-        hasNetwork: true,
-        hasCompute: true,
-        hasDatabase,
-        hasStorage: true,
-        hasMessaging: true,
-        hasCdn: true
-    };
-}
-/**
- * OpenNext FrameworkBuilder for Next.js and Payload applications.
- *
- * Priority 10 — checked before Docker (priority 50) since OpenNext is more
- * specific. Apps matching an OpenNext pattern use Lambda-based deployment
- * with S3, DynamoDB, SQS, and CloudFront stacks.
- */
-export const openNextBuilder = {
-    name: "opennext",
-    priority: 10,
-    detect(context) {
-        const notDetected = {
-            detected: false,
-            pattern: null,
-            reason: "No OpenNext pattern found",
-            resources: openNextResources(false),
-            hasDatabase: false,
-            hasDockerfile: false
-        };
-        const content = readInfrastructureContent(context.appPath);
-        if (!content) {
-            return {
-                ...notDetected,
-                reason: "No infrastructure.ts found"
-            };
-        }
-        if (!content.includes("PatternFactory")) {
-            return {
-                ...notDetected,
-                reason: "No PatternFactory reference in infrastructure.ts"
-            };
-        }
-        if (content.includes('type: "payload"')) {
-            return {
-                detected: true,
-                pattern: "payload",
-                reason: 'PatternFactory with type: "payload" detected',
-                resources: openNextResources(true),
-                hasDatabase: true,
-                hasDockerfile: false
-            };
-        }
-        if (content.includes('type: "nextjs"')) {
-            // Next.js database detection is dynamic — check for explicit database usage
-            const hasDatabase = content.includes("DatabaseFactory.build(") ||
-                content.includes("database:");
-            return {
-                detected: true,
-                pattern: "nextjs",
-                reason: 'PatternFactory with type: "nextjs" detected',
-                resources: openNextResources(hasDatabase),
-                hasDatabase,
-                hasDockerfile: false
-            };
-        }
-        return {
-            ...notDetected,
-            reason: "PatternFactory found but no recognised pattern type"
-        };
-    },
-    plan(_context, detection) {
-        const preBuildCommands = detection.pattern === "payload"
-            ? [
-                {
-                    name: "payload-import-map",
-                    binary: "npx",
-                    args: ["payload", "generate:importmap"],
-                    timeoutMs: IMPORT_MAP_TIMEOUT_MS
-                }
-            ]
-            : [];
-        return {
-            builderName: "opennext",
-            deployOrder: OPENNEXT_DEPLOY_ORDER,
-            destroyOrder: OPENNEXT_DESTROY_ORDER,
-            parallelDestroy: true,
-            preBuildCommands,
-            buildCommand: {
-                name: "open-next-build",
-                binary: "open-next",
-                args: ["build"],
-                timeoutMs: BUILD_TIMEOUT_MS
-            },
-            requiresDockerBuild: false,
-            resources: detection.resources
-        };
-    },
-    async build(appPath, plan, callbacks, options) {
-        if (options?.skipBuild || options?.infraOnly) {
-            logger.debug("openNextBuilder", "Build skipped", {
-                skipBuild: options.skipBuild,
-                infraOnly: options.infraOnly
-            });
-            return success(undefined);
-        }
-        // Delegate to existing runOpenNextBuild which handles binary resolution,
-        // import map generation, timeouts, stream cleanup, and artefact validation.
-        // We build an ApplicationOperation and map BuildCallbacks to DeployCallbacks.
-        const operation = {
-            kind: "application",
-            appName: basename(appPath) || "app",
-            path: appPath
-        };
-        // Determine pattern from the plan's pre-build commands
-        const isPayload = plan.preBuildCommands.some((cmd) => cmd.name === "payload-import-map");
-        const pattern = isPayload ? "payload" : "nextjs";
-        const result = await runOpenNextBuild(operation, pattern, {
-            onOpenNextBuildStart: () => callbacks.onBuildStart?.("opennext"),
-            onOpenNextProgress: (message) => callbacks.onBuildProgress?.("opennext", message),
-            onOpenNextBuildComplete: () => callbacks.onBuildComplete?.("opennext"),
-            onOpenNextBuildError: (error) => callbacks.onBuildError?.("opennext", error)
-        });
-        return result;
-    }
-};
+import{basename as i}from"path";import{success as p}from"@fjall/generator";import{logger as d}from"@fjall/util/logger";import{OPENNEXT_DEPLOY_ORDER as l,OPENNEXT_DESTROY_ORDER as c}from"../../types/operations.js";import{readInfrastructureContent as m}from"../../types/patternDetection.js";import{runOpenNextBuild as f,BUILD_TIMEOUT_MS as y,IMPORT_MAP_TIMEOUT_MS as x}from"../openNextBuild.js";function o(r){return{hasNetwork:!0,hasCompute:!0,hasDatabase:r,hasStorage:!0,hasMessaging:!0,hasCdn:!0}}const E={name:"opennext",priority:10,detect(r){const t={detected:!1,pattern:null,reason:"No OpenNext pattern found",resources:o(!1),hasDatabase:!1,hasDockerfile:!1},e=m(r.appPath);if(!e)return{...t,reason:"No infrastructure.ts found"};if(!e.includes("PatternFactory"))return{...t,reason:"No PatternFactory reference in infrastructure.ts"};if(e.includes('type: "payload"'))return{detected:!0,pattern:"payload",reason:'PatternFactory with type: "payload" detected',resources:o(!0),hasDatabase:!0,hasDockerfile:!1};if(e.includes('type: "nextjs"')){const n=e.includes("DatabaseFactory.build(")||e.includes("database:");return{detected:!0,pattern:"nextjs",reason:'PatternFactory with type: "nextjs" detected',resources:o(n),hasDatabase:n,hasDockerfile:!1}}return{...t,reason:"PatternFactory found but no recognised pattern type"}},plan(r,t){const e=t.pattern==="payload"?[{name:"payload-import-map",binary:"npx",args:["payload","generate:importmap"],timeoutMs:x}]:[];return{builderName:"opennext",deployOrder:l,destroyOrder:c,parallelDestroy:!0,preBuildCommands:e,buildCommand:{name:"open-next-build",binary:"open-next",args:["build"],timeoutMs:y},requiresDockerBuild:!1,resources:t.resources}},async build(r,t,e,n){if(n?.skipBuild||n?.infraOnly)return d.debug("openNextBuilder","Build skipped",{skipBuild:n.skipBuild,infraOnly:n.infraOnly}),p(void 0);const s={kind:"application",appName:i(r)||"app",path:r},u=t.preBuildCommands.some(a=>a.name==="payload-import-map")?"payload":"nextjs";return await f(s,u,{onOpenNextBuildStart:()=>e.onBuildStart?.("opennext"),onOpenNextProgress:a=>e.onBuildProgress?.("opennext",a),onOpenNextBuildComplete:()=>e.onBuildComplete?.("opennext"),onOpenNextBuildError:a=>e.onBuildError?.("opennext",a)})}};export{E as openNextBuilder};