@fjall/generator 0.89.5 → 0.94.0

package/dist/src/ast/astStorageParser.js

@@ -1,164 +1 @@
-import * as ts from "typescript";
-import { S3_STACK_PLACEMENTS, } from "../schemas/resourceSchemas.js";
-import { S3_ENCRYPTION_TYPES, BACKUP_VAULT_TIERS, } from "../schemas/constants.js";
-import { asBoolean, asNumber, asString, asStringUnion, captureExtraProperties, collectFromAst, extractVariableName, isFactoryBuildCall, isFactoryMethodCall, isParsedObject, parseObjectLiteral, } from "./astCommonParser.js";
-const S3_BUCKET_CLASSES = new Set(["S3Bucket"]);
-export { S3_BUCKET_CLASSES };
-// ---- Extraction helpers ----
-function extractS3Resource(varDecl, newExpr, bucketClass) {
-    const variableName = ts.isIdentifier(varDecl.name) ? varDecl.name.text : "";
-    if (newExpr.arguments && newExpr.arguments.length >= 2) {
-        const nameArg = newExpr.arguments[1];
-        const resourceName = ts.isStringLiteral(nameArg) ? nameArg.text : "";
-        const configArg = newExpr.arguments.length >= 3 ? newExpr.arguments[2] : undefined;
-        const config = configArg && ts.isObjectLiteralExpression(configArg)
-            ? parseObjectLiteral(configArg)
-            : {};
-        return {
-            variableName,
-            resourceName,
-            bucketClass,
-            config,
-            node: varDecl,
-        };
-    }
-    return null;
-}
-function extractS3FactoryResource(addStorageCall, buildCall) {
-    if (buildCall.arguments.length < 2)
-        return null;
-    const nameArg = buildCall.arguments[0];
-    const configArg = buildCall.arguments[1];
-    if (!ts.isStringLiteral(nameArg) || !ts.isObjectLiteralExpression(configArg))
-        return null;
-    const config = parseObjectLiteral(configArg);
-    const variableName = extractVariableName(addStorageCall) ?? "";
-    return {
-        variableName,
-        resourceName: nameArg.text,
-        bucketClass: "StorageFactory",
-        config,
-        node: addStorageCall,
-    };
-}
-// ---- Public API ----
-/** Find S3 resources created via new S3Bucket() constructor pattern */
-export function findS3Resources(sourceFile) {
-    return collectFromAst(sourceFile, (node) => {
-        if (!ts.isVariableDeclaration(node) || !node.initializer)
-            return null;
-        if (!ts.isNewExpression(node.initializer))
-            return null;
-        const newExpr = node.initializer;
-        if (!ts.isIdentifier(newExpr.expression))
-            return null;
-        const bucketClass = newExpr.expression.text;
-        if (!S3_BUCKET_CLASSES.has(bucketClass))
-            return null;
-        return extractS3Resource(node, newExpr, bucketClass);
-    });
-}
-/** Find S3 resources created via app.addStorage(StorageFactory.build(...)) factory pattern */
-export function findS3FactoryResources(sourceFile) {
-    return collectFromAst(sourceFile, (node) => {
-        if (!ts.isCallExpression(node) || !isFactoryMethodCall(node, "addStorage"))
-            return null;
-        const storageArg = node.arguments[0];
-        if (!isFactoryBuildCall(storageArg, "StorageFactory"))
-            return null;
-        return extractS3FactoryResource(node, storageArg);
-    });
-}
-/** Convert parsed S3 resources to plan format */
-export function convertS3Resources(s3Resources) {
-    return s3Resources.map((s3) => ({
-        name: s3.resourceName,
-        ...(asString(s3.config.bucketName) && {
-            bucketName: asString(s3.config.bucketName),
-        }),
-        ...(asBoolean(s3.config.publicReadAccess) === true && {
-            publicReadAccess: true,
-        }),
-        ...(isParsedObject(s3.config.websiteHosting) &&
-            (() => {
-                const hosting = s3.config.websiteHosting;
-                return {
-                    websiteHosting: {
-                        indexDocument: asString(hosting.indexDocument) ?? "index.html",
-                        ...(asString(hosting.errorDocument) && {
-                            errorDocument: asString(hosting.errorDocument),
-                        }),
-                    },
-                };
-            })()),
-        ...(asStringUnion(s3.config.backupVaultTier, BACKUP_VAULT_TIERS) && {
-            backupVaultTier: asStringUnion(s3.config.backupVaultTier, BACKUP_VAULT_TIERS),
-        }),
-        ...(asBoolean(s3.config.versioned) !== undefined && {
-            versioned: asBoolean(s3.config.versioned),
-        }),
-        ...(asStringUnion(s3.config.encryption, S3_ENCRYPTION_TYPES) && {
-            encryption: asStringUnion(s3.config.encryption, S3_ENCRYPTION_TYPES),
-        }),
-        ...(asString(s3.config.kmsKeyArn) && {
-            kmsKeyArn: asString(s3.config.kmsKeyArn),
-        }),
-        ...(Array.isArray(s3.config.cors) &&
-            s3.config.cors.length > 0 && {
-            cors: s3.config.cors.filter(isParsedObject).map((rule) => ({
-                allowedOrigins: Array.isArray(rule.allowedOrigins)
-                    ? rule.allowedOrigins.filter((o) => typeof o === "string")
-                    : [],
-                allowedMethods: Array.isArray(rule.allowedMethods)
-                    ? rule.allowedMethods.filter((m) => typeof m === "string")
-                    : [],
-            })),
-        }),
-        ...(isParsedObject(s3.config.deployment) &&
-            (() => {
-                const deployment = s3.config.deployment;
-                return {
-                    deployment: {
-                        source: asString(deployment.source) ?? "",
-                        ...(asBoolean(deployment.prune) !== undefined && {
-                            prune: asBoolean(deployment.prune),
-                        }),
-                        ...(isParsedObject(deployment.cacheControl) &&
-                            (() => {
-                                const cache = deployment.cacheControl;
-                                return {
-                                    cacheControl: {
-                                        ...(asNumber(cache.maxAge) !== undefined && {
-                                            maxAge: asNumber(cache.maxAge),
-                                        }),
-                                        ...(asBoolean(cache.immutable) !== undefined && {
-                                            immutable: asBoolean(cache.immutable),
-                                        }),
-                                    },
-                                };
-                            })()),
-                    },
-                };
-            })()),
-        ...(asStringUnion(s3.config.stackPlacement, S3_STACK_PLACEMENTS) && {
-            stackPlacement: asStringUnion(s3.config.stackPlacement, S3_STACK_PLACEMENTS),
-        }),
-        ...(s3.variableName && { variableName: s3.variableName }),
-        ...(() => {
-            const S3_KNOWN_KEYS = new Set([
-                "bucketName",
-                "publicReadAccess",
-                "websiteHosting",
-                "backupVaultTier",
-                "versioned",
-                "encryption",
-                "kmsKeyArn",
-                "cors",
-                "deployment",
-                "stackPlacement",
-            ]);
-            const extras = captureExtraProperties(s3.config, S3_KNOWN_KEYS);
-            return extras.length > 0 ? { extraProperties: extras } : {};
-        })(),
-    }));
-}
+import*as i from"typescript";import{S3_STACK_PLACEMENTS as g}from"../schemas/resourceSchemas.js";import{S3_ENCRYPTION_TYPES as f,BACKUP_VAULT_TIERS as p}from"../schemas/constants.js";import{asBoolean as c,asNumber as d,asString as o,asStringUnion as a,captureExtraProperties as x,collectFromAst as b,extractVariableName as N,isFactoryBuildCall as k,isFactoryMethodCall as h,isParsedObject as u,parseObjectLiteral as y}from"./astCommonParser.js";const A=new Set(["S3Bucket"]);function C(n,e,r){const t=i.isIdentifier(n.name)?n.name.text:"";if(e.arguments&&e.arguments.length>=2){const s=e.arguments[1],m=i.isStringLiteral(s)?s.text:"",l=e.arguments.length>=3?e.arguments[2]:void 0,S=l&&i.isObjectLiteralExpression(l)?y(l):{};return{variableName:t,resourceName:m,bucketClass:r,config:S,node:n}}return null}function P(n,e){if(e.arguments.length<2)return null;const r=e.arguments[0],t=e.arguments[1];if(!i.isStringLiteral(r)||!i.isObjectLiteralExpression(t))return null;const s=y(t);return{variableName:N(n)??"",resourceName:r.text,bucketClass:"StorageFactory",config:s,node:n}}function R(n){return b(n,e=>{if(!i.isVariableDeclaration(e)||!e.initializer||!i.isNewExpression(e.initializer))return null;const r=e.initializer;if(!i.isIdentifier(r.expression))return null;const t=r.expression.text;return A.has(t)?C(e,r,t):null})}function _(n){return b(n,e=>{if(!i.isCallExpression(e)||!h(e,"addStorage"))return null;const r=e.arguments[0];return k(r,"StorageFactory")?P(e,r):null})}function v(n){return n.map(e=>({name:e.resourceName,...o(e.config.bucketName)&&{bucketName:o(e.config.bucketName)},...c(e.config.publicReadAccess)===!0&&{publicReadAccess:!0},...u(e.config.websiteHosting)&&(()=>{const r=e.config.websiteHosting;return{websiteHosting:{indexDocument:o(r.indexDocument)??"index.html",...o(r.errorDocument)&&{errorDocument:o(r.errorDocument)}}}})(),...a(e.config.backupVaultTier,p)&&{backupVaultTier:a(e.config.backupVaultTier,p)},...c(e.config.versioned)!==void 0&&{versioned:c(e.config.versioned)},...a(e.config.encryption,f)&&{encryption:a(e.config.encryption,f)},...o(e.config.kmsKeyArn)&&{kmsKeyArn:o(e.config.kmsKeyArn)},...Array.isArray(e.config.cors)&&e.config.cors.length>0&&{cors:e.config.cors.filter(u).map(r=>({allowedOrigins:Array.isArray(r.allowedOrigins)?r.allowedOrigins.filter(t=>typeof t=="string"):[],allowedMethods:Array.isArray(r.allowedMethods)?r.allowedMethods.filter(t=>typeof t=="string"):[]}))},...u(e.config.deployment)&&(()=>{const r=e.config.deployment;return{deployment:{source:o(r.source)??"",...c(r.prune)!==void 0&&{prune:c(r.prune)},...u(r.cacheControl)&&(()=>{const t=r.cacheControl;return{cacheControl:{...d(t.maxAge)!==void 0&&{maxAge:d(t.maxAge)},...c(t.immutable)!==void 0&&{immutable:c(t.immutable)}}}})()}}})(),...a(e.config.stackPlacement,g)&&{stackPlacement:a(e.config.stackPlacement,g)},...e.variableName&&{variableName:e.variableName},...(()=>{const r=new Set(["bucketName","publicReadAccess","websiteHosting","backupVaultTier","versioned","encryption","kmsKeyArn","cors","deployment","stackPlacement"]),t=x(e.config,r);return t.length>0?{extraProperties:t}:{}})()}))}export{A as S3_BUCKET_CLASSES,v as convertS3Resources,_ as findS3FactoryResources,R as findS3Resources};

