fjall 2.1.1 → 2.2.0

package/bin/assets/generators/utils/index.d.ts

@@ -1,8 +0,0 @@
-export * from "@fjall/generator";
-export * from "./ast/index.js";
-export * from "./planning/index.js";
-export * from "./resources/index.js";
-export { promptForConnection, selectResources } from "./prompts.js";
-export { renderEjsTemplates, renderEjsString, copyTemplateFile } from "./renderEjs.js";
-export { copySharedCdkFiles } from "./copySharedFiles.js";
-export { FileSystemTree } from "./tree.js";

package/bin/assets/generators/utils/index.js

@@ -1 +0,0 @@
-export*from"@fjall/generator";export*from"./ast/index.js";export*from"./planning/index.js";export*from"./resources/index.js";import{promptForConnection as f,selectResources as s}from"./prompts.js";import{renderEjsTemplates as l,renderEjsString as n,copyTemplateFile as c}from"./renderEjs.js";import{copySharedCdkFiles as d}from"./copySharedFiles.js";import{FileSystemTree as a}from"./tree.js";export{a as FileSystemTree,d as copySharedCdkFiles,c as copyTemplateFile,f as promptForConnection,n as renderEjsString,l as renderEjsTemplates,s as selectResources};

package/bin/assets/generators/utils/integrationTestUtils.d.ts

@@ -1,138 +0,0 @@
-/**
- * Integration Test Utilities
- *
- * Shared utilities for integration tests that run CDK synth operations.
- * Optimises test performance by using shared node_modules instead of
- * running npm install for each test.
- *
- * @see aiDocs/architecture/TESTING_STRATEGY.md
- */
-export declare const CLI_ROOT: string;
-export declare const TEST_APPS_DIR: string;
-export declare const COMPONENTS_DIR: string;
-export declare const TEST_FIXTURES_DIR: string;
-export declare const SHARED_NODE_MODULES: string;
-export declare const MOCK_ACCOUNT = "123456789012";
-export declare const MOCK_REGION = "ap-southeast-2";
-export interface CfnResource {
-    Type: string;
-    Properties: Record<string, unknown>;
-    [key: string]: unknown;
-}
-export interface CfnTemplate {
-    Resources: Record<string, CfnResource>;
-    [key: string]: unknown;
-}
-/**
- * ECS Container definition structure from CloudFormation.
- */
-export interface EcsContainerDefinition {
-    Name?: string;
-    Image?: string;
-    Essential?: boolean;
-    PortMappings?: Array<{
-        ContainerPort?: number;
-        Protocol?: string;
-    }>;
-    Environment?: Array<{
-        Name: string;
-        Value: string;
-    }>;
-    Secrets?: Array<{
-        Name: string;
-        ValueFrom: unknown;
-    }>;
-    Command?: string[];
-    EntryPoint?: string[];
-    [key: string]: unknown;
-}
-/**
- * Common CloudFormation resource properties accessed in tests.
- * Provides type safety for frequently accessed properties while
- * allowing access to any other property via index signature.
- */
-export interface CfnResourceProperties {
-    GroupDescription?: string;
-    SecurityGroupIngress?: Array<{
-        CidrIp?: string;
-        FromPort?: number;
-        ToPort?: number;
-        IpProtocol?: string;
-        SourceSecurityGroupId?: unknown;
-    }>;
-    Conditions?: Array<{
-        Field?: string;
-        PathPatternConfig?: {
-            Values?: string[];
-        };
-        HostHeaderConfig?: {
-            Values?: string[];
-        };
-        Values?: string[];
-    }>;
-    ContainerDefinitions?: EcsContainerDefinition[];
-    RequiresCompatibilities?: string[];
-    GenerateSecretString?: {
-        SecretStringTemplate?: string;
-        GenerateStringKey?: string;
-        ExcludeCharacters?: string;
-    };
-    [key: string]: unknown;
-}
-/**
- * A CloudFormation resource entry with typed common properties.
- */
-export interface ResourceEntry {
-    logicalId: string;
-    properties: CfnResourceProperties;
-}
-export interface CdkSynthResult {
-    success: boolean;
-    output: string;
-}
-/**
- * Run CDK synth on a test app.
- * Uses shared node_modules when available, falls back to npm install.
- */
-export declare function runCdkSynth(appName: string, options?: {
-    context?: Record<string, unknown>;
-}): CdkSynthResult;
-/**
- * Patch package.json + ensure node_modules for a test app, without running
- * `cdk synth`. Use this when a test only needs `tsc --noEmit` (or another
- * non-synth probe) against the generated `infrastructure.ts`.
- */
-export declare function prepareTestApp(appName: string): boolean;
-/**
- * Clean up a test app directory.
- * Handles symlinked node_modules properly.
- */
-export declare function cleanupTestApp(appName: string): void;
-/**
- * Read a CloudFormation template from cdk.out.
- *
- * Stack names use `toPascalCase(appName)` as prefix to match the transformation
- * in `App.getApp()` (see `components/infrastructure/lib/app.ts`).
- */
-export declare function readCfnTemplate(appName: string, stackSuffix: string): CfnTemplate;
-/**
- * Get infrastructure.ts content for a test app.
- */
-export declare function getInfrastructureContent(appName: string): string;
-/**
- * Find resources by type in a CloudFormation template.
- */
-export declare function findResourcesByType(template: CfnTemplate, resourceType: string): ResourceEntry[];
-/**
- * Find a security group by description substring.
- * Commonly used to find database or ALB security groups.
- */
-export declare function findSecurityGroupByDescription(securityGroups: ResourceEntry[], descriptionSubstring: string): ResourceEntry | undefined;
-/**
- * Extract values from ALB listener rule conditions by field type.
- */
-export declare function extractConditionValues(listenerRules: ResourceEntry[], fieldType: "path-pattern" | "host-header"): string[];
-/**
- * Ensure components-infrastructure is built.
- */
-export declare function ensureComponentsBuilt(): void;

package/bin/assets/generators/utils/integrationTestUtils.js

