@quadnix/octo 0.0.30 → 0.1.0

package/dist/modules/test-module.container.js

@@ -1,14 +1,25 @@
-import { Container } from '../functions/container/container.js';
+import { mkdtemp } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import {} from '../functions/container/container.js';
+import { DiffAction } from '../functions/diff/diff.js';
+import { DiffUtility } from '../functions/diff/diff.utility.js';
 import { Octo } from '../main.js';
 import { AModel } from '../models/model.abstract.js';
+import { applyModelTransaction } from '../modes/apply-transaction.js';
 import { OverlayDataRepository } from '../overlays/overlay-data.repository.js';
 import { AOverlay } from '../overlays/overlay.abstract.js';
+import { ResourceDataRepository } from '../resources/resource-data.repository.js';
 import { AResource } from '../resources/resource.abstract.js';
 import { InputService } from '../services/input/input.service.js';
 import { LocalEncryptionStateProvider } from '../services/state-management/local-encryption.state-provider.js';
 import { LocalStateProvider } from '../services/state-management/local.state-provider.js';
+import { StateManagementService } from '../services/state-management/state-management.service.js';
 import { TestStateProvider } from '../services/state-management/test.state-provider.js';
+import { TerraformService } from '../services/terraform/terraform.service.js';
 import { TransactionService } from '../services/transaction/transaction.service.js';
+import { HclUtility } from '../utilities/hcl/hcl.utility.js';
+import { TerraformUtility } from '../utilities/terraform/terraform.utility.js';
 import { TestAnchor } from '../utilities/test-helpers/test-classes.js';
 import { create } from '../utilities/test-helpers/test-models.js';
 import { createTestOverlays } from '../utilities/test-helpers/test-overlays.js';
@@ -16,127 +27,116 @@ import { createResources, createTestResources } from '../utilities/test-helpers/
 import { AModule } from './module.abstract.js';
 import { ModuleContainer } from './module.container.js';
 // Universal Test Module and Actions.
+/**
+ * @internal
+ */
 class UniversalTestModuleSchema {
 }
+/**
+ * @internal
+ */
 class UniversalTestModule extends AModule {
     static { this.MODULE_PACKAGE = '@octo'; }
     static { this.MODULE_SCHEMA = UniversalTestModuleSchema; }
+    /**
+     * @internal
+     */
     async onInit() {
         return;
     }
 }
+/**
+ * @internal
+ */
 class UniversalModelAction {
+    /**
+     * @internal
+     */
     filter() {
         return true;
     }
+    /**
+     * @internal
+     */
     async handle() {
         return {};
     }
 }