package/dist/src/ast/astSurgicalModification.js

@@ -1,400 +1,19 @@
-import * as ts from "typescript";
-import { parseInfrastructure, classifyStatements, findManagedResourcePosition, } from "./astInfrastructureParser.js";
-import { getErrorMessage } from "../util/errorUtils.js";
-function insertAtPosition(content, position, text) {
-    return content.slice(0, position) + text + content.slice(position);
-}
-function findClassification(classifications, type) {
-    return classifications.find((c) => c.type === type);
-}
-function findLastClassification(classifications, type) {
-    return classifications.filter((c) => c.type === type).pop();
-}
-function parseSourceFile(content) {
-    return ts.createSourceFile("infrastructure.ts", content, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
-}
-function formatLeadingNewlines(beforeText, codeToInsert) {
-    if (beforeText.endsWith("\n\n") || codeToInsert.startsWith("\n")) {
-        return "";
-    }
-    if (!beforeText.endsWith("\n")) {
-        return "\n\n";
-    }
-    return "\n";
-}
-function getContextBeforePosition(content, position) {
-    return content.slice(Math.max(0, position - 2), position);
-}
-// getErrorMessage is now imported from errorUtils.ts
-function formatResourceId(type, name) {
-    return name ? `${type}:${name}` : type;
-}
-function createErrorResult(error, content) {
-    return { content, success: false, error: getErrorMessage(error) };
-}
-function findResourceOrFail(sourceFile, content, resourceType, resourceName) {
-    const resourcePos = findManagedResourcePosition(sourceFile, resourceType, resourceName);
-    if (!resourcePos) {
-        return createErrorResult(new Error(`Resource not found: ${formatResourceId(resourceType, resourceName)}`), content);
-    }
-    return resourcePos;
-}
-function isFailureResult(result) {
-    return "success" in result && !result.success;
-}
-export function addResourceSurgically(content, options) {
-    const { resourceType, code, afterResource } = options;
-    try {
-        const sourceFile = parseSourceFile(content);
-        let insertPosition;
-        if (afterResource) {
-            const afterPos = findManagedResourcePosition(sourceFile, afterResource.type, afterResource.name);
-            if (!afterPos) {
-                return createErrorResult(new Error(`Insertion target not found: ${formatResourceId(afterResource.type, afterResource.name)}`), content);
-            }
-            insertPosition = afterPos.endPos;
-        }
-        else {
-            insertPosition = findInsertionPositionByType(sourceFile, resourceType);
-        }
-        const codeToInsert = formatCodeForInsertion(content, insertPosition, code);
-        const newContent = insertAtPosition(content, insertPosition, codeToInsert);
-        return {
-            content: newContent,
-            success: true,
-        };
-    }
-    catch (error) {
-        return createErrorResult(error, content);
-    }
-}
-/**
- * Find the best insertion position for a resource type.
- * Resources are ordered: imports > app-init > tags > database > storage > compute > network > pattern
- */
-function findInsertionPositionByType(sourceFile, resourceType) {
-    const classifications = classifyStatements(sourceFile);
-    // Define ordering for resource types
-    const typeOrder = [
-        "import",
-        "app-init",
-        "tags",
-        "database",
-        "storage",
-        "messaging",
-        "compute",
-        "network",
-        "cdn",
-        "pattern",
-    ];
-    const targetIndex = typeOrder.indexOf(resourceType);
-    // Find the last statement of the same type or earlier types
-    let lastRelevantStatement = null;
-    for (const classification of classifications) {
-        if (classification.isManaged) {
-            const classIndex = typeOrder.indexOf(classification.type);
-            if (classIndex !== -1 && classIndex <= targetIndex) {
-                lastRelevantStatement = classification;
-            }
-        }
-    }
-    if (lastRelevantStatement) {
-        return lastRelevantStatement.endPos;
-    }
-    // Fall back to end of file
-    return sourceFile.getEnd();
-}
-function formatCodeForInsertion(content, position, code) {
-    const beforeText = getContextBeforePosition(content, position);
-    const afterText = content.slice(position, Math.min(content.length, position + 2));
-    const leadingNewlines = formatLeadingNewlines(beforeText, code);
-    const trailingNewlines = afterText.startsWith("\n") ? "" : "\n";
-    return leadingNewlines + code + trailingNewlines;
-}
-export function updateResourceSurgically(content, options) {
-    const { resourceType, resourceName, newCode } = options;
-    try {
-        const sourceFile = parseSourceFile(content);
-        const result = findResourceOrFail(sourceFile, content, resourceType, resourceName);
-        if (isFailureResult(result))
-            return result;
-        const resourcePos = result;
-        // getFullStart() includes leading comments/whitespace
-        const fullStart = resourcePos.node.getFullStart();
-        const end = resourcePos.endPos;
-        // Preserve any leading whitespace from the original
-        const originalLeading = content.slice(fullStart, resourcePos.node.getStart());
-        const leadingWhitespace = extractLeadingWhitespace(originalLeading);
-        const newContent = content.slice(0, fullStart) +
-            leadingWhitespace +
-            newCode +
-            content.slice(end);
-        return {
-            content: newContent,
-            success: true,
-        };
-    }
-    catch (error) {
-        return createErrorResult(error, content);
-    }
-}
-function extractLeadingWhitespace(text) {
-    const match = text.match(/^[\s]*[\n\r]+[\s]*/);
-    return match ? match[0] : "";
-}
-// Track search offset to avoid matching the same location twice when
-// similar text appears in multiple places.
-function insertOrphanMarkers(content, blocks, resourceType, resourceName) {
-    let result = content;
-    let searchFrom = 0;
-    for (const block of blocks) {
-        const orphanComment = `// [ORPHANED: was after ${formatResourceId(resourceType, resourceName)}]\n`;
-        const trimmedText = block.sourceText.trim();
-        const blockPos = result.indexOf(trimmedText, searchFrom);
-        if (blockPos !== -1) {
-            result = insertAtPosition(result, blockPos, orphanComment);
-            searchFrom = blockPos + orphanComment.length + trimmedText.length;
-        }
-    }
-    return result;
-}
-export function removeResourceSurgically(content, options) {
-    const { resourceType, resourceName, orphanHandling } = options;
-    const warnings = [];
-    try {
-        const sourceFile = parseSourceFile(content);
-        const result = findResourceOrFail(sourceFile, content, resourceType, resourceName);
-        if (isFailureResult(result))
-            return result;
-        const resourcePos = result;
-        // Check for custom code blocks that reference this resource
-        const parsed = parseInfrastructure(content, { extractCustomCode: true });
-        const affectedCustomBlocks = (parsed.customCodeBlocks ?? []).filter((block) => block.position === "after-resource" &&
-            block.afterManagedResource?.type === resourceType &&
-            block.afterManagedResource?.name === resourceName);
-        if (affectedCustomBlocks.length > 0) {
-            if (orphanHandling === "preserve-with-warning") {
-                warnings.push(`Custom code after ${formatResourceId(resourceType, resourceName)} will be orphaned. ` +
-                    `Added // [ORPHANED] marker comment.`);
-            }
-        }
-        // Get the removal range including leading whitespace
-        const fullStart = resourcePos.node.getFullStart();
-        const end = resourcePos.endPos;
-        // Check if there's a trailing newline to clean up
-        const removeEnd = content[end] === "\n" ? end + 1 : end;
-        let newContent = content.slice(0, fullStart) + content.slice(removeEnd);
-        if (affectedCustomBlocks.length > 0 &&
-            orphanHandling === "preserve-with-warning") {
-            newContent = insertOrphanMarkers(newContent, affectedCustomBlocks, resourceType, resourceName);
-        }
-        return {
-            content: newContent,
-            success: true,
-            warnings: warnings.length > 0 ? warnings : undefined,
-        };
-    }
-    catch (error) {
-        return createErrorResult(error, content);
-    }
-}
-export function ensureImports(content, requiredImports) {
-    try {
-        const sourceFile = parseSourceFile(content);
-        const existingImports = new Set();
-        for (const statement of sourceFile.statements) {
-            if (ts.isImportDeclaration(statement)) {
-                existingImports.add(statement.getText(sourceFile).trim());
-            }
-        }
-        const importsToAdd = [];
-        for (const importStmt of requiredImports) {
-            const normalisedImport = importStmt.trim();
-            const exists = [...existingImports].some((existing) => importsAreEquivalent(existing, normalisedImport));
-            if (!exists) {
-                importsToAdd.push(normalisedImport);
-            }
-        }
-        if (importsToAdd.length === 0) {
-            return {
-                content,
-                success: true,
-            };
-        }
-        const lastImportEnd = sourceFile.statements.filter(ts.isImportDeclaration).at(-1)?.getEnd() ??
-            0;
-        const importText = "\n" + importsToAdd.join("\n");
-        const newContent = insertAtPosition(content, lastImportEnd, importText);
-        return {
-            content: newContent,
-            success: true,
-        };
-    }
-    catch (error) {
-        return createErrorResult(error, content);
-    }
-}
-function parseNamedImports(raw) {
-    return new Set(raw
-        .split(",")
-        .map((s) => s.trim())
-        .filter(Boolean));
-}
-/** Existing import (import1) is a superset of or equal to the required one (import2). */
-function existingImportCoversRequired(existingRaw, requiredRaw) {
-    const existing = parseNamedImports(existingRaw);
-    const required = parseNamedImports(requiredRaw);
-    for (const name of required) {
-        if (!existing.has(name))
-            return false;
-    }
-    return true;
-}
-/**
- * Check if two import statements are equivalent (same module, overlapping named imports).
- */
-function importsAreEquivalent(import1, import2) {
-    const moduleMatch1 = import1.match(FROM_MODULE_REGEX);
-    const moduleMatch2 = import2.match(FROM_MODULE_REGEX);
-    if (!moduleMatch1 || !moduleMatch2) {
-        return false;
-    }
-    if (moduleMatch1[1] !== moduleMatch2[1]) {
-        return false;
-    }
-    // Same module - compare named import bindings when both use them
-    const namedMatch1 = import1.match(NAMED_IMPORTS_REGEX);
-    const namedMatch2 = import2.match(NAMED_IMPORTS_REGEX);
-    if (namedMatch1 && namedMatch2) {
-        return existingImportCoversRequired(namedMatch1[1], namedMatch2[1]);
-    }
-    return true;
-}
-const FROM_MODULE_REGEX = /from\s+["']([^"']+)["']/;
-const NAMED_IMPORTS_REGEX = /\{([^}]+)\}/;
-const POSITION_ORDER = {
-    "before-imports": 0,
-    "after-imports": 1,
-    "after-app-init": 2,
-    "after-tags": 3,
-    "after-resource": 4,
-    "end-of-file": 5,
-};
-function sortCustomBlocksForInsertion(blocks) {
-    return [...blocks].sort((a, b) => {
-        const positionDiff = POSITION_ORDER[b.position] - POSITION_ORDER[a.position];
-        if (positionDiff !== 0)
-            return positionDiff;
-        return (b.originalLine ?? 0) - (a.originalLine ?? 0);
-    });
-}
-function insertOrOrphanBlock(content, block, insertPos, warnings) {
-    if (insertPos !== null) {
-        const codeToInsert = formatCustomCodeForInsertion(content, insertPos, block);
-        return insertAtPosition(content, insertPos, codeToInsert);
-    }
-    const orphanComment = block.afterManagedResource
-        ? `// [ORPHANED: was after ${formatResourceId(block.afterManagedResource.type, block.afterManagedResource.name)}]\n`
-        : "// [ORPHANED]\n";
-    warnings.push(`Custom code from line ${block.originalLine} could not be positioned. Added at end of file.`);
-    return content + "\n" + orphanComment + block.sourceText;
-}
-export function injectCustomCodeBlocks(generatedCode, customBlocks, resourceMapping) {
-    if (!customBlocks || customBlocks.length === 0) {
-        return { content: generatedCode, success: true };
-    }
-    try {
-        const sourceFile = parseSourceFile(generatedCode);
-        const classifications = classifyStatements(sourceFile);
-        const warnings = [];
-        const processedBlocks = sortCustomBlocksForInsertion(customBlocks);
-        let result = generatedCode;
-        for (const block of processedBlocks) {
-            const insertPos = findCustomCodeInsertPosition(sourceFile, classifications, block, resourceMapping, warnings);
-            result = insertOrOrphanBlock(result, block, insertPos, warnings);
-        }
-        return {
-            content: result,
-            success: true,
-            warnings: warnings.length > 0 ? warnings : undefined,
-        };
-    }
-    catch (error) {
-        return createErrorResult(error, generatedCode);
-    }
-}
-function findAfterResourcePosition(classifications, block, resourceMapping, warnings) {
-    if (!block.afterManagedResource)
-        return null;
-    const afterResource = block.afterManagedResource;
-    const targetName = (afterResource.name && resourceMapping?.get(afterResource.name)) ??
-        afterResource.name;
-    const resource = classifications.find((c) => c.type === afterResource.type && c.resourceName === targetName);
-    if (resource)
-        return resource.endPos;
-    // Fallback: if exactly one resource of this type, use it
-    const typeMatches = classifications.filter((c) => c.type === afterResource.type && c.isManaged);
-    if (typeMatches.length === 1)
-        return typeMatches[0].endPos;
-    if (warnings) {
-        warnings.push(`Resource ${formatResourceId(block.afterManagedResource.type, block.afterManagedResource.name)} not found. ` +
-            `Custom code may be orphaned.`);
-    }
-    return null;
-}
-function findCustomCodeInsertPosition(sourceFile, classifications, block, resourceMapping, warnings) {
-    switch (block.position) {
-        case "before-imports":
-            return 0;
-        case "after-imports":
-            return findLastClassification(classifications, "import")?.endPos ?? 0;
-        case "after-app-init":
-            return findClassification(classifications, "app-init")?.endPos ?? null;
-        case "after-tags":
-            return findClassification(classifications, "tags")?.endPos ?? null;
-        case "after-resource":
-            return findAfterResourcePosition(classifications, block, resourceMapping, warnings);
-        case "end-of-file":
-            return sourceFile.getEnd();
-        default:
-            return null;
-    }
-}
-function formatCustomCodeForInsertion(content, position, block) {
-    const beforeText = getContextBeforePosition(content, position);
-    let code = block.sourceText;
-    const leadingNewlines = formatLeadingNewlines(beforeText, code);
-    code = leadingNewlines + code;
-    if (!code.endsWith("\n")) {
-        code += "\n";
-    }
-    return code;
-}
-export function validateModifiedFile(content) {
-    try {
-        const sourceFile = parseSourceFile(content);
-        // ts.createSourceFile doesn't fully validate, but it catches major syntax errors
-        const diagnostics = [];
-        // Walk the tree looking for problematic nodes
-        function visit(node) {
-            if (node.kind === ts.SyntaxKind.Unknown) {
-                diagnostics.push("Unknown node found in AST - possible parse error");
-            }
-            ts.forEachChild(node, visit);
-        }
-        visit(sourceFile);
-        if (diagnostics.length > 0) {
-            return {
-                valid: false,
-                errors: diagnostics,
-            };
-        }
-        return { valid: true };
-    }
-    catch (error) {
-        return {
-            valid: false,
-            errors: [getErrorMessage(error)],
-        };
-    }
-}
+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(`
+
+`)||t.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(`
+`)?"":`
+`;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};