@@ -1,4 +0,0 @@
-import r from"fs";import o from"path";import{execFileSync as p}from"child_process";import{toPascalCase as y}from"@fjall/util";import{normaliseError as b}from"../../src/util/errorUtils.js";const a=o.resolve(import.meta.dirname,"../.."),u=o.join(a,"fjall"),d=o.resolve(a,"../components/infrastructure"),x=o.join(a,"test-fixtures"),f=o.join(x,"node_modules"),l="123456789012",s="ap-southeast-2";function v(n,e){const t=o.join(u,n);return S(t),_(t,e?.context),m(t)?g(t):{success:!1,output:"Failed to set up node_modules"}}function O(n){const e=o.join(u,n);return S(e),m(e)}function m(n){const e=o.join(n,"node_modules");if(r.existsSync(f))try{return r.existsSync(e)&&(r.lstatSync(e).isSymbolicLink()?r.unlinkSync(e):r.rmSync(e,{recursive:!0,force:!0})),r.symlinkSync(f,e,"junction"),!0}catch(t){process.stderr.write(`integrationTestUtils: symlink to shared node_modules failed, falling back to npm install: ${t instanceof Error?t.message:String(t)}
-`)}if(!r.existsSync(e))try{p("npm",["install"],{cwd:n,encoding:"utf-8",timeout:12e4})}catch(t){return process.stderr.write(`integrationTestUtils: npm install in ${n} failed: ${t instanceof Error?t.message:String(t)}
-`),!1}return!0}function g(n){try{const e=o.join(n,"node_modules",".bin","cdk");return{success:!0,output:p(e,["synth"],{cwd:n,encoding:"utf-8",timeout:12e4,stdio:["pipe","pipe","pipe"],env:{...process.env,AWS_REGION:s,AWS_DEFAULT_REGION:s,CDK_DEFAULT_ACCOUNT:l,CDK_DEFAULT_REGION:s}})}}catch(e){const t=b(e),i="stdout"in t&&typeof t.stdout=="string"?t.stdout:void 0,c="stderr"in t&&typeof t.stderr=="string"?t.stderr:void 0;return{success:!1,output:i||c||t.message||"Unknown error"}}}function S(n){const e=o.join(n,"package.json"),t=JSON.parse(r.readFileSync(e,"utf-8"));t.dependencies["@fjall/components-infrastructure"]=`file:${d}`,r.writeFileSync(e,JSON.stringify(t,null,2))}function _(n,e){const t={app:"./node_modules/.bin/tsx infrastructure.ts",context:{"aws:cdk:bundling-stacks":[],[`availability-zones:account=${l}:region=${s}`]:[`${s}a`,`${s}b`,`${s}c`],[`vpc-provider:account=${l}:filter.isDefault=true:region=${s}:returnAsymmetricSubnets=true`]:{vpcId:"vpc-12345678",vpcCidrBlock:"10.0.0.0/16",availabilityZones:[`${s}a`,`${s}b`],publicSubnetIds:["subnet-pub1","subnet-pub2"],publicSubnetRouteTableIds:["rtb-pub1","rtb-pub2"],privateSubnetIds:["subnet-priv1","subnet-priv2"],privateSubnetRouteTableIds:["rtb-priv1","rtb-priv2"]},...e}};r.writeFileSync(o.join(n,"cdk.json"),JSON.stringify(t,null,2))}function h(n){const e=o.join(u,n);if(!r.existsSync(e))return;const t=o.join(e,"node_modules");r.existsSync(t)&&r.lstatSync(t).isSymbolicLink()&&r.unlinkSync(t),r.rmSync(e,{recursive:!0,force:!0})}function $(n,e){const t=o.join(u,n,"cdk.out",`${y(n)}${e}.template.json`);if(!r.existsSync(t))throw new Error(`Template not found: ${t}`);return JSON.parse(r.readFileSync(t,"utf-8"))}function I(n){const e=o.join(u,n,"infrastructure.ts");if(!r.existsSync(e))throw new Error(`Infrastructure file not found: ${e}`);return r.readFileSync(e,"utf-8")}function w(n,e){return Object.entries(n.Resources).filter(([,t])=>t.Type===e).map(([t,i])=>({logicalId:t,properties:i.Properties}))}function D(n,e){return n.find(t=>t.properties.GroupDescription?.includes(e))}function N(n,e){const t=e==="path-pattern"?"PathPatternConfig":"HostHeaderConfig";return n.flatMap(i=>i.properties.Conditions?.filter(c=>c.Field===e).flatMap(c=>c[t]?.Values??c.Values??[])).filter(i=>i!==void 0)}function R(){r.existsSync(o.join(d,"dist"))||(process.stdout.write(`Building components-infrastructure...
-`),p("npm",["run","build"],{cwd:d,stdio:"inherit"}))}export{a as CLI_ROOT,d as COMPONENTS_DIR,l as MOCK_ACCOUNT,s as MOCK_REGION,f as SHARED_NODE_MODULES,u as TEST_APPS_DIR,x as TEST_FIXTURES_DIR,h as cleanupTestApp,R as ensureComponentsBuilt,N as extractConditionValues,w as findResourcesByType,D as findSecurityGroupByDescription,I as getInfrastructureContent,O as prepareTestApp,$ as readCfnTemplate,v as runCdkSynth};

package/bin/assets/generators/utils/mockTree.d.ts

@@ -1,30 +0,0 @@
-import type { Tree } from "@nx/devkit";
-/**
- * Lightweight mock Tree implementation for generator unit tests.
- * Use this instead of duplicating MockTree in each test file.
- *
- * For integration tests that need real file system behaviour, use FileSystemTree instead.
- */
-export declare class MockTree {
-    private files;
-    private changes;
-    constructor(initialFiles?: Record<string, string>);
-    read(path: string): Buffer | null;
-    write(path: string, content: string): void;
-    exists(path: string): boolean;
-    getChanges(): Array<{
-        path: string;
-        content: string;
-    }>;
-    getFileContent(path: string): string | undefined;
-}
-/**
- * Type helper: cast MockTree as Tree for generator functions that expect the NX Tree interface.
- *
- * @example
- * ```ts
- * const tree = new MockTree({ "apps/myapp/infrastructure/main.ts": code });
- * const result = myGenerator(tree as unknown as Tree, options);
- * ```
- */
-export type { Tree };

package/bin/assets/generators/utils/mockTree.js

