@fjall/generator 0.94.1 → 0.96.0

package/dist/.minified

@@ -1 +1 @@
-93 files minified at 2026-04-21T02:31:26.517Z
+132 files minified at 2026-04-27T00:08:23.229Z

package/dist/src/ast/astCodeInjection.d.ts

@@ -0,0 +1,9 @@
+import { type CustomCodeBlock } from "./astInfrastructureParser.js";
+import { type SurgicalModificationResult } from "./astSurgicalModification.js";
+export declare function ensureImports(content: string, requiredImports: string[]): SurgicalModificationResult;
+export declare function injectCustomCodeBlocks(generatedCode: string, customBlocks: CustomCodeBlock[], resourceMapping?: Map<string, string>): SurgicalModificationResult;
+export interface FileValidationResult {
+    valid: boolean;
+    errors?: string[];
+}
+export declare function validateModifiedFile(content: string): FileValidationResult;

package/dist/src/ast/astCodeInjection.js

@@ -0,0 +1,8 @@
+import*as f from"typescript";import{classifyStatements as x}from"./astInfrastructureParser.js";import{parseSourceFile as d,insertAtPosition as m,formatLeadingNewlines as C,getContextBeforePosition as y,formatResourceId as l,createErrorResult as p,findClassification as g,findLastClassification as w}from"./astSurgicalModification.js";import{getErrorMessage as P}from"../util/errorUtils.js";function q(t,e){try{const n=d(t),o=new Set;for(const i of n.statements)f.isImportDeclaration(i)&&o.add(i.getText(n).trim());const r=[];for(const i of e){const c=i.trim();[...o].some(I=>O(I,c))||r.push(c)}if(r.length===0)return{content:t,success:!0};const s=n.statements.filter(f.isImportDeclaration).at(-1)?.getEnd()??0,u=`
+`+r.join(`
+`);return{content:m(t,s,u),success:!0}}catch(n){return p(n,t)}}function h(t){return new Set(t.split(",").map(e=>e.trim()).filter(Boolean))}function N(t,e){const n=h(t),o=h(e);for(const r of o)if(!n.has(r))return!1;return!0}function O(t,e){const n=t.match(R),o=e.match(R);if(!n||!o||n[1]!==o[1])return!1;const r=t.match(M),s=e.match(M);return r&&s?N(r[1],s[1]):!!r==!!s}const R=/from\s+["']([^"']+)["']/,M=/\{([^}]+)\}/,E={"before-imports":0,"after-imports":1,"after-app-init":2,"after-tags":3,"after-resource":4,"end-of-file":5};function T(t){return[...t].sort((e,n)=>{const o=E[n.position]-E[e.position];return o!==0?o:(n.originalLine??0)-(e.originalLine??0)})}function A(t,e,n,o){if(n!==null){const s=F(t,n,e);return m(t,n,s)}const r=e.afterManagedResource?`// [ORPHANED: was after ${l(e.afterManagedResource.type,e.afterManagedResource.name)}]
+`:`// [ORPHANED]
+`;return o.push(`Custom code from line ${e.originalLine} could not be positioned. Added at end of file.`),t+`
+`+r+e.sourceText}function U(t,e,n){if(!e||e.length===0)return{content:t,success:!0};try{const o=d(t),r=x(o),s=[],u=T(e);let a=t;for(const i of u){const c=D(o,r,i,n,s);a=A(a,i,c,s)}return{content:a,success:!0,warnings:s.length>0?s:void 0}}catch(o){return p(o,t)}}function S(t,e,n,o){if(!e.afterManagedResource)return null;const r=e.afterManagedResource,s=(r.name&&n?.get(r.name))??r.name,u=t.find(i=>i.type===r.type&&i.resourceName===s);if(u)return u.endPos;const a=t.filter(i=>i.type===r.type&&i.isManaged);return a.length===1?a[0].endPos:(o&&o.push(`Resource ${l(e.afterManagedResource.type,e.afterManagedResource.name)} not found. Custom code may be orphaned.`),null)}function D(t,e,n,o,r){switch(n.position){case"before-imports":return 0;case"after-imports":return w(e,"import")?.endPos??0;case"after-app-init":return g(e,"app-init")?.endPos??null;case"after-tags":return g(e,"tags")?.endPos??null;case"after-resource":return S(e,n,o,r);case"end-of-file":return t.getEnd();default:return null}}function F(t,e,n){const o=y(t,e);let r=n.sourceText;return r=C(o,r)+r,r.endsWith(`
+`)||(r+=`
+`),r}function $(t){try{let o=function(r){r.kind===f.SyntaxKind.Unknown&&n.push("Unknown node found in AST - possible parse error"),f.forEachChild(r,o)};const e=d(t),n=[];return o(e),n.length>0?{valid:!1,errors:n}:{valid:!0}}catch(e){return{valid:!1,errors:[P(e)]}}}export{q as ensureImports,U as injectCustomCodeBlocks,$ as validateModifiedFile};

package/dist/src/ast/astInfrastructureParser.d.ts

@@ -14,7 +14,7 @@ export { type ParsedSQSResource } from "./astMessagingParser.js";
 export { type ParsedCDNResource } from "./astCdnParser.js";
 export { type ParsedNetworkResource } from "./astNetworkParser.js";
 export { type ParsedLambdaConfig, type ParsedPatternResource, } from "./astPatternParser.js";
-export { type StatementType } from "../schemas/resourceSchemas.js";
+export { type AstStatementType } from "../schemas/resourceSchemas.js";
 export { type CustomCodeBlock } from "../schemas/resourceSchemas.js";
 export { type ClassifiedStatement, classifyStatements, } from "./astStatementClassifier.js";
 export { extractCustomCodeBlocks, findManagedResourcePosition, getLastManagedStatementOfType, getManagedResourcesByType, } from "./astStatementQueries.js";

package/dist/src/ast/astStatementClassifier.d.ts

@@ -6,14 +6,14 @@
  * src/codemod/. Do not add mutation helpers here.
  */
 import * as ts from "typescript";