+/**
+ * @internal
+ */
 class UniversalResourceAction {
+    /**
+     * @internal
+     */
     filter() {
         return true;
     }
+    /**
+     * @internal
+     */
     async handle() { }
-    async mock() { }
 }
 /**
+ * The harness for testing a module.
+ *
+ * It runs your module through the real Octo lifecycle against an in-memory state provider, and hands
+ * back everything a test needs to assert on: the model and resource transactions, the generated HCL,
+ * and the resource responses. Create it inside a {@link TestContainer} so each test file is isolated.
+ *
+ * @example
+ * ```ts
+ * const container = await TestContainer.create({ mocks: [] }, { factoryTimeoutInMs: 500 });
+ * const testModuleContainer = new TestModuleContainer(container);
+ * await testModuleContainer.initialize();
+ *
+ * const generator = testModuleContainer.runModules([
+ *   { inputs: { name: 'test-app' }, moduleId: 'app', type: SimpleAppModule },
+ * ]);
+ * const { modelTransaction } = (await generator.next()).value;
+ * ```
+ *
  * @group Modules
  */
 export class TestModuleContainer {
-    constructor() {
+    /**
+     * @param container The {@link TestContainer} this run resolves its services from.
+     */
+    constructor(container) {
+        this.container = container;
         this.octo = new Octo();
     }
-    async commit(app, { appLockId, enableResourceCapture = false, filterByModuleIds = [], skipResourceTransaction = false, } = {}) {
-        if (!appLockId) {
-            const { lockId } = await this.stateProvider.lockApp();
-            appLockId = lockId;
-        }
-        const generator = this.octo.beginTransaction(app, {
-            appLockId: skipResourceTransaction ? undefined : appLockId,
-            enableResourceCapture,
-            yieldModelDiffs: true,
-            yieldModelTransaction: true,
-            yieldResourceDiffs: true,
-            yieldResourceTransaction: true,
-        });
-        const response = {};
-        try {
-            response.modelDiffs = (await generator.next()).value;
-            response.modelTransaction = (await generator.next()).value;
-            response.resourceDiffs = (await generator.next()).value;
-            response.resourceTransaction = (await generator.next()).value;
-            await generator.next();
-        }
-        catch (error) {
-            if (!skipResourceTransaction || error.message !== 'App is not in lock state!') {
-                await this.reset();
-                throw error;
-            }
-        }
-        finally {
-            await this.stateProvider.unlockApp(appLockId);
-        }
-        const container = Container.getInstance();
-        const inputService = await container.get(InputService);
-        for (const moduleId of filterByModuleIds) {
-            response.modelDiffs = response.modelDiffs
-                .map((i) => i.filter((j) => {
-                if (j.node instanceof AModel && !(j.node instanceof AOverlay)) {
-                    return inputService.getModuleIdFromModel(j.node) === moduleId;
-                }
-                else if (j.node instanceof AOverlay) {
-                    return inputService.getModuleIdFromOverlay(j.node) === moduleId;
-                }
-                else {
-                    return false;
-                }
-            }))
-                .filter((i) => i.length);
-            response.modelTransaction = response.modelTransaction
-                .map((i) => i.filter((j) => {
-                if (j.node instanceof AModel && !(j.node instanceof AOverlay)) {
-                    return inputService.getModuleIdFromModel(j.node) === moduleId;
-                }
-                else if (j.node instanceof AOverlay) {
-                    return inputService.getModuleIdFromOverlay(j.node) === moduleId;
-                }
-                else {
-                    return false;
-                }
-            }))
-                .filter((i) => i.length);
-            response.resourceDiffs = response.resourceDiffs
-                .map((i) => i.filter((j) => {
-                if (j.node instanceof AResource) {
-                    return inputService.getModuleIdFromResource(j.node) === moduleId;
-                }
-                else {
-                    return false;
-                }
-            }))
-                .filter((i) => i.length);
-            if (!skipResourceTransaction) {
-                response.resourceTransaction = response.resourceTransaction
-                    .map((i) => i.filter((j) => {
-                    if (j.node instanceof AResource) {
-                        return inputService.getModuleIdFromResource(j.node) === moduleId;
-                    }
-                    else {
-                        return false;
-                    }
-                }))
-                    .filter((i) => i.length);
-            }
+    /**
+     * To seed resources that already exist, as though the given module had produced them.
+     * Use it to stand up the prerequisites a module under test expects to find.
+     */
+    async createResources(moduleId, args, options) {
+        const [inputService, moduleContainer] = await Promise.all([
+            this.container.get(InputService),
+            this.container.get(ModuleContainer),
+        ]);
+        // Register new moduleId as instance of the universal module.
+        moduleContainer.load(UniversalTestModule, moduleId, {});
+        // Immediately unload the universal module to ensure it does not run in apply().
+        moduleContainer.unload(UniversalTestModule);
+        const result = await createResources(args, options);
+        for (const resource of Object.values(result)) {
+            inputService.registerResource(moduleId, resource);
         }
-        await this.reset();
-        return response;
+        return result;
     }
+    /**
+     * To build a throwaway anchor for a test double, without declaring an anchor class.
+     */
     createTestAnchor(anchorId, properties, parent) {
         return new TestAnchor(anchorId, properties, parent);
     }
+    /**
+     * To seed models, as though the given module had produced them.
+     * Each model gets a no-op action, so the models appear in a transaction without doing any work.
+     */
     async createTestModels(moduleId, args) {
-        const container = Container.getInstance();
+        const container = this.container;
         const [inputService, moduleContainer, transactionService] = await Promise.all([
             container.get(InputService),
             container.get(ModuleContainer),
@@ -148,16 +148,11 @@ export class TestModuleContainer {
         moduleContainer.unload(UniversalTestModule);
         const result = create(args);
         for (const models of Object.values(result)) {
-            // Check if the model has already been registered.
-            // If no error thrown, the model has already been registered.
             for (const model of models) {
-                try {
-                    inputService.getModuleIdFromModel(model);
+                // Skip models that are already registered (a defined moduleId means it is known).
+                if (inputService.getModuleIdFromModel(model) !== undefined) {
                     continue;
                 }
-                catch (error) {
-                    /* do nothing. */
-                }
                 inputService.registerModel(moduleId, model);
                 const universalAction = new UniversalModelAction();
                 Object.assign(universalAction, {
@@ -177,41 +172,44 @@ export class TestModuleContainer {
         }
         return result;
     }
+    /**
+     * To seed overlays, as though the given module had produced them.
+     * An overlay given no actions gets a no-op one.
+     */
     async createTestOverlays(moduleId, args) {
-        const container = Container.getInstance();
-        const [inputService, moduleContainer, transactionService] = await Promise.all([
+        const container = this.container;
+        const [inputService, moduleContainer] = await Promise.all([
             container.get(InputService),
             container.get(ModuleContainer),
-            container.get(TransactionService),
         ]);
         // Register new moduleId as instance of the universal module.
         moduleContainer.load(UniversalTestModule, moduleId, {});
         // Immediately unload the universal module to ensure it does not run in apply().
         moduleContainer.unload(UniversalTestModule);
+        // Default any overlay without explicit actions to a universal no-op action, named after the
+        // overlay so it reads clearly in a transaction snapshot. createTestOverlays registers them.
+        for (const arg of args) {
+            if (!arg.overlayActions || arg.overlayActions.length === 0) {
+                const [, nodeName] = arg.context.split('=')[0].split('/');
+                const universalAction = new UniversalModelAction();
+                Object.assign(universalAction, {
+                    constructor: { name: `${UniversalModelAction.name}For${nodeName}` },
+                });
+                arg.overlayActions = [universalAction];
+            }
+        }
         const result = await createTestOverlays(args);
         for (const overlay of Object.values(result)) {
             inputService.registerOverlay(moduleId, overlay);
-            const universalAction = new UniversalModelAction();
-            Object.assign(universalAction, {
-                constructor: { name: `${UniversalModelAction.name}For${overlay.constructor.name}` },
-            });
-            try {
-                transactionService.unregisterOverlayActions(overlay.constructor);
-                transactionService.registerOverlayActions(overlay.constructor, [
-                    universalAction,
-                ]);
-            }
-            catch (error) {
-                if (error.message !==
-                    `Action "${universalAction.constructor.name}" already registered for overlay "${overlay.constructor.name}"!`) {
-                    throw error;
-                }
-            }
         }
         return result;
     }
-    async createResources(moduleId, args, options) {
-        const container = Container.getInstance();
+    /**
+     * To seed resources, as though the given module had produced them.
+     * A resource given no actions gets a no-op one, unless terraform owns it.
+     */
+    async createTestResources(moduleId, args, options) {
+        const container = this.container;
         const [inputService, moduleContainer] = await Promise.all([
             container.get(InputService),
             container.get(ModuleContainer),
@@ -220,43 +218,66 @@ export class TestModuleContainer {
         moduleContainer.load(UniversalTestModule, moduleId, {});
         // Immediately unload the universal module to ensure it does not run in apply().
         moduleContainer.unload(UniversalTestModule);
-        const result = await createResources(args, options);
+        // Default any resource without explicit actions to a universal no-op action, named after the
+        // resource so it reads clearly in a transaction snapshot. createTestResources registers them,
+        // and skips terraform resources (which terraform owns and cannot have actions).
+        for (const arg of args) {
+            if (!arg.resourceActions || arg.resourceActions.length === 0) {
+                const [, nodeName] = arg.resourceContext.split('=')[0].split('/');
+                const universalAction = new UniversalResourceAction();
+                Object.assign(universalAction, {
+                    constructor: { name: `${UniversalResourceAction.name}For${nodeName}` },
+                });
+                arg.resourceActions = [universalAction];
+            }
+        }
+        const result = await createTestResources(args, options);
         for (const resource of Object.values(result)) {
             inputService.registerResource(moduleId, resource);
         }
         return result;
     }
-    async createTestResources(moduleId, args, options) {
-        const container = Container.getInstance();
-        const [inputService, moduleContainer, transactionService] = await Promise.all([
-            container.get(InputService),
-            container.get(ModuleContainer),
-            container.get(TransactionService),
-        ]);
-        // Register new moduleId as instance of the universal module.
-        moduleContainer.load(UniversalTestModule, moduleId, {});
-        // Immediately unload the universal module to ensure it does not run in apply().
-        moduleContainer.unload(UniversalTestModule);
-        const result = await createTestResources(args, options);
-        for (const resource of Object.values(result)) {
-            inputService.registerResource(moduleId, resource);
-            try {
-                transactionService.registerResourceActions(resource.constructor, [
-                    new UniversalResourceAction(),
-                ]);
+    /**
+     * Reduces a transaction's diffs, model or resource, to a stable digest you can snapshot:
+     * `+ <context>` (create), `- <context>` (delete), `^ <context>` (replace), `* <context>` (update).
+     *
+     * A diff is classified exactly as {@link Octo.validate} aggregates it, so a digest and a validate
+     * report of the same transaction never disagree. Only an add/delete of a `resourceId` creates or
+     * destroys a resource; an add/delete on any other field changes a resource that stays -
+     * re-pointing a `parent`, most commonly - and reads as an update.
+     *
+     * The digest has one entry per diff, not per resource, so a resource may appear more than once.
+     */
+    digestDiffs(diffs) {
+        const changes = [];
+        for (const d of diffs.flat()) {
+            if (d.action === DiffAction.ADD && d.field === 'resourceId') {
+                changes.push(`+ ${d.node.getContext()}`);
             }
-            catch (error) {
-                if (error.message !==
-                    `Action "${UniversalResourceAction.name}" already registered for resource "${resource.constructor.name}"!`) {
-                    throw error;
-                }
+            else if (d.action === DiffAction.DELETE && d.field === 'resourceId') {
+                changes.push(`- ${d.node.getContext()}`);
+            }
+            else if (d.action === DiffAction.REPLACE) {
+                changes.push(`^ ${d.node.getContext()}`);
+            }
+            else if (d.action === DiffAction.VALIDATE) {
+                // Not a change: validation runs as its own transaction, one diff per surviving resource.
+                continue;
+            }
+            else {
+                changes.push(`* ${d.node.getContext()}`);
             }
         }
-        return result;
-    }
-    mapTransactionActions(transaction) {
-        return transaction.map((i) => i.map((j) => j.actions.map((a) => a.constructor.name)).flat());
+        return changes;
     }
+    /**
+     * Boots Octo for the test. Call it once, before running any module.
+     *
+     * @param stateProvider Defaults to an in-memory {@link TestStateProvider}. Only the local and test
+     * providers are accepted - a test must never write to shared state.
+     * @param initializeInContainer Factories to resolve at boot. See {@link Octo.initialize}.
+     * @param excludeInContainer Factories to unregister at boot. See {@link Octo.initialize}.
+     */
     async initialize(stateProvider, initializeInContainer, excludeInContainer) {
         if (stateProvider &&
             !(stateProvider instanceof LocalEncryptionStateProvider ||
@@ -267,36 +288,90 @@ export class TestModuleContainer {
         this.stateProvider = stateProvider ?? new TestStateProvider();
         await this.octo.initialize(this.stateProvider, initializeInContainer, excludeInContainer);
         // Always register the UniversalTestModule to allow users to create test prerequisites.
-        const moduleContainer = await Container.getInstance().get(ModuleContainer);
+        const moduleContainer = await this.container.get(ModuleContainer);
         moduleContainer.register(UniversalTestModule, { packageName: '@octo' });
     }
-    async orderModules(modules) {
-        const moduleContainer = await Container.getInstance().get(ModuleContainer);
-        moduleContainer.order(modules);
+    /**
+     * Whether the committed resource state matches the previous one, i.e. whether the last run
+     * settled without leaving a pending change.
+     */
+    async isResourceStateEqual() {
+        const container = this.container;
+        const stateManagementService = await container.get(StateManagementService);
+        const resourcesActual = await stateManagementService.getResourceState('resources-actual.json');
+        const resourcesOld = await stateManagementService.getResourceState('resources-old.json');
+        return DiffUtility.isObjectDeepEquals(resourcesActual.data, resourcesOld.data);
+    }
+    /**
+     * Reduces a transaction to the names of the actions it ran, in order. Snapshot it to assert that
+     * a change triggered the actions you expected.
+     */
+    mapTransactionActions(transaction) {
+        return transaction.map((i) => i.map((j) => j.actions.map((a) => a.constructor.name)).flat());
+    }
+    /**
+     * See {@link Octo.registerHooks}.
+     */
+    registerHooks(...args) {
+        return this.octo.registerHooks(...args);
     }
-    registerCapture(resourceContext, response) {
-        this.octo.registerCapture(resourceContext, response);
+    /**
+     * See {@link Octo.registerTags}.
+     */
+    registerTags(...args) {
+        return this.octo.registerTags(...args);
     }
-    async runModule(module) {
-        const moduleContainer = await Container.getInstance().get(ModuleContainer);
-        const moduleMetadataIndex = moduleContainer.getMetadataIndex(module.type);
-        if (moduleMetadataIndex === -1) {
-            moduleContainer.register(module.type, { packageName: module.type.MODULE_PACKAGE });
-        }
-        const moduleMetadata = moduleContainer.getMetadata(module.type);
-        if (module.hidden === true) {
-            moduleContainer.unload(moduleMetadata.module);
-        }
-        else {
-            moduleContainer.load(moduleMetadata.module, module.moduleId, module.inputs);
-        }
-        return (await this.octo.compose());
+    /**
+     * See {@link Octo.registerTerraformConfig}. Required before a run that generates terraform.
+     */
+    registerTerraformConfig(...args) {
+        return this.octo.registerTerraformConfig(...args);
+    }
+    /**
+     * See {@link Octo.registerTerraformProvider}. Required before a run that generates terraform.
+     */
+    registerTerraformProvider(...args) {
+        return this.octo.registerTerraformProvider(...args);
     }
-    async runModules(modules) {
-        const moduleContainer = await Container.getInstance().get(ModuleContainer);
-        for (const module of modules) {
-            const moduleMetadataIndex = moduleContainer.getMetadataIndex(module.type);
-            if (moduleMetadataIndex === -1) {
+    /**
+     * Tears down the composed graph - models, overlays, inputs, and modules - so the next
+     * {@link TestModuleContainer.runModules} composes fresh. Call it in your test teardown.
+     */
+    async reset() {
+        const container = this.container;
+        // Reset ModuleContainer constructor injections.
+        await container.get(InputService, { args: [true] });
+        await container.get(OverlayDataRepository, {
+            args: [true, []],
+        });
+        // Reset module container.
+        const moduleContainer = await container.get(ModuleContainer);
+        moduleContainer.reset();
+    }
+    /**
+     * Runs the given modules through Octo's lifecycle, and yields the result once.
+     *
+     * How far the lifecycle goes is set by `terraformTarget`, and this is the choice that decides what
+     * the test costs:
+     * - `'skip'` - composes and commits in memory. No terraform, no cloud. This is a unit test.
+     * - `'plan'` - generates the module folders and runs `terraform plan` against them.
+     * - `'apply'` - generates, plans, applies, and commits. **This creates real infrastructure.**
+     *
+     * @param modules The modules to load, in order.
+     * @param options `filterByModuleIds` narrows the run to those modules; `outputDir` is where the
+     * terraform folders are written, defaulting to a temporary directory.
+     */
+    async *runModules(modules, { filterByModuleIds = [], outputDir, terraformTarget = 'skip', } = {}) {
+        const [moduleContainer, resourceDataRepository, terraformService, terraformUtility] = await Promise.all([
+            this.container.get(ModuleContainer),
+            this.container.get(ResourceDataRepository),
+            this.container.get(TerraformService),
+            this.container.get(TerraformUtility),
+        ]);
+        // Load modules.
+        const moduleList = Array.isArray(modules) ? modules : [modules];
+        for (const module of moduleList) {
+            if (moduleContainer.getMetadataIndex(module.type) === -1) {
                 moduleContainer.register(module.type, {
                     packageName: module.type.MODULE_PACKAGE,
                 });
@@ -309,18 +384,175 @@ export class TestModuleContainer {
                 moduleContainer.load(moduleMetadata.module, module.moduleId, module.inputs);
             }
         }
-        return (await this.octo.compose());
+        // Compose modules.
+        moduleContainer.order(moduleList.map((m) => m.type));
+        await this.octo.compose();
+        const app = this.octo.getRootModel();
+        const collectResponses = () => Object.fromEntries(resourceDataRepository.getActualResourcesByProperties().map((r) => [r.getContext(), r.response]));
+        if (terraformTarget === 'skip') {
+            // this.commit() applies the model graph exactly once and, before its internal reset, stores the
+            // rendered desired state in `previousHcl`. Derive the render and block diff from that single
+            // apply rather than a separate preview render — a preview would re-run model actions, and
+            // non-idempotent ones (e.g. sibling associations) would then apply twice.
+            const priorHcl = this.previousHcl ?? '';
+            const transaction = await this.commit(app, { filterByModuleIds });
+            const currentHcl = this.previousHcl ?? '';
+            yield {
+                hclDiff: HclUtility.diffBlocks(priorHcl, currentHcl),
+                hclRender: currentHcl,
+                modelTransaction: transaction.modelTransaction,
+                resourceDiffs: transaction.resourceDiffs,
+                resourceTransaction: transaction.resourceTransaction,
+                responses: collectResponses(),
+                validateReport: undefined,
+                warnings: [],
+            };
+            return;
+        }
+        // In production octo runs generate/validate/commit as three separate processes, each of which
+        // derives the resource graph once from intent. runModules drives all three in one process, so it
+        // builds the model transaction once and hands the same result to each mode.
+        const transaction = await applyModelTransaction(app);
+        // Generate.
+        const dir = outputDir ?? (await mkdtemp(join(tmpdir(), 'octo-hcl-')));
+        const resourceDiffs = await this.octo.generate(app, { outputDir: dir }, transaction);
+        // Render the full HCL and the block diff from the sweep the transaction produced.
+        const currentHcl = HclUtility.serialize(terraformService.renderAllModules());
+        const diffHcl = HclUtility.diffBlocks(this.previousHcl ?? '', currentHcl);
+        this.previousHcl = currentHcl;
+        // Validate.
+        const validateReport = await this.octo.validate(app, await terraformUtility.plan(dir, { json: true }), transaction);
+        if (validateReport.failures.length > 0) {
+            throw new Error(`runModules(): terraform could not plan:\n${validateReport.failures
+                .map((failure) => `${failure.moduleId ? `[${failure.moduleId}] ` : ''}${failure.message}`)
+                .join('\n')}`);
+        }
+        const result = {
+            hclDiff: diffHcl,
+            hclRender: currentHcl,
+            modelTransaction: [],
+            resourceDiffs,
+            resourceTransaction: [],
+            responses: collectResponses(),
+            validateReport,
+            warnings: [],
+        };
+        if (terraformTarget === 'plan') {
+            yield result;
+            return;
+        }
+        // Apply.
+        await terraformUtility.apply(dir);
+        // Commit. The lock is taken and released here, the way the CLI does it around octo.commit().
+        const { lockId } = await this.stateProvider.lockApp();
+        let warnings;
+        try {
+            ({ warnings } = await this.octo.commit(app, { lockId, outputs: await terraformUtility.output(dir, { json: true }) }, transaction));
+        }
+        finally {
+            await this.stateProvider.unlockApp(lockId);
+        }
+        // Re-collect responses after the commit: it is commit that maps terraform outputs onto the
+        // actual resource graph, so a snapshot taken before it (as `response` holds) would miss them.
+        yield { ...result, responses: collectResponses(), warnings };
     }
-    async reset() {
-        const container = Container.getInstance();
-        // Reset ModuleContainer constructor injections.
-        await container.get(InputService, { args: [true] });
-        await container.get(OverlayDataRepository, {
-            args: [true, []],
+    /**
+     * Persists the run's state, so a later run in the same test diffs against it.
+     */
+    async commit(app, { filterByModuleIds = [], skipResourceTransaction = false, } = {}) {
+        const [terraformService, transactionService] = await Promise.all([
+            this.container.get(TerraformService),
+            this.container.get(TransactionService),
+        ]);
+        // Each transaction sweeps the full resource graph into the terraform service, so the previous
+        // call's sweep must be cleared first. Config and providers survive, as they would in a real
+        // process — tests register them once (in beforeEach), not per transaction.
+        terraformService.resetTransactionState();
+        const diffs = await app.diff();
+        const generator = transactionService.beginTransaction(diffs, {
+            generateTerraform: true,
+            yieldModelDiffs: true,
+            yieldModelTransaction: true,
+            yieldResourceDiffs: true,
+            yieldResourceTransaction: true,
         });
-        // Reset module container.
-        const moduleContainer = await container.get(ModuleContainer);
-        moduleContainer.reset();
+        const response = {};
+        try {
+            response.modelDiffs = (await generator.next()).value;
+            response.modelTransaction = (await generator.next()).value;
+            response.resourceDiffs = (await generator.next()).value;
+            if (!skipResourceTransaction) {
+                response.resourceTransaction = (await generator.next()).value;
+                await generator.next();
+            }
+            else {
+                response.resourceTransaction = [];
+            }
+        }
+        catch (error) {
+            await this.reset();
+            throw error;
+        }
+        if (!skipResourceTransaction) {
+            await this.octo['commitTransaction'](app, response.modelTransaction, response.resourceTransaction);
+        }
+        // Establish the HCL diff baseline from the same transaction that just applied the models, so the
+        // next runModules() render reports its `diff` against the committed state. Captured before
+        // reset(), which wipes the model attribution renderAllModules() depends on.
+        this.previousHcl = HclUtility.serialize(terraformService.renderAllModules());
+        const inputService = await this.container.get(InputService);
+        for (const moduleId of filterByModuleIds) {
+            response.modelDiffs = response.modelDiffs
+                .map((i) => i.filter((j) => {
+                if (j.node instanceof AModel && !(j.node instanceof AOverlay)) {
+                    return inputService.getModuleIdFromModel(j.node) === moduleId;
+                }
+                else if (j.node instanceof AOverlay) {
+                    return inputService.getModuleIdFromOverlay(j.node) === moduleId;
+                }
+                else {
+                    return false;
+                }
+            }))
+                .filter((i) => i.length);
+            response.modelTransaction = response.modelTransaction
+                .map((i) => i.filter((j) => {
+                if (j.node instanceof AModel && !(j.node instanceof AOverlay)) {
+                    return inputService.getModuleIdFromModel(j.node) === moduleId;
+                }
+                else if (j.node instanceof AOverlay) {
+                    return inputService.getModuleIdFromOverlay(j.node) === moduleId;
+                }
+                else {
+                    return false;
+                }
+            }))
+                .filter((i) => i.length);
+            response.resourceDiffs = response.resourceDiffs
+                .map((i) => i.filter((j) => {
+                if (j.node instanceof AResource) {
+                    return inputService.getModuleIdFromResource(j.node) === moduleId;
+                }
+                else {
+                    return false;
+                }
+            }))
+                .filter((i) => i.length);
+            if (!skipResourceTransaction) {
+                response.resourceTransaction = response.resourceTransaction
+                    .map((i) => i.filter((j) => {
+                    if (j.node instanceof AResource) {
+                        return inputService.getModuleIdFromResource(j.node) === moduleId;
+                    }
+                    else {
+                        return false;
+                    }
+                }))
+                    .filter((i) => i.length);
+            }
+        }
+        await this.reset();
+        return response;
     }
 }
 //# sourceMappingURL=test-module.container.js.map