@@ -1 +0,0 @@
-class r{files=new Map;changes=[];constructor(e={}){for(const[t,s]of Object.entries(e))this.files.set(t,s)}read(e){const t=this.files.get(e);return t?Buffer.from(t):null}write(e,t){this.files.set(e,t),this.changes.push({path:e,content:t})}exists(e){return this.files.has(e)}getChanges(){return this.changes}getFileContent(e){return this.files.get(e)}}export{r as MockTree};

package/bin/assets/generators/utils/planning/generatorHelpers.d.ts

@@ -1,35 +0,0 @@
-import { type Tree } from "@nx/devkit";
-import { type Result } from "../../../src/types/Result.js";
-import { type ParsedInfrastructure, type ApplicationResourcePlan } from "@fjall/generator";
-import { type z } from "zod";
-export declare function createInfrastructureBackup(tree: Tree, infrastructurePath: string, originalContent: string): Result<void, Error>;
-export declare function pickDefined<T extends Record<string, unknown>>(source: T, ...keys: Array<keyof T>): Partial<Pick<T, (typeof keys)[number]>>;
-export interface ParseAndBuildResult {
-    parsed: ParsedInfrastructure;
-    plan: ApplicationResourcePlan;
-}
-export declare function parseAndBuildPlan(content: string, appName: string): Result<ParseAndBuildResult, Error>;
-export declare function parseAndBuildPlanOrThrow(content: string, appName: string): ParseAndBuildResult;
-export declare function validateGeneratorOptions<T>(schema: z.ZodType<T>, options: unknown, generatorName: string): T;
-export declare function readInfrastructureOrThrow(tree: Tree, appName: string): {
-    path: string;
-    content: string;
-};
-export interface WithInfrastructurePlanContext<T> {
-    tree: Tree;
-    validated: T;
-    plan: ApplicationResourcePlan;
-    infrastructurePath: string;
-    content: string;
-}
-/**
- * Orchestrates the common generator pattern: validate options, read existing
- * infrastructure, parse into a plan, run custom logic, then write back.
- *
- * The callback receives the parsed plan and validated options, and must return
- * the updated plan to be written.
- */
-export declare function withInfrastructurePlan<T extends {
-    appName: string;
-}>(tree: Tree, schema: z.ZodType<T>, options: unknown, generatorName: string, buildPlan: (ctx: WithInfrastructurePlanContext<T>) => ApplicationResourcePlan | Promise<ApplicationResourcePlan>): Promise<void>;
-export declare function generateAndWriteInfrastructure(tree: Tree, infrastructurePath: string, originalContent: string, plan: ApplicationResourcePlan): Result<void, Error>;

package/bin/assets/generators/utils/planning/generatorHelpers.js

@@ -1,2 +0,0 @@
-import*as i from"fs";import*as w from"path";import{maskSensitiveOutput as h}from"@fjall/util";import{logger as g}from"../../../src/util/logger/index.js";import{normaliseError as d}from"../../../src/util/errorUtils.js";import{success as p,failure as a}from"../../../src/types/Result.js";import{parseInfrastructure as k,convertToResourcePlan as x,getZodErrorMessage as P,generateInfrastructureFromPlan as $}from"@fjall/generator";import{getInfrastructurePath as E}from"../../../src/util/pathHelpers.js";function I(t,o,r){const e=t.root?w.join(t.root,o):o;try{if(i.existsSync(e)){const s=`${e}.bak`,n=`${s}.tmp`;i.writeFileSync(n,r),i.renameSync(n,s)}return p(void 0)}catch(s){const n=d(s);return g.warn("Generator",`Failed to create backup of ${o}`,{error:h(n.message)}),a(n)}}function G(t,...o){const r={};for(const e of o)t[e]!==void 0&&(r[e]=t[e]);return r}function y(t,o){try{const r=k(t,{extractCustomCode:!0}),e=x(r,o,{skipValidation:!0});return r.customCodeBlocks?.length&&(e.customCodeBlocks=r.customCodeBlocks),p({parsed:r,plan:e})}catch(r){return a(d(r))}}function b(t,o){const r=y(t,o);if(!r.success)throw new Error(`Failed to parse infrastructure: ${r.error.message}`,{cause:r.error});return r.data}function B(t,o,r){const e=t.safeParse(o);if(!e.success)throw new Error(`Invalid ${r} generator options:
-${P(e.error)}`);return e.data}function v(t,o){const r=E(o),e=t.read(r)?.toString();if(!e)throw new Error(`App '${o}' not found. Expected infrastructure.ts at: ${r}`);return{path:r,content:e}}async function j(t,o,r,e,s){const n=B(o,r,e),{path:f,content:c}=v(t,n.appName),{plan:l}=b(c,n.appName),m=await s({tree:t,validated:n,plan:l,infrastructurePath:f,content:c}),u=C(t,f,c,m);if(!u.success)throw new Error(u.error.message,{cause:u.error})}function C(t,o,r,e){const s=$(e);if(!s.success)return a(s.error);const n=I(t,o,r);return n.success?(t.write(o,s.data),p(void 0)):a(new Error(`Failed to create backup: ${n.error.message}`))}export{I as createInfrastructureBackup,C as generateAndWriteInfrastructure,y as parseAndBuildPlan,b as parseAndBuildPlanOrThrow,G as pickDefined,v as readInfrastructureOrThrow,B as validateGeneratorOptions,j as withInfrastructurePlan};

package/bin/assets/generators/utils/planning/index.d.ts

@@ -1 +0,0 @@
-export { createInfrastructureBackup, pickDefined, type ParseAndBuildResult, parseAndBuildPlan, parseAndBuildPlanOrThrow, validateGeneratorOptions, readInfrastructureOrThrow, generateAndWriteInfrastructure, withInfrastructurePlan, type WithInfrastructurePlanContext } from "./generatorHelpers.js";

package/bin/assets/generators/utils/planning/index.js