-import type { StatementType } from "../schemas/resourceSchemas.js";
+import type { AstStatementType } from "../schemas/resourceSchemas.js";
 /** Imports that the generator always handles -- don't preserve as "additional" */
 declare const KNOWN_FJALL_IMPORTS: Set<string>;
 export { KNOWN_FJALL_IMPORTS };
 /** Check if a module specifier belongs to a managed (Fjall/CDK) package */
 export declare function isManagedModuleSpecifier(specifier: string): boolean;
 export interface ClassifiedStatement {
-    type: StatementType;
+    type: AstStatementType;
     node: ts.Statement;
     resourceName?: string;
     startPos: number;

package/dist/src/ast/astStatementClassifier.js

@@ -1 +1 @@
-import*as a from"typescript";import{isAppGetAppCall as p}from"./astCommonParser.js";import{S3_BUCKET_CLASSES as d}from"./astStorageParser.js";const y=new Set(["App","Architecture","DatabaseFactory","StorageFactory","ComputeFactory","getConfig","MessagingFactory","CdnFactory","Code","Runtime","FunctionUrlAuthType","NetworkFactory","PatternFactory"]);function l(r){return!!(r.startsWith("@fjall/")||r==="aws-cdk-lib"||r.startsWith("aws-cdk-lib/")||r==="constructs")}function h(r){const n=[];for(const e of r.statements){const t=e.getFullStart(),i=e.getEnd();if(a.isImportDeclaration(e)){n.push({type:"import",node:e,startPos:t,endPos:i,isManaged:g(e)});continue}if(a.isVariableStatement(e)){n.push(m(e,t,i));continue}if(a.isExpressionStatement(e)){n.push(x(e,t,i));continue}n.push({type:"custom",node:e,startPos:t,endPos:i,isManaged:!1})}return n}function g(r){return a.isStringLiteral(r.moduleSpecifier)?l(r.moduleSpecifier.text):!1}function m(r,n,e){for(const t of r.declarationList.declarations)if(t.initializer){if(p(t.initializer))return{type:"app-init",node:r,resourceName:a.isIdentifier(t.name)?t.name.text:void 0,startPos:n,endPos:e,isManaged:!0};if(a.isIdentifier(t.name)&&t.name.text==="appName"&&a.isStringLiteral(t.initializer))return{type:"app-init",node:r,startPos:n,endPos:e,isManaged:!0};if(a.isNewExpression(t.initializer)){const i=t.initializer;if(a.isIdentifier(i.expression)){const s=i.expression.text;if(d.has(s)){const c=i.arguments&&i.arguments.length>=2&&a.isStringLiteral(i.arguments[1])?i.arguments[1].text:void 0;return{type:"storage",node:r,resourceName:c,startPos:n,endPos:e,isManaged:!0}}}}if(a.isCallExpression(t.initializer)){const i=u(t.initializer,r,n,e);if(i.type!=="custom")return i}}return{type:"custom",node:r,startPos:n,endPos:e,isManaged:!1}}function x(r,n,e){const t=r.expression;return a.isCallExpression(t)?u(t,r,n,e):{type:"custom",node:r,startPos:n,endPos:e,isManaged:!1}}function u(r,n,e,t){const i=r.expression;if(a.isPropertyAccessExpression(i)&&a.isIdentifier(i.expression)){const s=i.name.text;if(s==="addTags")return{type:"tags",node:n,startPos:e,endPos:t,isManaged:!0};const o={addDatabase:{type:"database",factory:"DatabaseFactory"},addCompute:{type:"compute",factory:"ComputeFactory"},addNetwork:{type:"network",factory:"NetworkFactory"},addMessaging:{type:"messaging",factory:"MessagingFactory"},addCdn:{type:"cdn",factory:"CdnFactory"},addPattern:{type:"pattern",factory:"PatternFactory"},addStorage:{type:"storage",factory:"StorageFactory"}}[s];if(o){const f=S(r,o.factory);return{type:o.type,node:n,resourceName:f,startPos:e,endPos:t,isManaged:!0}}}return{type:"custom",node:n,startPos:e,endPos:t,isManaged:!1}}function S(r,n){if(r.arguments.length===0)return;const e=r.arguments[0];if(!a.isCallExpression(e))return;const t=e.expression;if(!a.isPropertyAccessExpression(t)||t.name.text!=="build"||!a.isIdentifier(t.expression)||t.expression.text!==n||e.arguments.length===0)return;const i=e.arguments[0];if(a.isStringLiteral(i))return i.text}export{y as KNOWN_FJALL_IMPORTS,h as classifyStatements,l as isManagedModuleSpecifier};
+import*as a from"typescript";import{isAppGetAppCall as f}from"./astCommonParser.js";import{S3_BUCKET_CLASSES as d}from"./astStorageParser.js";const y=new Set(["App","Architecture","DatabaseFactory","StorageFactory","ComputeFactory","getConfig","MessagingFactory","CdnFactory","Code","Runtime","FunctionUrlAuthType","NetworkFactory","PatternFactory","VpcPeerFactory","VpcPeerAccepterFactory","CrossPlanConnectionFactory"]);function l(r){return!!(r.startsWith("@fjall/")||r==="aws-cdk-lib"||r.startsWith("aws-cdk-lib/")||r==="constructs")}function C(r){const n=[];for(const e of r.statements){const t=e.getFullStart(),i=e.getEnd();if(a.isImportDeclaration(e)){n.push({type:"import",node:e,startPos:t,endPos:i,isManaged:g(e)});continue}if(a.isVariableStatement(e)){n.push(m(e,t,i));continue}if(a.isExpressionStatement(e)){n.push(x(e,t,i));continue}n.push({type:"custom",node:e,startPos:t,endPos:i,isManaged:!1})}return n}function g(r){return a.isStringLiteral(r.moduleSpecifier)?l(r.moduleSpecifier.text):!1}function m(r,n,e){for(const t of r.declarationList.declarations)if(t.initializer){if(f(t.initializer))return{type:"app-init",node:r,resourceName:a.isIdentifier(t.name)?t.name.text:void 0,startPos:n,endPos:e,isManaged:!0};if(a.isIdentifier(t.name)&&t.name.text==="appName"&&a.isStringLiteral(t.initializer))return{type:"app-init",node:r,startPos:n,endPos:e,isManaged:!0};if(a.isNewExpression(t.initializer)){const i=t.initializer;if(a.isIdentifier(i.expression)){const o=i.expression.text;if(d.has(o)){const c=i.arguments&&i.arguments.length>=2&&a.isStringLiteral(i.arguments[1])?i.arguments[1].text:void 0;return{type:"storage",node:r,resourceName:c,startPos:n,endPos:e,isManaged:!0}}}}if(a.isCallExpression(t.initializer)){const i=p(t.initializer,r,n,e);if(i.type!=="custom")return i}}return{type:"custom",node:r,startPos:n,endPos:e,isManaged:!1}}function x(r,n,e){const t=r.expression;return a.isCallExpression(t)?p(t,r,n,e):{type:"custom",node:r,startPos:n,endPos:e,isManaged:!1}}function p(r,n,e,t){const i=r.expression;if(a.isPropertyAccessExpression(i)&&a.isIdentifier(i.expression)){const o=i.name.text;if(o==="addTags")return{type:"tags",node:n,startPos:e,endPos:t,isManaged:!0};const s={addDatabase:{type:"database",factory:"DatabaseFactory"},addCompute:{type:"compute",factory:"ComputeFactory"},addNetwork:{type:"network",factory:"NetworkFactory"},addMessaging:{type:"messaging",factory:"MessagingFactory"},addCdn:{type:"cdn",factory:"CdnFactory"},addPattern:{type:"pattern",factory:"PatternFactory"},addStorage:{type:"storage",factory:"StorageFactory"},addVpcPeer:{type:"vpc-peer",factory:"VpcPeerFactory"},addVpcPeerAccepter:{type:"vpc-peer-accepter",factory:"VpcPeerAccepterFactory"}}[o];if(s){const u=F(r,s.factory);return{type:s.type,node:n,resourceName:u,startPos:e,endPos:t,isManaged:!0}}}return{type:"custom",node:n,startPos:e,endPos:t,isManaged:!1}}function F(r,n){if(r.arguments.length===0)return;const e=r.arguments[0];if(!a.isCallExpression(e))return;const t=e.expression;if(!a.isPropertyAccessExpression(t)||t.name.text!=="build"||!a.isIdentifier(t.expression)||t.expression.text!==n||e.arguments.length===0)return;const i=e.arguments[0];if(a.isStringLiteral(i))return i.text}export{y as KNOWN_FJALL_IMPORTS,C as classifyStatements,l as isManagedModuleSpecifier};

package/dist/src/ast/astStatementQueries.d.ts

@@ -5,17 +5,17 @@
  * add mutation helpers here.
  */
 import * as ts from "typescript";
-import type { StatementType, CustomCodeBlock } from "../schemas/resourceSchemas.js";
+import type { AstStatementType, CustomCodeBlock } from "../schemas/resourceSchemas.js";
 import { type ClassifiedStatement } from "./astStatementClassifier.js";
 /** Extract custom code blocks from an infrastructure file. */
 export declare function extractCustomCodeBlocks(sourceFile: ts.SourceFile, precomputedClassifications?: ClassifiedStatement[]): CustomCodeBlock[];
 /** Find the position information for a specific managed resource. */
-export declare function findManagedResourcePosition(sourceFile: ts.SourceFile, resourceType: StatementType, resourceName: string, precomputedClassifications?: ClassifiedStatement[]): {
+export declare function findManagedResourcePosition(sourceFile: ts.SourceFile, resourceType: AstStatementType, resourceName: string, precomputedClassifications?: ClassifiedStatement[]): {
     startPos: number;
     endPos: number;
     node: ts.Statement;
 } | null;
 /** Get the last managed statement of a specific type. */
-export declare function getLastManagedStatementOfType(sourceFile: ts.SourceFile, type: StatementType, precomputedClassifications?: ClassifiedStatement[]): ClassifiedStatement | null;
+export declare function getLastManagedStatementOfType(sourceFile: ts.SourceFile, type: AstStatementType, precomputedClassifications?: ClassifiedStatement[]): ClassifiedStatement | null;
 /** Get all managed resources grouped by type. */
-export declare function getManagedResourcesByType(sourceFile: ts.SourceFile, precomputedClassifications?: ClassifiedStatement[]): Record<StatementType, ClassifiedStatement[]>;
+export declare function getManagedResourcesByType(sourceFile: ts.SourceFile, precomputedClassifications?: ClassifiedStatement[]): Record<AstStatementType, ClassifiedStatement[]>;

package/dist/src/ast/astStatementQueries.js

@@ -1,3 +1,3 @@
-import*as p from"typescript";import{classifyStatements as a}from"./astStatementClassifier.js";const d={import:"after-imports","app-init":"after-app-init",tags:"after-tags"};function g(t){if(!t)return{position:"before-imports"};const n=d[t.type];return n?{position:n}:{position:"after-resource",afterManagedResource:{type:t.type,name:t.resourceName}}}function C(t,n){const i=n??a(t),o=[],s=t.getFullText();let e=null;for(const r of i)if(r.type==="custom"&&!r.isManaged){const{position:c,afterManagedResource:u}=g(e),m=x(s,r.node),f=y(s,r.node),l=t.getLineAndCharacterOfPosition(r.node.getStart());o.push({sourceText:m,position:c,afterManagedResource:u,originalLine:l.line+1,leadingComments:f.length>0?f:void 0})}else r.isManaged&&(e=r);return o}function x(t,n){const i=n.getFullStart(),o=n.getEnd(),e=t.slice(i,o).split(`
-`),r=e.findIndex(c=>c.trim()!=="");return e.slice(r===-1?0:r).join(`
-`)}function y(t,n){const i=[],o=p.getLeadingCommentRanges(t,n.getFullStart());if(o)for(const s of o){const e=t.slice(s.pos,s.end);i.push(e)}return i}function P(t,n,i,o){const s=o??a(t);for(const e of s)if(e.type===n&&e.resourceName===i)return{startPos:e.startPos,endPos:e.endPos,node:e.node};return null}function S(t,n,i){const o=i??a(t);let s=null;for(const e of o)e.type===n&&e.isManaged&&(s=e);return s}function h(t,n){const i=n??a(t),o={import:[],"app-init":[],tags:[],database:[],compute:[],storage:[],network:[],messaging:[],cdn:[],pattern:[],custom:[]};for(const s of i)o[s.type].push(s);return o}export{C as extractCustomCodeBlocks,P as findManagedResourcePosition,S as getLastManagedStatementOfType,h as getManagedResourcesByType};
+import*as l from"typescript";import{classifyStatements as r}from"./astStatementClassifier.js";const d={import:"after-imports","app-init":"after-app-init",tags:"after-tags"};function g(t){if(!t)return{position:"before-imports"};const n=d[t.type];return n?{position:n}:{position:"after-resource",afterManagedResource:{type:t.type,name:t.resourceName}}}function C(t,n){const i=n??r(t),o=[],s=t.getFullText();let e=null;for(const c of i)if(c.type==="custom"&&!c.isManaged){const{position:a,afterManagedResource:p}=g(e),u=x(s,c.node),f=y(s,c.node),m=t.getLineAndCharacterOfPosition(c.node.getStart());o.push({sourceText:u,position:a,afterManagedResource:p,originalLine:m.line+1,leadingComments:f.length>0?f:void 0})}else c.isManaged&&(e=c);return o}function x(t,n){const i=n.getFullStart(),o=n.getEnd(),e=t.slice(i,o).split(`
+`),c=e.findIndex(a=>a.trim()!=="");return e.slice(c===-1?0:c).join(`
+`)}function y(t,n){const i=[],o=l.getLeadingCommentRanges(t,n.getFullStart());if(o)for(const s of o){const e=t.slice(s.pos,s.end);i.push(e)}return i}function P(t,n,i,o){const s=o??r(t);for(const e of s)if(e.type===n&&e.resourceName===i)return{startPos:e.startPos,endPos:e.endPos,node:e.node};return null}function S(t,n,i){const o=i??r(t);let s=null;for(const e of o)e.type===n&&e.isManaged&&(s=e);return s}function h(t,n){const i=n??r(t),o={import:[],"app-init":[],tags:[],database:[],compute:[],storage:[],network:[],messaging:[],cdn:[],pattern:[],"vpc-peer":[],"vpc-peer-accepter":[],"cross-plan-connection":[],custom:[]};for(const s of i)o[s.type].push(s);return o}export{C as extractCustomCodeBlocks,P as findManagedResourcePosition,S as getLastManagedStatementOfType,h as getManagedResourcesByType};

package/dist/src/ast/astSurgicalModification.d.ts

@@ -1,4 +1,8 @@
-import { type StatementType, type CustomCodeBlock } from "./astInfrastructureParser.js";
+import * as ts from "typescript";
+import { type AstStatementType, type ClassifiedStatement } from "./astInfrastructureParser.js";
+export declare function insertAtPosition(content: string, position: number, text: string): string;
+export declare function findClassification(classifications: ClassifiedStatement[], type: AstStatementType): ClassifiedStatement | undefined;
+export declare function findLastClassification(classifications: ClassifiedStatement[], type: AstStatementType): ClassifiedStatement | undefined;
 export interface SurgicalModificationResult {
     content: string;
     success: boolean;
@@ -8,20 +12,20 @@ export interface SurgicalModificationResult {
 }
 export interface InsertionOptions {
     /** The type of resource being inserted */
-    resourceType: StatementType;
+    resourceType: AstStatementType;
     /** The resource name (e.g., "MyDatabase") */
     resourceName: string;
     /** The code to insert (complete statement) */
     code: string;
     /** Insert after a specific resource (by name) */
     afterResource?: {
-        type: StatementType;
+        type: AstStatementType;
         name: string;
     };
 }
 export interface UpdateOptions {
     /** The type of resource being updated */
-    resourceType: StatementType;
+    resourceType: AstStatementType;
     /** The resource name to update */
     resourceName: string;
     /** The new code for the resource (complete statement) */
@@ -29,19 +33,17 @@ export interface UpdateOptions {
 }
 export interface DeleteOptions {
     /** The type of resource being deleted */
-    resourceType: StatementType;
+    resourceType: AstStatementType;
     /** The resource name to delete */
     resourceName: string;
     /** How to handle custom code that was after this resource */
     orphanHandling: "preserve-with-warning" | "move-to-previous" | "delete";
 }
+export declare function parseSourceFile(content: string): ts.SourceFile;
+export declare function formatLeadingNewlines(beforeText: string, codeToInsert: string): string;
+export declare function getContextBeforePosition(content: string, position: number): string;
+export declare function formatResourceId(type: string, name?: string): string;
+export declare function createErrorResult(error: unknown, content: string): SurgicalModificationResult;
 export declare function addResourceSurgically(content: string, options: InsertionOptions): SurgicalModificationResult;
 export declare function updateResourceSurgically(content: string, options: UpdateOptions): SurgicalModificationResult;
 export declare function removeResourceSurgically(content: string, options: DeleteOptions): SurgicalModificationResult;
-export declare function ensureImports(content: string, requiredImports: string[]): SurgicalModificationResult;
-export declare function injectCustomCodeBlocks(generatedCode: string, customBlocks: CustomCodeBlock[], resourceMapping?: Map<string, string>): SurgicalModificationResult;
-export interface FileValidationResult {
-    valid: boolean;
-    errors?: string[];
-}
-export declare function validateModifiedFile(content: string): FileValidationResult;

package/dist/src/ast/astSurgicalModification.js

@@ -1,19 +1,12 @@
-import*as f from"typescript";import{parseInfrastructure as D,classifyStatements as y,findManagedResourcePosition as C}from"./astInfrastructureParser.js";import{getErrorMessage as M}from"../util/errorUtils.js";function R(e,t,r){return e.slice(0,t)+r+e.slice(t)}function P(e,t){return e.find(r=>r.type===t)}function L(e,t){return e.filter(r=>r.type===t).pop()}function m(e){return f.createSourceFile("infrastructure.ts",e,f.ScriptTarget.Latest,!0,f.ScriptKind.TS)}function I(e,t){return e.endsWith(`
+import*as x from"typescript";import{parseInfrastructure as F,classifyStatements as E,findManagedResourcePosition as y}from"./astInfrastructureParser.js";import{getErrorMessage as O}from"../util/errorUtils.js";function C(e,r,t){return e.slice(0,r)+t+e.slice(r)}function L(e,r){return e.find(t=>t.type===r)}function A(e,r){return e.filter(t=>t.type===r).pop()}function w(e){return x.createSourceFile("infrastructure.ts",e,x.ScriptTarget.Latest,!0,x.ScriptKind.TS)}function T(e,r){return e.endsWith(`
 
-`)||t.startsWith(`
+`)||r.startsWith(`
 `)?"":e.endsWith(`
 `)?`
 `:`
 
-`}function E(e,t){return e.slice(Math.max(0,t-2),t)}function p(e,t){return t?`${e}:${t}`:e}function l(e,t){return{content:t,success:!1,error:M(e)}}function S(e,t,r,s){const n=C(e,r,s);return n||l(new Error(`Resource not found: ${p(r,s)}`),t)}function T(e){return"success"in e&&!e.success}function J(e,t){const{resourceType:r,code:s,afterResource:n}=t;try{const o=m(e);let i;if(n){const u=C(o,n.type,n.name);if(!u)return l(new Error(`Insertion target not found: ${p(n.type,n.name)}`),e);i=u.endPos}else i=$(o,r);const c=B(e,i,s);return{content:R(e,i,c),success:!0}}catch(o){return l(o,e)}}function $(e,t){const r=y(e),s=["import","app-init","tags","database","storage","messaging","compute","network","cdn","pattern"],n=s.indexOf(t);let o=null;for(const i of r)if(i.isManaged){const c=s.indexOf(i.type);c!==-1&&c<=n&&(o=i)}return o?o.endPos:e.getEnd()}function B(e,t,r){const s=E(e,t),n=e.slice(t,Math.min(e.length,t+2)),o=I(s,r),i=n.startsWith(`
+`}function I(e,r){return e.slice(Math.max(0,r-2),r)}function p(e,r){return r?`${e}:${r}`:e}function f(e,r){return{content:r,success:!1,error:O(e)}}function P(e,r,t,i){const n=y(e,t,i);return n||f(new Error(`Resource not found: ${p(t,i)}`),r)}function R(e){return"success"in e&&!e.success}function B(e,r){const{resourceType:t,code:i,afterResource:n}=r;try{const s=w(e);let o;if(n){const u=y(s,n.type,n.name);if(!u)return f(new Error(`Insertion target not found: ${p(n.type,n.name)}`),e);o=u.endPos}else o=M(s,t);const c=v(e,o,i);return{content:C(e,o,c),success:!0}}catch(s){return f(s,e)}}function M(e,r){const t=E(e),i=["import","app-init","tags","database","storage","messaging","compute","network","vpc-peer","vpc-peer-accepter","cross-plan-connection","cdn","pattern"],n=i.indexOf(r);let s=null;for(const o of t)if(o.isManaged){const c=i.indexOf(o.type);c!==-1&&c<=n&&(s=o)}return s?s.endPos:e.getEnd()}function v(e,r,t){const i=I(e,r),n=e.slice(r,Math.min(e.length,r+2)),s=T(i,t),o=n.startsWith(`
 `)?"":`
-`;return o+r+i}function Q(e,t){const{resourceType:r,resourceName:s,newCode:n}=t;try{const o=m(e),i=S(o,e,r,s);if(T(i))return i;const c=i,a=c.node.getFullStart(),u=c.endPos,d=e.slice(a,c.node.getStart()),g=W(d);return{content:e.slice(0,a)+g+n+e.slice(u),success:!0}}catch(o){return l(o,e)}}function W(e){const t=e.match(/^[\s]*[\n\r]+[\s]*/);return t?t[0]:""}function H(e,t,r,s){let n=e,o=0;for(const i of t){const c=`// [ORPHANED: was after ${p(r,s)}]
-`,a=i.sourceText.trim(),u=n.indexOf(a,o);u!==-1&&(n=R(n,u,c),o=u+c.length+a.length)}return n}function V(e,t){const{resourceType:r,resourceName:s,orphanHandling:n}=t,o=[];try{const i=m(e),c=S(i,e,r,s);if(T(c))return c;const a=c,d=(D(e,{extractCustomCode:!0}).customCodeBlocks??[]).filter(x=>x.position==="after-resource"&&x.afterManagedResource?.type===r&&x.afterManagedResource?.name===s);d.length>0&&n==="preserve-with-warning"&&o.push(`Custom code after ${p(r,s)} will be orphaned. Added // [ORPHANED] marker comment.`);const g=a.node.getFullStart(),h=a.endPos,A=e[h]===`
-`?h+1:h;let w=e.slice(0,g)+e.slice(A);return d.length>0&&n==="preserve-with-warning"&&(w=H(w,d,r,s)),{content:w,success:!0,warnings:o.length>0?o:void 0}}catch(i){return l(i,e)}}function Y(e,t){try{const r=m(e),s=new Set;for(const a of r.statements)f.isImportDeclaration(a)&&s.add(a.getText(r).trim());const n=[];for(const a of t){const u=a.trim();[...s].some(g=>q(g,u))||n.push(u)}if(n.length===0)return{content:e,success:!0};const o=r.statements.filter(f.isImportDeclaration).at(-1)?.getEnd()??0,i=`
-`+n.join(`
-`);return{content:R(e,o,i),success:!0}}catch(r){return l(r,e)}}function O(e){return new Set(e.split(",").map(t=>t.trim()).filter(Boolean))}function _(e,t){const r=O(e),s=O(t);for(const n of s)if(!r.has(n))return!1;return!0}function q(e,t){const r=e.match(F),s=t.match(F);if(!r||!s||r[1]!==s[1])return!1;const n=e.match(N),o=t.match(N);return n&&o?_(n[1],o[1]):!0}const F=/from\s+["']([^"']+)["']/,N=/\{([^}]+)\}/,v={"before-imports":0,"after-imports":1,"after-app-init":2,"after-tags":3,"after-resource":4,"end-of-file":5};function U(e){return[...e].sort((t,r)=>{const s=v[r.position]-v[t.position];return s!==0?s:(r.originalLine??0)-(t.originalLine??0)})}function j(e,t,r,s){if(r!==null){const o=K(e,r,t);return R(e,r,o)}const n=t.afterManagedResource?`// [ORPHANED: was after ${p(t.afterManagedResource.type,t.afterManagedResource.name)}]
-`:`// [ORPHANED]
-`;return s.push(`Custom code from line ${t.originalLine} could not be positioned. Added at end of file.`),e+`
-`+n+t.sourceText}function Z(e,t,r){if(!t||t.length===0)return{content:e,success:!0};try{const s=m(e),n=y(s),o=[],i=U(t);let c=e;for(const a of i){const u=G(s,n,a,r,o);c=j(c,a,u,o)}return{content:c,success:!0,warnings:o.length>0?o:void 0}}catch(s){return l(s,e)}}function k(e,t,r,s){if(!t.afterManagedResource)return null;const n=t.afterManagedResource,o=(n.name&&r?.get(n.name))??n.name,i=e.find(a=>a.type===n.type&&a.resourceName===o);if(i)return i.endPos;const c=e.filter(a=>a.type===n.type&&a.isManaged);return c.length===1?c[0].endPos:(s&&s.push(`Resource ${p(t.afterManagedResource.type,t.afterManagedResource.name)} not found. Custom code may be orphaned.`),null)}function G(e,t,r,s,n){switch(r.position){case"before-imports":return 0;case"after-imports":return L(t,"import")?.endPos??0;case"after-app-init":return P(t,"app-init")?.endPos??null;case"after-tags":return P(t,"tags")?.endPos??null;case"after-resource":return k(t,r,s,n);case"end-of-file":return e.getEnd();default:return null}}function K(e,t,r){const s=E(e,t);let n=r.sourceText;return n=I(s,n)+n,n.endsWith(`
-`)||(n+=`
-`),n}function b(e){try{let s=function(n){n.kind===f.SyntaxKind.Unknown&&r.push("Unknown node found in AST - possible parse error"),f.forEachChild(n,s)};const t=m(e),r=[];return s(t),r.length>0?{valid:!1,errors:r}:{valid:!0}}catch(t){return{valid:!1,errors:[M(t)]}}}export{J as addResourceSurgically,Y as ensureImports,Z as injectCustomCodeBlocks,V as removeResourceSurgically,Q as updateResourceSurgically,b as validateModifiedFile};
+`;return s+t+o}function H(e,r){const{resourceType:t,resourceName:i,newCode:n}=r;try{const s=w(e),o=P(s,e,t,i);if(R(o))return o;const c=o,a=c.node.getFullStart(),u=c.endPos,l=e.slice(a,c.node.getStart()),g=$(l);return{content:e.slice(0,a)+g+n+e.slice(u),success:!0}}catch(s){return f(s,e)}}function $(e){const r=e.match(/^[\s]*[\n\r]+[\s]*/);return r?r[0]:""}function N(e,r,t,i){let n=e,s=0;for(const o of r){const c=`// [ORPHANED: was after ${p(t,i)}]
+`,a=o.sourceText.trim(),u=n.indexOf(a,s);u!==-1&&(n=C(n,u,c),s=u+c.length+a.length)}return n}function b(e,r){const{resourceType:t,resourceName:i,orphanHandling:n}=r,s=[];try{const o=w(e),c=P(o,e,t,i);if(R(c))return c;const a=c,l=(F(e,{extractCustomCode:!0}).customCodeBlocks??[]).filter(h=>h.position==="after-resource"&&h.afterManagedResource?.type===t&&h.afterManagedResource?.name===i);if(l.length>0)if(n==="preserve-with-warning")s.push(`Custom code after ${p(t,i)} will be orphaned. Added // [ORPHANED] marker comment.`);else return f(new Error(`Orphan handling "${n}" is not yet implemented`),e);const g=a.node.getFullStart(),d=a.endPos,S=e[d]===`
+`?d+1:d;let m=e.slice(0,g)+e.slice(S);return l.length>0&&n==="preserve-with-warning"&&(m=N(m,l,t,i)),{content:m,success:!0,warnings:s.length>0?s:void 0}}catch(o){return f(o,e)}}export{B as addResourceSurgically,f as createErrorResult,L as findClassification,A as findLastClassification,T as formatLeadingNewlines,p as formatResourceId,I as getContextBeforePosition,C as insertAtPosition,w as parseSourceFile,b as removeResourceSurgically,H as updateResourceSurgically};

package/dist/src/ast/astTestHelpers.d.ts

@@ -2,10 +2,10 @@ import { parseInfrastructure } from "@fjall/generator";
 export { parseInfrastructure };
 export declare function parseAndConvert(code: string): {
     appName: string;
-    type: "custom" | "tinkerer" | "lightweight" | "standard" | "resilient" | "enterprise";
+    type: "standard" | "resilient" | "enterprise" | "tinkerer" | "lightweight" | "custom";
     database: {
         name: string;
-        type: "Instance" | "Aurora" | "GlobalAurora";
+        type: "Aurora" | "Instance" | "GlobalAurora";
         databaseName: string;
         instanceType?: string | undefined;
         allocatedStorage?: number | undefined;
@@ -109,7 +109,7 @@ export declare function parseAndConvert(code: string): {
             } | undefined;
         } | undefined;
         retain?: boolean | undefined;
-        stackPlacement?: "compute" | "storage" | "cdn" | undefined;
+        stackPlacement?: "storage" | "compute" | "cdn" | undefined;
         variableName?: string | undefined;
         extraProperties?: {
             key: string;
@@ -213,7 +213,7 @@ export declare function parseAndConvert(code: string): {
             } | undefined;
         }[] | undefined;
         dockerfilePath?: string | undefined;
-        deployment?: "container" | "code" | undefined;
+        deployment?: "code" | "container" | undefined;
         codePath?: string | undefined;
         timeout?: number | undefined;
         memory?: number | undefined;
@@ -272,7 +272,7 @@ export declare function parseAndConvert(code: string): {
         name: string;
         domain?: string | undefined;
         database?: {
-            type?: "Instance" | "Aurora" | undefined;
+            type?: "Aurora" | "Instance" | undefined;
             databaseName?: string | undefined;
             databaseEngine?: "postgresql" | "mysql" | undefined;
             deletionProtection?: boolean | undefined;
@@ -384,7 +384,7 @@ export declare function parseAndConvert(code: string): {
         name: string;
         domain?: string | undefined;
         database?: {
-            type?: "Instance" | "Aurora" | undefined;
+            type?: "Aurora" | "Instance" | undefined;
             databaseName?: string | undefined;
             databaseEngine?: "postgresql" | "mysql" | undefined;
             deletionProtection?: boolean | undefined;
@@ -619,7 +619,7 @@ export declare function parseAndConvert(code: string): {
         sourceText: string;
         position: "before-imports" | "after-imports" | "after-app-init" | "after-tags" | "after-resource" | "end-of-file";
         afterManagedResource?: {
-            type: "custom" | "pattern" | "database" | "compute" | "storage" | "messaging" | "cdn" | "tags" | "network" | "import" | "app-init";
+            type: "custom" | "storage" | "database" | "compute" | "pattern" | "import" | "app-init" | "tags" | "network" | "messaging" | "cdn" | "vpc-peer" | "vpc-peer-accepter" | "cross-plan-connection";
             name?: string | undefined;
         } | undefined;
         originalLine?: number | undefined;

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

@@ -1,4 +1,5 @@
 export { type IdentifierRef, type ExpressionRef, type CallRef, type ParsedValue, type ParsedObject, isPlainObject, isIdentifierRef, isExpressionRef, isCallRef, isParsedObject, asString, asNumber, asBoolean, asStringArray, asStringUnion, captureExtraProperties, } from "./astCommonParser.js";
-export { type ParsedInfrastructure, type ParsedDatabaseResource, type ParsedS3Resource, type ParsedComputeResource, type ParsedSQSResource, type ParsedCDNResource, type ParsedNetworkResource, type ParsedDynamoDBResource, type ParsedLambdaConfig, type ParsedPatternResource, type ImportInfo, type StatementType, type ClassifiedStatement, type CustomCodeBlock, parseInfrastructure, convertToResourcePlan, classifyStatements, extractCustomCodeBlocks, findManagedResourcePosition, getLastManagedStatementOfType, getManagedResourcesByType, } from "./astInfrastructureParser.js";
-export { type SurgicalModificationResult, type InsertionOptions, type UpdateOptions, type DeleteOptions, type FileValidationResult, addResourceSurgically, updateResourceSurgically, removeResourceSurgically, ensureImports, injectCustomCodeBlocks, validateModifiedFile, } from "./astSurgicalModification.js";
+export { type ParsedInfrastructure, type ParsedDatabaseResource, type ParsedS3Resource, type ParsedComputeResource, type ParsedSQSResource, type ParsedCDNResource, type ParsedNetworkResource, type ParsedDynamoDBResource, type ParsedLambdaConfig, type ParsedPatternResource, type ImportInfo, type AstStatementType, type ClassifiedStatement, type CustomCodeBlock, parseInfrastructure, convertToResourcePlan, classifyStatements, extractCustomCodeBlocks, findManagedResourcePosition, getLastManagedStatementOfType, getManagedResourcesByType, } from "./astInfrastructureParser.js";
+export { type SurgicalModificationResult, type InsertionOptions, type UpdateOptions, type DeleteOptions, addResourceSurgically, updateResourceSurgically, removeResourceSurgically, } from "./astSurgicalModification.js";
+export { type FileValidationResult, ensureImports, injectCustomCodeBlocks, validateModifiedFile, } from "./astCodeInjection.js";
 export { type DomainCallMatch, type ParsedFjallTarget, type ParsedDnsRecordFromAst, type ParsedCertificateFromAst, type ParsedDelegationFromAst, type ParsedDomainProps, type ParsedRoute53ApexDomainProps, type ParsedExternalDelegatedDomainProps, type ParsedExternalRecordsDomainProps, type ParseDomainError, findDomainConstructCall, parseDomainProps, parseDomainErrorMessage, splitTopLevelArgs, } from "./astDomainParser.js";

package/dist/src/ast/index.js

@@ -1 +1 @@
-import{isPlainObject as s,isIdentifierRef as a,isExpressionRef as o,isCallRef as t,isParsedObject as i,asString as n,asNumber as c,asBoolean as l,asStringArray as u,asStringUnion as p,captureExtraProperties as d}from"./astCommonParser.js";import{parseInfrastructure as m,convertToResourcePlan as g,classifyStatements as R,extractCustomCodeBlocks as y,findManagedResourcePosition as S,getLastManagedStatementOfType as x,getManagedResourcesByType as C}from"./astInfrastructureParser.js";import{addResourceSurgically as M,updateResourceSurgically as v,removeResourceSurgically as B,ensureImports as T,injectCustomCodeBlocks as b,validateModifiedFile as j}from"./astSurgicalModification.js";import{findDomainConstructCall as E,parseDomainProps as I,parseDomainErrorMessage as O,splitTopLevelArgs as k}from"./astDomainParser.js";export{M as addResourceSurgically,l as asBoolean,c as asNumber,n as asString,u as asStringArray,p as asStringUnion,d as captureExtraProperties,R as classifyStatements,g as convertToResourcePlan,T as ensureImports,y as extractCustomCodeBlocks,E as findDomainConstructCall,S as findManagedResourcePosition,x as getLastManagedStatementOfType,C as getManagedResourcesByType,b as injectCustomCodeBlocks,t as isCallRef,o as isExpressionRef,a as isIdentifierRef,i as isParsedObject,s as isPlainObject,O as parseDomainErrorMessage,I as parseDomainProps,m as parseInfrastructure,B as removeResourceSurgically,k as splitTopLevelArgs,v as updateResourceSurgically,j as validateModifiedFile};
+import{isPlainObject as s,isIdentifierRef as o,isExpressionRef as a,isCallRef as t,isParsedObject as i,asString as n,asNumber as c,asBoolean as l,asStringArray as p,asStringUnion as u,captureExtraProperties as d}from"./astCommonParser.js";import{parseInfrastructure as m,convertToResourcePlan as g,classifyStatements as R,extractCustomCodeBlocks as x,findManagedResourcePosition as y,getLastManagedStatementOfType as S,getManagedResourcesByType as C}from"./astInfrastructureParser.js";import{addResourceSurgically as M,updateResourceSurgically as v,removeResourceSurgically as B}from"./astSurgicalModification.js";import{ensureImports as b,injectCustomCodeBlocks as j,validateModifiedFile as D}from"./astCodeInjection.js";import{findDomainConstructCall as I,parseDomainProps as O,parseDomainErrorMessage as k,splitTopLevelArgs as A}from"./astDomainParser.js";export{M as addResourceSurgically,l as asBoolean,c as asNumber,n as asString,p as asStringArray,u as asStringUnion,d as captureExtraProperties,R as classifyStatements,g as convertToResourcePlan,b as ensureImports,x as extractCustomCodeBlocks,I as findDomainConstructCall,y as findManagedResourcePosition,S as getLastManagedStatementOfType,C as getManagedResourcesByType,j as injectCustomCodeBlocks,t as isCallRef,a as isExpressionRef,o as isIdentifierRef,i as isParsedObject,s as isPlainObject,k as parseDomainErrorMessage,O as parseDomainProps,m as parseInfrastructure,B as removeResourceSurgically,A as splitTopLevelArgs,v as updateResourceSurgically,D as validateModifiedFile};

package/dist/src/codemod/_internal.d.ts

@@ -1,7 +1,12 @@
 import type { LinesChanged } from "./types.js";
 export declare const DEFAULT_FILE_PATH = "/__codemod__/input.ts";
 export declare function isRecord(value: unknown): value is Record<string, unknown>;
-export declare function extractProgramBody<T>(file: unknown): T[] | undefined;
+/**
+ * @internal Runtime validates each element as `Record<string, unknown>` only.
+ * `T`'s extra shape is asserted at the type level — callers are responsible
+ * for ensuring the parsed AST nodes conform to the declared `T`.
+ */
+export declare function extractProgramBody<T extends Record<string, unknown>>(file: unknown): T[] | undefined;
 /**
  * Bidirectional line-count delta between `before` and `after`. The source's
  * dominant line terminator is detected once; positive deltas map to

package/dist/src/codemod/_internal.js

@@ -1 +1 @@
-import{detectLineTerminator as i}from"./fileRewriter/index.js";const c="/__codemod__/input.ts";function o(r){return typeof r=="object"&&r!==null&&!Array.isArray(r)}function f(r){if(!o(r))return;const t=r.program;if(!o(t))return;const e=t.body;if(Array.isArray(e)&&e.every(n=>o(n)))return e}function d(r,t){return r.length===0?0:r.split(t).length}function a(r,t){const e=i(r),n=d(t,e)-d(r,e);return n>=0?{added:n,removed:0}:{added:0,removed:-n}}export{c as DEFAULT_FILE_PATH,a as computeLinesDelta,f as extractProgramBody,o as isRecord};
+import{detectLineTerminator as i}from"./fileRewriter/index.js";const c="/__codemod__/input.ts";function o(r){return typeof r=="object"&&r!==null&&!Array.isArray(r)}function f(r){if(!o(r))return;const t=r.program;if(!o(t))return;const e=t.body;if(Array.isArray(e)&&e.every(o))return e}function d(r,t){return r.length===0?0:r.split(t).length}function a(r,t){const e=i(r),n=d(t,e)-d(r,e);return n>=0?{added:n,removed:0}:{added:0,removed:-n}}export{c as DEFAULT_FILE_PATH,a as computeLinesDelta,f as extractProgramBody,o as isRecord};

package/dist/src/codemod/drift/__tests__/fixtures.d.ts

@@ -0,0 +1,55 @@
+import { type PropertyDelta, type ResourceSnapshot } from "../types.js";
+/**
+ * Shared fixture builders for the drift test suite. Keeping these in
+ * one module means every test can rely on `.strict()` Zod validation
+ * of the inputs it constructs, removing schema drift risk from the
+ * suite.
+ */
+interface StorageFixtureOptions {
+    name?: string;
+    properties?: Record<string, unknown>;
+}
+/**
+ * Build a minimal `.ts` source string that contains a single
+ * `StorageFactory.build` call-site so the listing + parse path in
+ * `detect.ts` and `snapshot.ts` has something to locate.
+ */
+export declare function buildStorageSource(options?: StorageFixtureOptions): string;
+/**
+ * Format a JavaScript literal value as source text. Only covers the
+ * literal kinds that exercise the snapshot extractor's literal path —
+ * strings, numbers, booleans, nulls, arrays, and plain objects. Raw
+ * identifier / member-expression values (e.g. `Runtime.NODEJS_20_X`)
+ * are encoded as `rawExpression`.
+ */
+export declare function formatLiteral(value: unknown): string;
+/**
+ * Tag a string so `formatLiteral` emits it verbatim rather than
+ * JSON-encoding. Use for construct expressions (`Runtime.NODEJS_20_X`,
+ * `cdk.Duration.days(14)`) that are not valid JSON literals but must
+ * appear in the generated source.
+ */
+export interface RawExpression {
+    raw: string;
+}
+export declare function raw(expression: string): RawExpression;
+/**
+ * Validate and return a `ResourceSnapshot`. Run through
+ * `.strict()` so any field-name typo in a test fixture surfaces
+ * at the boundary instead of silently producing a malformed
+ * baseline the merge path would interpret incorrectly.
+ */
+export declare function makeSnapshot(properties: Record<string, unknown>, name?: string, type?: ResourceSnapshot["type"]): ResourceSnapshot;
+/**
+ * Validate and return a `PropertyDelta`. Helper for constructing
+ * golden expected shapes inline without writing a literal object
+ * that might drift from the schema.
+ */
+export declare function makeDelta(delta: {
+    property: string;
+    base?: unknown;
+    theirs: unknown;
+    ours: unknown;
+    verdict: PropertyDelta["verdict"];
+}): PropertyDelta;
+export {};

package/dist/src/codemod/drift/__tests__/fixtures.js

@@ -0,0 +1,2 @@
+import{PropertyDeltaSchema as f,ResourceSnapshotSchema as c}from"../types.js";const i="Photos";function u(r={}){const n=r.name??i,t=r.properties??{versioned:!0},e=Object.entries(t).map(([p,s])=>`    ${p}: ${o(s)},`);return['import { StorageFactory } from "@fjall/components-infrastructure";',"",`StorageFactory.build("${n}", {`,...e,"});",""].join(`
+`)}function o(r){if(r===null)return"null";if(typeof r=="string")return JSON.stringify(r);if(typeof r=="number"||typeof r=="boolean")return String(r);if(a(r))return r.raw;if(Array.isArray(r))return`[${r.map(o).join(", ")}]`;if(typeof r=="object"&&r!==null)return`{ ${Object.entries(r).map(([t,e])=>`${t}: ${o(e)}`).join(", ")} }`;throw new Error(`formatLiteral: unsupported value type for ${String(r)}`)}function y(r){return{raw:r}}function a(r){return typeof r=="object"&&r!==null&&"raw"in r&&typeof r.raw=="string"}function S(r,n=i,t="storage"){return c.parse({type:t,name:n,properties:r,schemaVersion:1})}function g(r){return f.parse(r)}export{u as buildStorageSource,o as formatLiteral,g as makeDelta,S as makeSnapshot,y as raw};

package/dist/src/codemod/drift/detect.d.ts

@@ -0,0 +1,11 @@
+import { type Result } from "../../types/Result.js";
+import type { CodemodError, ResourceName, StatementType } from "../types.js";
+import type { DriftState, ResourceSnapshot } from "./types.js";
+export type DriftOp = "add" | "modify";
+export interface DriftPlan {
+    type: StatementType;
+    name: ResourceName;
+    properties: Record<string, unknown>;
+    op: DriftOp;
+}
+export declare function detectDrift(content: string, plan: DriftPlan, baseline?: ResourceSnapshot): Result<DriftState, CodemodError>;

package/dist/src/codemod/drift/detect.js

@@ -0,0 +1 @@
+import{failure as c,success as m}from"../../types/Result.js";import{listResources as l}from"../listResources.js";import{mergeProperties as y}from"./merge.js";import{snapshotProperties as h}from"./snapshot.js";function R(o,e,n){const r=l(o);if(!r.success)return c(r.error);if(r.data.resources.find(s=>s.type===e.type&&s.name===e.name)===void 0)return e.op==="add"?m({resource:{type:e.type,name:e.name},deltas:[],summary:"clean"}):c({kind:"ResourceNotFoundError",type:e.type,name:e.name,knownNames:r.data.resources.filter(s=>s.type===e.type).map(s=>s.name)});const t=h(o,e.type,e.name);if(!t.success)return c(t.error);const i={...t.data.properties},d={...e.properties},u=n===void 0?void 0:{...n.properties},f=y(u,i,d),p=b(f.deltas,u!==void 0);return m({resource:{type:e.type,name:e.name},deltas:f.deltas,summary:p})}function b(o,e){if(o.length===0)return"clean";let n=!1,r=!1,a=!1,t=!1;for(const i of o)switch(i.verdict){case"conflict":n=!0;break;case"compatible":r=!0;break;case"clean":a=!0;break;case"no-op":t=!0;break}return n?"drifted-conflict":r?"drifted-compatible":t&&!a?"no-op":"clean"}export{R as detectDrift};

package/dist/src/codemod/drift/index.d.ts

@@ -0,0 +1,4 @@
+export { detectDrift, type DriftOp, type DriftPlan } from "./detect.js";
+export { mergeProperties, type MergeResult } from "./merge.js";
+export { snapshotProperties } from "./snapshot.js";
+export { DriftPolicySchema, DriftStateSchema, PropertyDeltaSchema, ResourceSnapshotSchema, type DriftPolicy, type DriftState, type PropertyDelta, type ResourceSnapshot, } from "./types.js";

package/dist/src/codemod/drift/index.js

@@ -0,0 +1 @@
+import{detectDrift as t}from"./detect.js";import{mergeProperties as m}from"./merge.js";import{snapshotProperties as a}from"./snapshot.js";import{DriftPolicySchema as f,DriftStateSchema as h,PropertyDeltaSchema as i,ResourceSnapshotSchema as s}from"./types.js";export{f as DriftPolicySchema,h as DriftStateSchema,i as PropertyDeltaSchema,s as ResourceSnapshotSchema,t as detectDrift,m as mergeProperties,a as snapshotProperties};

package/dist/src/codemod/drift/merge.d.ts

@@ -0,0 +1,19 @@
+import type { PropertyDelta } from "./types.js";
+export interface MergeResult {
+    merged: Record<string, unknown>;
+    deltas: PropertyDelta[];
+}
+/**
+ * 3-way merge for resource properties.
+ *
+ * Per-property verdicts:
+ *   - `clean`      — user untouched; apply Fjall's intent (or preserve base).
+ *   - `no-op`      — user edited the property to exactly match Fjall's intent.
+ *   - `compatible` — user edited a property Fjall is not touching; keep user's.
+ *   - `conflict`   — user edited AND Fjall wants a different value.
+ *
+ * When `base` is undefined, falls back to a user-preserving 2-way merge:
+ * properties present in `theirs` but not `ours` are preserved; properties
+ * present in both with different values surface as `conflict`.
+ */
+export declare function mergeProperties(base: Record<string, unknown> | undefined, theirs: Record<string, unknown>, ours: Record<string, unknown>): MergeResult;

package/dist/src/codemod/drift/merge.js

@@ -0,0 +1 @@
+import{isDeepStrictEqual as v}from"node:util";function P(e,t,n){const o=[...new Set([...e===void 0?[]:Object.keys(e),...Object.keys(t),...Object.keys(n)])].sort((r,u)=>r.localeCompare(u,"en")),i={},d=[];for(const r of o){const u=e!==void 0&&g(e,r),l=g(t,r),m=g(n,r),k=u?e[r]:void 0,p=l?t[r]:void 0,s=m?n[r]:void 0,y=e===void 0?j(l,p,m,s):b(u,k,l,p,m,s);d.push({property:r,base:k,theirs:p,ours:s,verdict:y.verdict}),y.merged.has&&(i[r]=y.merged.value)}return{merged:i,deltas:d}}function j(e,t,n,c){return!e&&n?f(c):e&&!n||v(t,c)?f(t):a()}function b(e,t,n,c,o,i){if(!e&&!n&&o)return f(i);if(e&&!n&&o)return a();const d=e===n&&v(t,c);return d&&o?f(i):d&&!o?f(t):o?n===o&&v(c,i)?{verdict:"no-op",merged:{has:!0,value:c}}:a():n?{verdict:"compatible",merged:{has:!0,value:c}}:{verdict:"compatible",merged:{has:!1}}}function f(e){return{verdict:"clean",merged:{has:!0,value:e}}}function a(){return{verdict:"conflict",merged:{has:!1}}}function g(e,t){return Object.prototype.hasOwnProperty.call(e,t)}export{P as mergeProperties};

package/dist/src/codemod/drift/snapshot.d.ts

@@ -0,0 +1,4 @@
+import { type Result } from "../../types/Result.js";
+import type { CodemodError, ResourceName, StatementType } from "../types.js";
+import type { ResourceSnapshot } from "./types.js";
+export declare function snapshotProperties(content: string, type: StatementType, name: ResourceName): Result<ResourceSnapshot, CodemodError>;

package/dist/src/codemod/drift/snapshot.js

@@ -0,0 +1 @@
+import{failure as a,success as y}from"../../types/Result.js";import{extractProgramBody as h,isRecord as p}from"../_internal.js";import{astToLiteral as g,isNodeShape as l,NON_LITERAL as k,readKeyName as b}from"../edits/modifyResource/literalConversion.js";import{parse as E}from"../fileRewriter/index.js";import{listResources as x}from"../listResources.js";import{STATEMENT_REGISTRY as N}from"../registry.js";function F(t,n,r){const e=x(t);if(!e.success)return a(e.error);const i=e.data.resources.find(o=>o.type===n&&o.name===r);if(i===void 0)return a({kind:"ResourceNotFoundError",type:n,name:r,knownNames:e.data.resources.filter(o=>o.type===n).map(o=>o.name)});const s=E(t,i.filePath);if(!s.success)return a(s.error);const c=h(s.data);if(c===void 0)return a({kind:"SemanticQueryError",reason:"recast File is missing program.body"});const f=O(c,i);if(f===void 0)return a({kind:"SemanticQueryError",reason:"Unable to resolve config ObjectExpression for the located resource."});const u=new Set(Object.keys(N[n].schemaFragment.shape)),m={};for(const o of f.properties){if(o.type!=="Property"&&o.type!=="ObjectProperty"||o.shorthand===!0||o.computed===!0)continue;const d=b(o.key);d===void 0||!u.has(d)||o.value!==void 0&&(m[d]=j(o.value,t))}return y({type:n,name:r,properties:m,schemaVersion:1})}function O(t,n){const r=n.start+n.length;let e;const i=s=>{if(e!==void 0||s.type!=="CallExpression")return;const c=s.arguments;if(!Array.isArray(c)||c.length<2)return;const f=c[0];if(!l(f)||f.type!=="StringLiteral"||f.start!==n.start||f.end!==r)return;const u=c[1];l(u)&&u.type==="ObjectExpression"&&(e=u)};for(const s of t)if(v(s,i),e!==void 0)break;return e}function j(t,n){const r=g(t);return r!==k?r:S(t,n)}function S(t,n){const r=typeof t.start=="number"?t.start:void 0,e=typeof t.end=="number"?t.end:void 0;return{kind:"expression",text:r!==void 0&&e!==void 0&&r<e?n.slice(r,e):""}}function v(t,n){const r=[t];for(;r.length>0;){const e=r.pop();if(p(e)){typeof e.type=="string"&&n(e);for(const i of Object.keys(e)){if(i==="loc"||i==="comments"||i==="tokens")continue;const s=e[i];if(Array.isArray(s))for(const c of s)p(c)&&r.push(c);else p(s)&&r.push(s)}}}}export{F as snapshotProperties};

package/dist/src/codemod/drift/types.d.ts

@@ -0,0 +1,60 @@
+import { z } from "zod";
+import { PropertyDeltaSchema } from "../types.js";
+export { DriftPolicySchema, type DriftPolicy } from "../types.js";
+export { PropertyDeltaSchema };
+export declare const ResourceSnapshotSchema: z.ZodObject<{
+    type: z.ZodEnum<{
+        storage: "storage";
+        database: "database";
+        compute: "compute";
+        pattern: "pattern";
+        network: "network";
+        messaging: "messaging";
+        cdn: "cdn";
+        "vpc-peer": "vpc-peer";
+        "vpc-peer-accepter": "vpc-peer-accepter";
+        "cross-plan-connection": "cross-plan-connection";
+    }>;
+    name: z.ZodString;
+    properties: z.ZodRecord<z.ZodString, z.ZodUnknown>;
+    schemaVersion: z.ZodLiteral<1>;
+}, z.core.$strict>;
+export declare const DriftStateSchema: z.ZodObject<{
+    resource: z.ZodObject<{
+        type: z.ZodEnum<{
+            storage: "storage";
+            database: "database";
+            compute: "compute";
+            pattern: "pattern";
+            network: "network";
+            messaging: "messaging";
+            cdn: "cdn";
+            "vpc-peer": "vpc-peer";
+            "vpc-peer-accepter": "vpc-peer-accepter";
+            "cross-plan-connection": "cross-plan-connection";
+        }>;
+        name: z.ZodString;
+    }, z.core.$strict>;
+    deltas: z.ZodArray<z.ZodObject<{
+        property: z.ZodString;
+        base: z.ZodOptional<z.ZodUnknown>;
+        theirs: z.ZodUnknown;
+        ours: z.ZodUnknown;
+        verdict: z.ZodEnum<{
+            clean: "clean";
+            "no-op": "no-op";
+            compatible: "compatible";
+            conflict: "conflict";
+        }>;
+    }, z.core.$strict>>;
+    summary: z.ZodEnum<{
+        unknown: "unknown";
+        clean: "clean";
+        "no-op": "no-op";
+        "drifted-compatible": "drifted-compatible";
+        "drifted-conflict": "drifted-conflict";
+    }>;
+}, z.core.$strict>;
+export type PropertyDelta = z.infer<typeof PropertyDeltaSchema>;
+export type ResourceSnapshot = z.infer<typeof ResourceSnapshotSchema>;
+export type DriftState = z.infer<typeof DriftStateSchema>;

package/dist/src/codemod/drift/types.js

@@ -0,0 +1 @@
+import{z as e}from"zod";import{PropertyDeltaSchema as t,ResourceNameSchema as r,StatementTypeSchema as o}from"../types.js";import{DriftPolicySchema as s}from"../types.js";const m=e.object({type:o,name:r,properties:e.record(e.string(),e.unknown()),schemaVersion:e.literal(1)}).strict(),n=e.object({resource:e.object({type:o,name:r}).strict(),deltas:e.array(t),summary:e.enum(["clean","no-op","drifted-compatible","drifted-conflict","unknown"])}).strict();export{s as DriftPolicySchema,n as DriftStateSchema,t as PropertyDeltaSchema,m as ResourceSnapshotSchema};

package/dist/src/codemod/edits/addResource/propertyBuilder.d.ts

@@ -1,6 +1,6 @@
 import { type namedTypes as n } from "ast-types";
 import { type Result } from "../../../types/Result.js";
-import type { ObjectPropertyInput, QuoteStyle } from "../../fileRewriter/index.js";
+import { type ObjectPropertyInput, type QuoteStyle } from "../../fileRewriter/index.js";
 import type { InvalidPropertyError } from "../../types.js";
 export declare function buildPropertyInputs(properties: Record<string, unknown>, quoteStyle: QuoteStyle): Result<ObjectPropertyInput[], InvalidPropertyError>;
 export declare function toAstValue(value: unknown, quoteStyle: QuoteStyle): n.Property["value"] | undefined;

package/dist/src/codemod/edits/addResource/propertyBuilder.js

@@ -1 +1 @@
-import{builders as o}from"ast-types";import{failure as p,success as u}from"../../../types/Result.js";function d(r,e){const n=[];for(const[t,i]of Object.entries(r)){const s=a(i,e);if(s===void 0)return p({kind:"InvalidPropertyError",property:t,reason:`Unsupported property value for "${t}" (Phase 1 accepts string/number/boolean/null only).`});n.push({key:t,value:s})}return u(n)}function a(r,e){if(typeof r=="string")return l(r,e);if(typeof r=="number"&&Number.isFinite(r))return o.numericLiteral(r);if(typeof r=="boolean")return o.booleanLiteral(r);if(r===null)return o.nullLiteral()}function l(r,e){const n=e==="single"?"'":'"',t=e==="single"?r.replace(/\\/g,"\\\\").replace(/'/g,"\\'"):r.replace(/\\/g,"\\\\").replace(/"/g,'\\"'),i=`${n}${t}${n}`;return o.stringLiteral.from({value:r,extra:{rawValue:r,raw:i}})}export{d as buildPropertyInputs,l as makeStringLiteral,a as toAstValue};
+import{builders as i}from"ast-types";import{failure as p,success as c}from"../../../types/Result.js";import{buildObjectProperty as u}from"../../fileRewriter/index.js";function m(r,n){const e=[];for(const[t,o]of Object.entries(r)){const s=f(o,n);if(s===void 0)return p({kind:"InvalidPropertyError",property:t,reason:`Unsupported property value for "${t}" (accepts string/number/boolean/null/array/object of the same).`});e.push({key:t,value:s})}return c(e)}function f(r,n){if(typeof r=="string")return a(r,n);if(typeof r=="number"&&Number.isFinite(r))return i.numericLiteral(r);if(typeof r=="boolean")return i.booleanLiteral(r);if(r===null)return i.nullLiteral();if(Array.isArray(r)){const e=[];for(const t of r){const o=f(t,n);if(o===void 0)return;e.push(o)}return i.arrayExpression(e)}if(typeof r=="object"&&r!==null){const e=[];for(const[t,o]of Object.entries(r)){const s=f(o,n);if(s===void 0)return;e.push(u(t,s,n))}return i.objectExpression(e)}}function a(r,n){const e=n==="single"?"'":'"',t=n==="single"?r.replace(/\\/g,"\\\\").replace(/'/g,"\\'"):r.replace(/\\/g,"\\\\").replace(/"/g,'\\"'),o=`${e}${t}${e}`;return i.stringLiteral.from({value:r,extra:{rawValue:r,raw:o}})}export{m as buildPropertyInputs,a as makeStringLiteral,f as toAstValue};

package/dist/src/codemod/edits/addResource.d.ts

@@ -1,9 +1,14 @@
 import { type Result } from "../../types/Result.js";
-import type { AddOptions, DuplicateResourceError, InvalidPropertyError, LinesChanged, ParseError, SemanticQueryError, TemplateLiteralNameError } from "../types.js";
+import { type ResourceSnapshot } from "../drift/index.js";
+import type { AddOptions, ControlFlowClassifierError, DriftConflictError, DuplicateResourceError, InvalidPropertyError, LinesChanged, ParseError, SemanticQueryError, TemplateLiteralNameError } from "../types.js";
 export type { AddOptions, LinesChanged } from "../types.js";
-export type AddResourceError = ParseError | TemplateLiteralNameError | DuplicateResourceError | InvalidPropertyError | SemanticQueryError;
+export type AddResourceError = ParseError | TemplateLiteralNameError | DuplicateResourceError | InvalidPropertyError | SemanticQueryError | DriftConflictError | ControlFlowClassifierError;
 export interface AddResourceSuccess {
     content: string;
     linesChanged: LinesChanged;
+    skipped?: boolean;
 }
-export declare function addResource(content: string, options: AddOptions): Result<AddResourceSuccess, AddResourceError>;
+export interface AddResourceCallContext {
+    baseline?: ResourceSnapshot;
+}
+export declare function addResource(content: string, options: AddOptions, context?: AddResourceCallContext): Result<AddResourceSuccess, AddResourceError>;

package/dist/src/codemod/edits/addResource.js

@@ -1 +1 @@
-import{failure as o,success as h}from"../../types/Result.js";import{DEFAULT_FILE_PATH as T,computeLinesDelta as R,extractProgramBody as F,isRecord as P}from"../_internal.js";import{appendSpecifier as g,buildFactoryStatement as k,buildImportDeclaration as x,detectQuoteStyle as D,parse as b,printFile as A}from"../fileRewriter/index.js";import{STATEMENT_REGISTRY as _}from"../registry.js";import{locateAllShapes as B,locateByShape as O}from"../semanticIndex/index.js";import{buildResourceLocations as Q,indexBody as C,orderByEndPos as N,resolveInsertIndex as U}from"./addResource/bodyIndex.js";import{buildPropertyInputs as v}from"./addResource/propertyBuilder.js";import{findInsertionPosition as w}from"./findInsertionPosition.js";const f="@fjall/components-infrastructure";function V(t,r){const i=r.filePath??T,n=b(t,i);if(!n.success)return o(n.error);const e=O(t,{type:r.type,name:r.name},i);if(!e.success)return e.error.kind==="TemplateLiteralNameError"?o(e.error):o({kind:"SemanticQueryError",reason:e.error.reason,cause:e.error.cause});if(e.data!==void 0)return o({kind:"DuplicateResourceError",type:r.type,name:r.name});const a=D(n.data),m=v(r.properties,a);if(!m.success)return o(m.error);const d=_[r.type].factoryIdentifier,l=k({factory:d,name:r.name,properties:m.data,quoteStyle:a}),u=F(n.data);if(u===void 0)return o({kind:"SemanticQueryError",reason:"recast File is missing program.body"});const c=C(u,t),s=B(t,i);if(!s.success)return s.error.kind==="TemplateLiteralNameError"?o(s.error):o({kind:"SemanticQueryError",reason:s.error.reason,cause:s.error.cause});const y=Q(c.anchors,s.data),E=N([...c.appInitLocations,...y]),S=w(c.importInfos,E,r.type,c.programEnd),I=U(c.anchors,S);u.splice(I,0,l),M(u,d,a);const p=A(n.data,t),L=R(t,p);return h({content:p,linesChanged:L})}function M(t,r,i){for(const e of t){if(e.type!=="ImportDeclaration")continue;const a=e.source;if(!(!P(a)||a.type!=="StringLiteral")&&a.value===f){g(e,r);return}}const n=x([r],f,i);t.unshift(n)}export{V as addResource};
+import{failure as o,success as E}from"../../types/Result.js";import{DEFAULT_FILE_PATH as g,computeLinesDelta as T,extractProgramBody as F,isRecord as C}from"../_internal.js";import{appendSpecifier as D,buildFactoryStatement as b,buildImportDeclaration as x,detectQuoteStyle as w,parse as Q,printFile as v}from"../fileRewriter/index.js";import{STATEMENT_REGISTRY as A}from"../registry.js";import{locateAllShapes as _,locateByShape as B}from"../semanticIndex/index.js";import{checkControlFlowPolicy as G}from"./controlFlowPolicy.js";import{driftGate as N,runPipeline as O,schemaGate as U}from"../validationGate/index.js";import{buildResourceLocations as M,indexBody as Y,orderByEndPos as j,resolveInsertIndex as q}from"./addResource/bodyIndex.js";import{buildPropertyInputs as H}from"./addResource/propertyBuilder.js";import{findInsertionPosition as $}from"./findInsertionPosition.js";const S="@fjall/components-infrastructure";function nr(e,r,u={}){const i=r.filePath??g,a=Q(e,i);if(!a.success)return o(a.error);const t=B(e,{type:r.type,name:r.name},i);if(!t.success)return t.error.kind==="TemplateLiteralNameError"?o(t.error):o({kind:"SemanticQueryError",reason:t.error.reason,cause:t.error.cause});if(t.data!==void 0){const y=G({ast:a.data,target:t.data,resource:{type:r.type,name:r.name},op:"add"});if(y.refusal!==void 0)return o(y.refusal);const l=O([U,N],{content:e,plan:{type:r.type,name:r.name,properties:r.properties,op:"add"},baseline:u.baseline,policy:r.driftPolicy});return l.success?l.data.action==="skip"?E({content:e,linesChanged:{added:0,removed:0},skipped:!0}):o({kind:"DuplicateResourceError",type:r.type,name:r.name}):o(z(l.error))}const d=w(a.data),p=H(r.properties,d);if(!p.success)return o(p.error);const m=A[r.type].factoryIdentifier,I=b({factory:m,name:r.name,properties:p.data,quoteStyle:d}),c=F(a.data);if(c===void 0)return o({kind:"SemanticQueryError",reason:"recast File is missing program.body"});const s=Y(c,e),n=_(e,i);if(!n.success)return n.error.kind==="TemplateLiteralNameError"?o(n.error):o({kind:"SemanticQueryError",reason:n.error.reason,cause:n.error.cause});const h=M(s.anchors,n.data),k=j([...s.appInitLocations,...h]),L=$(s.importInfos,k,r.type,s.programEnd),P=q(s.anchors,L);c.splice(P,0,I),J(c,m,d);const f=v(a.data,e),R=T(e,f);return E({content:f,linesChanged:R})}function z(e){switch(e.kind){case"ParseError":case"TemplateLiteralNameError":case"DuplicateResourceError":case"InvalidPropertyError":case"SemanticQueryError":case"DriftConflictError":case"ControlFlowClassifierError":return e;default:return{kind:"SemanticQueryError",reason:`Unexpected codemod error in validation-gate pipeline: ${e.kind}`}}}function J(e,r,u){for(const a of e){if(a.type!=="ImportDeclaration")continue;const t=a.source;if(!(!C(t)||t.type!=="StringLiteral")&&t.value===S){D(a,r);return}}const i=x([r],S,u);e.unshift(i)}export{nr as addResource};