@@ -1 +0,0 @@
-import{createInfrastructureBackup as a,pickDefined as t,parseAndBuildPlan as n,parseAndBuildPlanOrThrow as u,validateGeneratorOptions as d,readInfrastructureOrThrow as i,generateAndWriteInfrastructure as c,withInfrastructurePlan as s}from"./generatorHelpers.js";export{a as createInfrastructureBackup,c as generateAndWriteInfrastructure,n as parseAndBuildPlan,u as parseAndBuildPlanOrThrow,t as pickDefined,i as readInfrastructureOrThrow,d as validateGeneratorOptions,s as withInfrastructurePlan};

package/bin/assets/generators/utils/prompts.d.ts

@@ -1,4 +0,0 @@
-export declare function promptForConnection(resourceCount: number, resourceType: string, singularMessage?: string, pluralMessage?: string): Promise<boolean>;
-export declare function selectResources<T extends {
-    name: string;
-}>(resources: T[], message: string, getDescription?: (r: T) => string): Promise<string[]>;

package/bin/assets/generators/utils/prompts.js

@@ -1,6 +0,0 @@
-import i from"prompts";async function p(e,s,o,t){const c=`Connect to existing ${s}?`,n=`Found ${e} ${s}s. Configure connections?`,a=e===1?o??c:t?.replace("{count}",String(e))??n,l=await i([{type:"confirm",name:"shouldConnect",message:a,initial:!0}]);return l?l.shouldConnect:!1}async function u(e,s,o){if(e.length===1)return process.stdout.write(`
-  Auto-selected: ${e[0].name}
-`),[e[0].name];let t=[];for(;t.length===0;)t=(await i([{type:"multiselect",name:"selected",message:s,choices:e.map(n=>({title:n.name,value:n.name,description:o?.(n),selected:!1}))}]))?.selected||[],t.length===0&&process.stdout.write(`
-  Please select at least one resource
-
-`);return t}export{p as promptForConnection,u as selectResources};

package/bin/assets/generators/utils/renderEjs.d.ts

@@ -1,24 +0,0 @@
-import { type Tree } from "@nx/devkit";
-/**
- * Renders EJS templates and generates files using Tree
- * @param tree - Tree for file operations
- * @param templatePath - Path to the template files
- * @param targetPath - Target path for generated files
- * @param substitutions - Object containing template variables
- */
-export declare function renderEjsTemplates(tree: Tree, templatePath: string, targetPath: string, substitutions: Record<string, unknown>): void;
-/**
- * Renders a single EJS template string
- * @param template - EJS template string
- * @param data - Template data
- * @returns Rendered template string
- */
-export declare function renderEjsString(template: string, data: Record<string, unknown>): string;
-/**
- * Copies a template file with EJS substitutions
- * @param tree - Tree for file operations
- * @param from - Source template path
- * @param to - Destination path
- * @param substitutions - Template variables
- */
-export declare function copyTemplateFile(tree: Tree, from: string, to: string, substitutions: Record<string, unknown>): void;

package/bin/assets/generators/utils/renderEjs.js

@@ -1 +0,0 @@
-import S from"ejs";import r from"fs";import a from"path";function w(t,e,i,s){function n(o,u=""){const y=r.readdirSync(o);for(const d of y){const c=a.join(o,d),m=a.join(u,d),p=r.statSync(c);if(p.isDirectory())n(c,m);else if(p.isFile()){const f=r.readFileSync(c,"utf-8"),j=a.join(i,m),F=f.includes("<%")?l(f,s):f;t.write(j,F)}}}n(e)}function l(t,e){return S.render(t,e)}function D(t,e,i,s){const n=r.readFileSync(e,"utf-8"),o=l(n,s);t.write(i,o)}export{D as copyTemplateFile,l as renderEjsString,w as renderEjsTemplates};

package/bin/assets/generators/utils/resources/connectionHelpers.d.ts

@@ -1,19 +0,0 @@
-/**
- * Interactive resource connection handler (CLI-only — uses prompts).
- * Pure connection logic (applyComputeConnections, applyServiceConnections)
- * lives in @fjall/generator for shared use by CLI and webapp.
- */
-import { type ApplicationResourcePlan, type ConnectionType } from "@fjall/generator";
-interface ConnectionPrompts {
-    readonly singularPrompt: string;
-    readonly pluralPrompt: string;
-}
-interface ConnectionHandlerOptions {
-    readonly connectionConfig?: {
-        readonly connectToCompute?: string[];
-        readonly connectToServices?: string[];
-    };
-    readonly nameProvidedByFlag?: boolean;
-}
-export declare function handleResourceConnections(currentPlan: ApplicationResourcePlan, options: ConnectionHandlerOptions, resourceName: string, type: ConnectionType, prompts: ConnectionPrompts): Promise<void>;
-export {};

package/bin/assets/generators/utils/resources/connectionHelpers.js

@@ -1 +0,0 @@
-import{applyServiceConnections as u,applyComputeConnections as s}from"@fjall/generator";import{promptForConnection as m,selectResources as f}from"../prompts.js";async function h(o,n,t,c,i){if(o.compute.length===0)return;if(n.connectionConfig){const{connectToCompute:e=[],connectToServices:r=[]}=n.connectionConfig;r.length>0&&u(o,r,t,c),e.length>0&&s(o,e,t,c);return}if(n.nameProvidedByFlag||!await m(o.compute.length,"compute resource",i.singularPrompt,i.pluralPrompt))return;const p=await f(o.compute,"Select compute resources to connect:",e=>e.type.toUpperCase());p.length>0&&s(o,p,t,c)}export{h as handleResourceConnections};

package/bin/assets/generators/utils/resources/index.d.ts

@@ -1,4 +0,0 @@
-export { generateUniqueResourceName, getDefaultResourceName, getUniqueDefaultResourceName, ensureUniqueResourceName } from "./resourceNaming.js";
-export { type ComputeResource, resourceExists, assertResourceNameUnique, countResourcesOfType, detectComputeResources, databaseExists } from "./resourceDetection.js";
-export { validateOrganisationName, validatePort, validateResourceName, validateAppName, validateInstanceType, validateLambdaMemory, validateLambdaTimeout, validateCapacity, validateDatabaseName, validateMinMaxCapacity } from "./promptValidation.js";
-export { handleResourceConnections } from "./connectionHelpers.js";

package/bin/assets/generators/utils/resources/index.js

@@ -1 +0,0 @@
-import{generateUniqueResourceName as t,getDefaultResourceName as o,getUniqueDefaultResourceName as r,ensureUniqueResourceName as s}from"./resourceNaming.js";import{resourceExists as u,assertResourceNameUnique as m,countResourcesOfType as c,detectComputeResources as n,databaseExists as d}from"./resourceDetection.js";import{validateOrganisationName as p,validatePort as v,validateResourceName as N,validateAppName as R,validateInstanceType as f,validateLambdaMemory as x,validateLambdaTimeout as y,validateCapacity as b,validateDatabaseName as g,validateMinMaxCapacity as q}from"./promptValidation.js";import{handleResourceConnections as U}from"./connectionHelpers.js";export{m as assertResourceNameUnique,c as countResourcesOfType,d as databaseExists,n as detectComputeResources,s as ensureUniqueResourceName,t as generateUniqueResourceName,o as getDefaultResourceName,r as getUniqueDefaultResourceName,U as handleResourceConnections,u as resourceExists,R as validateAppName,b as validateCapacity,g as validateDatabaseName,f as validateInstanceType,x as validateLambdaMemory,y as validateLambdaTimeout,q as validateMinMaxCapacity,p as validateOrganisationName,v as validatePort,N as validateResourceName};

package/bin/assets/generators/utils/resources/promptValidation.d.ts

@@ -1,42 +0,0 @@
-import { type Tree } from "@nx/devkit";
-/**
- * Validation function for organisation names
- */
-export declare const validateOrganisationName: (value: string) => true | string;
-/**
- * Validation function for port numbers in prompts
- */
-export declare const validatePort: (value: string | number) => true | string;
-/**
- * Validation function for resource names in prompts
- * Checks both format and uniqueness
- */
-export declare const validateResourceName: (value: string, tree: Tree, appName: string) => true | string;
-/**
- * Validation function for application names in prompts
- */
-export declare const validateAppName: (value: string) => true | string;
-/**
- * Validation function for EC2 instance types in prompts
- */
-export declare const validateInstanceType: (value: string) => true | string;
-/**
- * Validation function for Lambda memory in prompts
- */
-export declare const validateLambdaMemory: (value: string | number) => true | string;
-/**
- * Validation function for Lambda timeout in prompts
- */
-export declare const validateLambdaTimeout: (value: string | number) => true | string;
-/**
- * Validation function for ECS capacity settings
- */
-export declare const validateCapacity: (value: string | number, min?: number, max?: number) => true | string;
-/**
- * Validation function for database names
- */
-export declare const validateDatabaseName: (value: string) => true | string;
-/**
- * Validation function for ensuring min capacity is less than max capacity
- */
-export declare const validateMinMaxCapacity: (minCapacity: number, maxCapacity: number) => true | string;

package/bin/assets/generators/utils/resources/promptValidation.js

@@ -1 +0,0 @@
-import{PortSchema as u,ResourceNameSchema as m,InstanceTypeSchema as p,AppNameSchema as f,OrganisationNameSchema as M,DatabaseNameSchema as d,getZodErrorMessage as a,MIN_LAMBDA_MEMORY as n,MAX_LAMBDA_MEMORY as o,MIN_LAMBDA_TIMEOUT as c,MAX_LAMBDA_TIMEOUT as i}from"@fjall/generator";import{resourceExists as y}from"./resourceDetection.js";const x=t=>{const e=M.safeParse(t);return e.success?!0:a(e.error)},l=t=>{const e=typeof t=="string"?parseInt(t,10):t,r=u.safeParse(e);return r.success?!0:a(r.error)},A=(t,e,r)=>{const s=m.safeParse(t);return s.success?y(e,r,t)?`Resource "${t}" already exists in this application`:!0:a(s.error)},T=t=>{const e=f.safeParse(t);return e.success?!0:a(e.error)},$=t=>{const e=p.safeParse(t);return e.success?!0:a(e.error)},h=t=>{const e=typeof t=="string"?parseInt(t,10):t;if(isNaN(e))return"Memory must be a number";if(e<n)return`Memory must be at least ${n} MB`;if(e>o)return`Memory cannot exceed ${o} MB`;if(e>128&&e%64!==0){const r=Math.floor(e/64)*64,s=Math.ceil(e/64)*64;return`Memory must be in 64 MB increments. Try ${r} or ${s}`}return!0},I=t=>{const e=typeof t=="string"?parseInt(t,10):t;return isNaN(e)?"Timeout must be a number":e<c?`Timeout must be at least ${c} seconds`:e>i?`Timeout cannot exceed ${i} seconds (15 minutes)`:!0},g=(t,e=1,r=1e3)=>{const s=typeof t=="string"?parseInt(t,10):t;return isNaN(s)?"Capacity must be a number":s<e?`Capacity must be at least ${e}`:s>r?`Capacity cannot exceed ${r}`:!0},P=t=>{const e=t?.trim()??"",r=d.safeParse(e);return r.success?!0:a(r.error)},_=(t,e)=>t>e?`Minimum capacity (${t}) cannot be greater than maximum capacity (${e})`:!0;export{T as validateAppName,g as validateCapacity,P as validateDatabaseName,$ as validateInstanceType,h as validateLambdaMemory,I as validateLambdaTimeout,_ as validateMinMaxCapacity,x as validateOrganisationName,l as validatePort,A as validateResourceName};

package/bin/assets/generators/utils/resources/resourceDetection.d.ts

@@ -1,12 +0,0 @@
-import { type Tree } from "@nx/devkit";
-export interface ComputeResource {
-    name: string;
-    type: "ecs" | "lambda" | "ec2";
-    hasConnections: boolean;
-    connectedResources: string[];
-}
-export declare function resourceExists(tree: Tree, appName: string, resourceName: string): boolean;
-export declare function assertResourceNameUnique(tree: Tree, appName: string, resourceName: string): void;
-export declare function countResourcesOfType(tree: Tree, appName: string, resourceType: "database" | "compute" | "lambda" | "ecs" | "ec2"): number;
-export declare function detectComputeResources(tree: Tree, appName: string): ComputeResource[];
-export declare function databaseExists(tree: Tree, appName: string, databaseName: string): boolean;

package/bin/assets/generators/utils/resources/resourceDetection.js

@@ -1 +0,0 @@
-import{getInfrastructurePath as o}from"../../../src/util/pathHelpers.js";function l(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function m(t,e,r){const s=o(e),n=t.read(s)?.toString();return n?new RegExp(`["']${l(r)}["']`).test(n):!1}function y(t,e,r){const s=o(e);if(!t.read(s)?.toString())throw new Error(`Infrastructure file not found for ${e}`);if(m(t,e,r))throw new Error(`Resource name '${r}' already exists in ${e}. Please choose a different name or remove the existing resource first.`)}function P(t,e,r){const s=o(e),n=t.read(s)?.toString();if(!n)return 0;const c={database:/DatabaseFactory\.build\(/g,compute:/ComputeFactory\.build\(/g,lambda:/type:\s*["']lambda["']/g,ecs:/type:\s*["']ecs["']/g,ec2:/type:\s*["']ec2["']/g}[r];if(!c)return 0;const u=n.match(c);return u?u.length:0}function R(t,e){const r=o(e),s=t.read(r)?.toString();if(!s)return[];const n=[],a=s.matchAll(/ComputeFactory\.build\(["']([^"']+)["'],\s*\{([^}]*?)\}/gs);for(const c of a){const u=c[1],i=c[2];let f="ecs";i.includes('type: "lambda"')?f="lambda":i.includes('type: "ec2"')&&(f="ec2");const d=i.includes("connections:"),h=[];if(d){const p=i.match(/connections:\s*\[([^\]]+)\]/);if(p){const g=p[1].match(/\w+/g)??[];h.push(...g)}}n.push({name:u,type:f,hasConnections:d,connectedResources:h})}return n}function w(t,e,r){const s=o(e),n=t.read(s)?.toString();return n?new RegExp(`databaseName:\\s*["']${l(r)}["']`).test(n):!1}export{y as assertResourceNameUnique,P as countResourcesOfType,w as databaseExists,R as detectComputeResources,m as resourceExists};

package/bin/assets/generators/utils/resources/resourceNaming.d.ts

@@ -1,6 +0,0 @@
-import { type Tree } from "@nx/devkit";
-import { DEFAULTS } from "@fjall/generator";
-export declare function generateUniqueResourceName(tree: Tree, appName: string, baseResourceName: string, resourceType: "database" | "compute" | "lambda" | "ecs" | "ec2"): string;
-export declare function getDefaultResourceName(appName: string, resourceType: keyof typeof DEFAULTS.RESOURCE_SUFFIXES): string;
-export declare function getUniqueDefaultResourceName(tree: Tree, appName: string, resourceType: keyof typeof DEFAULTS.RESOURCE_SUFFIXES): string;
-export declare function ensureUniqueResourceName(tree: Tree, appName: string, proposedName: string): string;

package/bin/assets/generators/utils/resources/resourceNaming.js

@@ -1 +0,0 @@
-import{assertResourceNameUnique as $,countResourcesOfType as a,resourceExists as s}from"./resourceDetection.js";import{DEFAULTS as E}from"@fjall/generator";const i=1e3;function x(r,n,t,e){if(a(r,n,e)===0)return t;for(let u=2;u<=i;u++){const o=`${t}${u}`;try{return $(r,n,o),o}catch{}}return`${t}${i}`}function m(r,n){const t=E.RESOURCE_SUFFIXES[n];return`${r}${t}`}function T(r,n,t){const e=m(n,t);if(!s(r,n,e))return e;for(let c=2;c<=i;c++){const u=`${e}${c}`;if(!s(r,n,u))return u}return`${e}${i}`}function l(r,n,t){if(!s(r,n,t))return t;const e=t.match(/^(.+?)(\d*)$/);if(!e)return t;const c=e[1],u=e[2]?parseInt(e[2],10)+1:2;for(let o=u;o<=u+i;o++){const f=`${c}${o}`;if(!s(r,n,f))return f}return`${c}${u+i}`}export{l as ensureUniqueResourceName,x as generateUniqueResourceName,m as getDefaultResourceName,T as getUniqueDefaultResourceName};

package/bin/assets/generators/utils/tree.d.ts

@@ -1,25 +0,0 @@
-import { type Tree, type FileChange } from "@nx/devkit";
-import type { Mode } from "fs";
-/**
- * File system tree implementation that implements the full Nx Tree interface
- *
- * Provides direct filesystem operations for use in integration tests and deploy tests.
- * Supports optional path rewriting for test isolation (e.g., redirecting fjall/ to fjall-deploy-tests/).
- */
-export declare class FileSystemTree implements Tree {
-    readonly root: string;
-    private pathRewriter?;
-    private changes;
-    constructor(rootPath: string, pathRewriter?: (filePath: string) => string);
-    private resolvePath;
-    read(filePath: string): Buffer | null;
-    read(filePath: string, encoding: BufferEncoding): string | null;
-    write(filePath: string, content: string | Buffer): void;
-    exists(filePath: string): boolean;
-    delete(filePath: string): void;
-    rename(from: string, to: string): void;
-    isFile(filePath: string): boolean;
-    children(dirPath: string): string[];
-    listChanges(): FileChange[];
-    changePermissions(filePath: string, mode: Mode): void;
-}

package/bin/assets/generators/utils/tree.js

@@ -1 +0,0 @@
-import{existsSync as s,readFileSync as h,writeFileSync as c,mkdirSync as o,rmSync as l,renameSync as u,statSync as f,readdirSync as m,chmodSync as P}from"fs";import{join as v,dirname as a}from"path";class S{root;pathRewriter;changes=new Map;constructor(t,e){this.root=t,this.pathRewriter=e}resolvePath(t){const e=this.pathRewriter?this.pathRewriter(t):t;return v(this.root,e)}read(t,e){const r=this.resolvePath(t);return s(r)?e?h(r,e):h(r):null}write(t,e){const r=this.resolvePath(t),i=a(r);s(i)||o(i,{recursive:!0});const n=s(r);c(r,e),this.changes.set(t,{path:t,type:n?"UPDATE":"CREATE",content:Buffer.isBuffer(e)?e:Buffer.from(e)})}exists(t){return s(this.resolvePath(t))}delete(t){const e=this.resolvePath(t);s(e)&&(l(e,{recursive:!0,force:!0}),this.changes.set(t,{path:t,type:"DELETE",content:null}))}rename(t,e){const r=this.resolvePath(t),i=this.resolvePath(e);if(!s(r))return;const n=a(i);s(n)||o(n,{recursive:!0}),u(r,i)}isFile(t){const e=this.resolvePath(t);return s(e)?f(e).isFile():!1}children(t){const e=this.resolvePath(t);if(!s(e))return[];try{return m(e)}catch{return[]}}listChanges(){return Array.from(this.changes.values())}changePermissions(t,e){const r=this.resolvePath(t);s(r)&&P(r,e)}}export{S as FileSystemTree};

package/bin/assets/src/util/__tests__/fjallApiClientTestHelpers.d.ts

@@ -1,9 +0,0 @@
-/**
- * Shared test constants and helpers for FjallApiClient test files.
- *
- * vi.mock() calls must remain in each test file (Vitest hoisting),
- * but these constants and factory functions can be shared.
- */
-export declare const TEST_API_KEY = "fj_test_key_abc123";
-export declare const TEST_BASE_URL = "https://test.fjall.io";
-export declare function createClient(FjallApiClientClass: new (apiKey: string, baseUrl: string) => unknown, apiKey?: string, baseUrl?: string): unknown;

package/bin/assets/src/util/__tests__/fjallApiClientTestHelpers.js

@@ -1 +0,0 @@
-const o="fj_test_key_abc123",_="https://test.fjall.io";function r(t,e=o,n=_){return new t(e,n)}export{o as TEST_API_KEY,_ as TEST_BASE_URL,r as createClient};

package/bin/assets/src/util/__tests__/outputTestHelpers.d.ts

@@ -1,9 +0,0 @@
-import { vi } from "vitest";
-export declare function rawLines(): string[];
-export declare function plainLines(): string[];
-export declare function getWriteSpy(): ReturnType<typeof vi.spyOn>;
-/**
- * Registers beforeEach/afterEach hooks that spy on process.stdout.write.
- * Call once at the top of your describe block or test file.
- */
-export declare function installStdoutSpy(): void;

package/bin/assets/src/util/__tests__/outputTestHelpers.js

@@ -1 +0,0 @@
-import{vi as e,beforeEach as n,afterEach as o}from"vitest";import i from"strip-ansi";let t;function p(){return t.mock.calls.map(r=>String(r[0]).replace(/\n$/,""))}function m(){return p().map(r=>i(r))}function s(){return t}function u(){n(()=>{t=e.spyOn(process.stdout,"write").mockImplementation(()=>!0)}),o(()=>{t.mockRestore()})}export{s as getWriteSpy,u as installStdoutSpy,m as plainLines,p as rawLines};

package/bin/assets/src/util/agent/__tests__/toonTestHelpers.d.ts

@@ -1,91 +0,0 @@
-/**
- * TOON capture spy for AXI agent-mode tests.
- *
- * Mirrors `installStdoutSpy` from `outputTestHelpers.ts` but accumulates
- * writes into a buffer, splits on the `---` block separator, and parses
- * each block as TOON via `@toon-format/toon`.
- *
- * The helper handles:
- *
- *   1. Multiple blocks flushed in a single `write()` call
- *   2. A single block spanning multiple `write()` calls
- *   3. Malformed TOON blocks (recorded as `malformed` events, never thrown)
- *
- * Tests that assert on the final block without a trailing `---` separator
- * must call `capture.flush()` before querying, otherwise the lazy parser
- * will still include the tail — parsing happens across the entire buffer
- * regardless, but `flush()` is retained as an explicit no-op sync point
- * for readability and future-proofing.
- */
-import { vi } from "vitest";
-export type CapturedEventType = "data" | "error" | "action_required" | "step" | "progress" | "malformed";
-export interface CapturedToonEvent {
-    readonly type: CapturedEventType;
-    readonly block: string;
-    readonly parsed: unknown;
-    readonly timestamp: number;
-    readonly error?: string;
-}
-export interface ToonCapture {
-    events: () => readonly CapturedToonEvent[];
-    rawBuffer: () => string;
-    parsed: () => readonly CapturedToonEvent[];
-    malformed: () => readonly CapturedToonEvent[];
-    ofType: (type: CapturedEventType) => readonly CapturedToonEvent[];
-    last: () => CapturedToonEvent | undefined;
-    flush: () => void;
-    clear: () => void;
-}
-/**
- * Matches a line containing only the block separator with optional
- * surrounding whitespace. Multiline mode so `^` and `$` match line boundaries.
- */
-declare const BLOCK_SEPARATOR_RE: RegExp;
-/**
- * Matches a trailing `help[N]:` section at the end of a TOON block.
- *
- * `renderHelp()` produces `help[N]:\n  line1\n  line2` which is NOT valid
- * TOON — the decoder interprets `help[N]:` as a typed array header and fails
- * to parse the indented text lines. We strip this section before decoding
- * and preserve it as metadata on the event.
- */
-declare const HELP_BLOCK_RE: RegExp;
-/**
- * Installs beforeEach/afterEach hooks that spy on `process.stdout.write`,
- * accumulating every chunk into an in-memory buffer. Returns a handle
- * whose query methods parse the buffer lazily (only when called).
- *
- * Call once at the top of a describe block or test file, exactly like
- * `installStdoutSpy()`.
- */
-export declare function installToonCapture(): ToonCapture;
-/**
- * Asserts the capture contains at least one valid TOON block and zero
- * malformed blocks.
- */
-export declare function assertValidToon(capture: ToonCapture): void;
-/**
- * Asserts the last captured block exists and has the expected type.
- * Consolidates the common guard pattern across TOON snapshot tests.
- */
-export declare function assertLastBlockType(capture: ToonCapture, expectedType: CapturedEventType): void;
-/**
- * Creates a mock OutputWriter with vi.fn() methods. Use in tests that
- * pass a writer directly to handler functions (e.g. secrets set/delete).
- */
-export declare function createMockWriter(): Record<string, ReturnType<typeof vi.fn>>;
-/**
- * Returns a mock configuration for `nonInteractiveOutput.js`. Use inside
- * `vi.mock()` factory calls to avoid duplicating the OutputWriter stub.
- */
-export declare function createOutputWriterMock(): Record<string, unknown>;
-/**
- * Returns a mock configuration for `logger/index.js`. Use inside
- * `vi.mock()` factory calls to avoid duplicating the logger stub.
- */
-export declare function createLoggerMock(): Record<string, unknown>;
-/**
- * Returns a standard mock theme with consistent colour values.
- */
-export declare function createThemeMock(): Record<string, unknown>;
-export { BLOCK_SEPARATOR_RE, HELP_BLOCK_RE };

package/bin/assets/src/util/agent/__tests__/toonTestHelpers.js

@@ -1 +0,0 @@
-import{afterEach as y,beforeEach as g,expect as c,vi as r}from"vitest";import{decode as h}from"@toon-format/toon";import{BLOCK_SEPARATOR as E}from"../toonFormatter.js";let p,s="",n=[],i=!1;const m=new RegExp(`^\\s*${E.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}\\s*$`,"m"),d=/\nhelp\[\d+\]:(?:\n {2}[^\n]*)*\s*$/;function k(e){if(typeof e!="object"||e===null||Array.isArray(e))return"data";const t=e;if("error"in t&&"code"in t)return"error";if("action"in t&&"userActionRequired"in t)return"action_required";for(const o of Object.keys(t))if(o.includes(".step"))return"step";for(const o of Object.keys(t))if(o.endsWith(".progress"))return"progress";return"data"}function a(){if(!i)return;n=[];const e=s.split(m);for(const t of e){const o=t.trim();if(o.length===0)continue;const u=o.replace(d,"").trim();if(u.length===0)continue;const l=Date.now();try{const f=h(u);n.push({type:k(f),block:o,parsed:f,timestamp:l})}catch(f){n.push({type:"malformed",block:o,parsed:void 0,timestamp:l,error:f instanceof Error?f.message:String(f)})}}i=!1}function B(){return g(()=>{s="",n=[],i=!1,p=r.spyOn(process.stdout,"write").mockImplementation((e=>{const t=typeof e=="string"?e:Buffer.from(e).toString("utf8");return s+=t,i=!0,!0}))}),y(()=>{p?.mockRestore(),p=void 0,s="",n=[],i=!1}),{events:()=>(a(),n),rawBuffer:()=>s,parsed:()=>(a(),n.filter(e=>e.type!=="malformed")),malformed:()=>(a(),n.filter(e=>e.type==="malformed")),ofType:e=>(a(),n.filter(t=>t.type===e)),last:()=>(a(),n.length===0?void 0:n[n.length-1]),flush:()=>{a()},clear:()=>{s="",n=[],i=!1}}}function T(e){c(e.malformed()).toHaveLength(0);const t=e.parsed();c(t.length).toBeGreaterThan(0)}function S(e,t){T(e);const o=e.last();c(o).toBeDefined(),c(o?.type).toBe(t)}function b(){return{line:r.fn(),indent:r.fn(),stepStart:r.fn(),stepComplete:r.fn(),summary:r.fn(),dockerProgress:r.fn()}}function A(){return{OutputWriter:class{stepStart=r.fn();stepComplete=r.fn();indent=r.fn();line=r.fn();summary=r.fn();dockerProgress=r.fn()},STEP_STATUS:{COMPLETED:"completed",ERROR:"error"}}}function L(){return{logger:{debug:r.fn(),info:r.fn(),warn:r.fn(),error:r.fn()}}}function w(){return{theme:{colours:{primary:"#6366f1",completed:"#00ff00",error:"#ff0000",warning:"#ffaa00",dim:"#888888"}}}}export{m as BLOCK_SEPARATOR_RE,d as HELP_BLOCK_RE,S as assertLastBlockType,T as assertValidToon,L as createLoggerMock,b as createMockWriter,A as createOutputWriterMock,w as createThemeMock,B as installToonCapture};

package/bin/assets/src/util/agent/actionRequired.d.ts

@@ -1,60 +0,0 @@
-/**
- * Action-required payload factories for common CLI gates. Each factory
- * returns a structured ActionRequired object that the agent can parse
- * to determine whether it can resolve the gate itself (add a flag,
- * run a command) or must escalate to a human.
- */
-import type { ActionRequired } from "./schemas/types.js";
-/**
- * Emitted when a command would destroy infrastructure and the user has
- * not passed `--skip-confirmation` or `--yes`.
- *
- * The agent can resolve this autonomously by re-running with the flag.
- */
-export declare function destructiveGate(command: string, target: string): ActionRequired;
-/**
- * Emitted when a required flag is missing from the invocation.
- *
- * The agent can resolve this by adding the missing flag.
- */
-export declare function missingFlagGate(command: string, flag: string, description: string): ActionRequired;
-/**
- * Emitted when the user is not authenticated.
- *
- * If an API key is available the agent can resolve this by setting
- * FJALL_API_KEY; otherwise a human must complete interactive login.
- */
-export declare function authRequiredGate(command: string, options?: {
-    apiKeyAvailable?: boolean;
-}): ActionRequired;
-/**
- * Emitted when SSO login is required. Always requires human
- * intervention to complete the browser-based flow.
- */
-export declare function ssoGate(url: string): ActionRequired;
-/**
- * Emitted when no AWS account is connected to the organisation.
- *
- * The agent can resolve this by running `fjall connect`.
- */
-export declare function awsAccountGate(command: string): ActionRequired;
-export interface DriftConflictDelta {
-    readonly property: string;
-    readonly theirs: unknown;
-    readonly ours: unknown;
-    readonly verdict: "clean" | "no-op" | "compatible" | "conflict";
-}
-/**
- * Emitted when a codemod operation encounters a drift conflict — the
- * user's infrastructure file has manual edits that conflict with the
- * requested operation.
- *
- * The agent can resolve this by re-running with `--force` (overwrite)
- * or by skipping the operation. Merge requires LLM fallback eligibility.
- */
-export declare function driftConflictGate(params: {
-    resourceType: string;
-    resourceName: string;
-    deltas: readonly DriftConflictDelta[];
-    allowMerge: boolean;
-}): ActionRequired;