@terraforge/core 0.0.17 → 0.0.19

package/dist/index.d.mts

@@ -162,6 +162,11 @@ type ResourceStatusInfo = {
   tag: 'resource' | 'data';
   status: ResourceStatus;
 };
+type StackStatusInfo = {
+  name: string;
+  urn: URN;
+  resources: ResourceStatusInfo[];
+};
 //#endregion
 //#region src/backend/lock.d.ts
 type LockBackend = {
@@ -176,6 +181,7 @@ type AppState = {
   version?: number;
   idempotentToken?: UUID;
   stacks: Record<URN, StackState>;
+  pendingDeletes?: Record<URN, NodeState>;
 };
 type StackState = {
   name: string;
@@ -338,7 +344,7 @@ declare class WorkSpace {
   /**
    * Get the status of all resources in the app by comparing current config with state file.
    */
-  status(app: App): Promise<ResourceStatusInfo[]>;
+  status(app: App): Promise<StackStatusInfo[]>;
   protected destroyProviders(): Promise<void>;
 }
 //#endregion
@@ -465,4 +471,4 @@ type CustomResourceProvider = Partial<{
 }>;
 declare const createCustomProvider: (providerId: string, resourceProviders: Record<string, CustomResourceProvider>) => Provider;
 //#endregion
-export { App, AppError, type Config, type CreateProps, type CustomResourceProvider, type DataSource, type DataSourceFunction, type DataSourceMeta, type DeleteProps, DynamoLockBackend, FileLockBackend, FileStateBackend, Future, type GetDataProps, type GetProps, Group, type Input, LockBackend, MemoryLockBackend, MemoryStateBackend, type Meta, type Node, type OptionalInput, type OptionalOutput, Output, type PlanProps, type ProcedureOptions, type Provider, type Resource, ResourceAlreadyExists, type ResourceClass, type ResourceConfig, ResourceError, type ResourceMeta, ResourceNotFound, type ResourceStatus, type ResourceStatusInfo, S3StateBackend, Stack, type State, StateBackend, type Tag, type URN, type UpdateProps, WorkSpace, type WorkSpaceOptions, createCustomProvider, createCustomResourceClass, createDebugger, createMeta, deferredOutput, enableDebug, findInputDeps, getMeta, isDataSource, isNode, isResource, nodeMetaSymbol, output, resolveInputs };
+export { App, AppError, type Config, type CreateProps, type CustomResourceProvider, type DataSource, type DataSourceFunction, type DataSourceMeta, type DeleteProps, DynamoLockBackend, FileLockBackend, FileStateBackend, Future, type GetDataProps, type GetProps, Group, type Input, LockBackend, MemoryLockBackend, MemoryStateBackend, type Meta, type Node, type OptionalInput, type OptionalOutput, Output, type PlanProps, type ProcedureOptions, type Provider, type Resource, ResourceAlreadyExists, type ResourceClass, type ResourceConfig, ResourceError, type ResourceMeta, ResourceNotFound, type ResourceStatus, type ResourceStatusInfo, S3StateBackend, Stack, type StackStatusInfo, type State, StateBackend, type Tag, type URN, type UpdateProps, WorkSpace, type WorkSpaceOptions, createCustomProvider, createCustomResourceClass, createDebugger, createMeta, deferredOutput, enableDebug, findInputDeps, getMeta, isDataSource, isNode, isResource, nodeMetaSymbol, output, resolveInputs };

package/dist/index.mjs

@@ -623,6 +623,16 @@ const deleteApp = async (app, opt) => {
 		delete stackState.nodes[urn];
 	});
 	const errors = await graph.run();
+	if (errors.length === 0 && appState.pendingDeletes) {
+		for (const [urn, nodeState] of entries(appState.pendingDeletes)) try {
+			await deleteResource(appState.idempotentToken, urn, nodeState, opt);
+			delete appState.pendingDeletes[urn];
+		} catch (error) {
+			if (error instanceof Error) errors.push(error);
+			else errors.push(/* @__PURE__ */ new Error(`${error}`));
+		}
+		if (Object.keys(appState.pendingDeletes).length === 0) delete appState.pendingDeletes;
+	}
 	removeEmptyStackStates(appState);
 	delete appState.idempotentToken;
 	await opt.backend.state.update(app.urn, appState);
@@ -813,7 +823,8 @@ const updateResource = async (resource, appToken, priorInputState, priorOutputSt
 	const idempotantToken = createIdempotantToken(appToken, meta.urn, "update");
 	let result;
 	debug$2(meta.type);
-	debug$2(proposedState);
+	debug$2("prior state", priorOutputState);
+	debug$2("proposed state", proposedState);
 	try {
 		await opt.hooks?.beforeResourceUpdate?.({
 			urn: resource.urn,
@@ -883,7 +894,6 @@ const deployApp = async (app, opt) => {
 	}
 	const queue = createConcurrencyQueue(opt.concurrency ?? 10);
 	const graph = new DependencyGraph();
-	const replacementDeletes = /* @__PURE__ */ new Map();
 	const allNodes = {};
 	for (const stackState of Object.values(appState.stacks)) for (const [urn, nodeState] of entries(stackState.nodes)) allNodes[urn] = nodeState;
 	for (const stack of filteredOutStacks) {
@@ -966,10 +976,33 @@ const deployApp = async (app, opt) => {
 							let newResourceState;
 							const ignoreReplace = forcedUpdateDependents.has(meta$1.urn);
 							if (!ignoreReplace && requiresReplacement(nodeState.input, input, meta$1.config?.replaceOnChanges ?? [])) if (meta$1.config?.createBeforeReplace) {
+								for (const [dependentUrn, dependentNode] of nodeByUrn.entries()) {
+									if (!isResource(dependentNode)) continue;
+									const dependentMeta = getMeta(dependentNode);
+									if (!dependentMeta.dependencies.has(meta$1.urn)) continue;
+									const dependentStackState = stackStates.get(dependentMeta.stack.urn);
+									const dependentState = dependentStackState?.nodes[dependentUrn];
+									if (!dependentStackState || !dependentState) continue;
+									const dependencyPaths = findDependencyPaths(dependentMeta.input, meta$1.urn);
+									if (dependencyPaths.length === 0) continue;
+									const dependentProvider = findProvider(opt.providers, dependentMeta.provider);
+									if (dependentProvider.planResourceChange) {
+										if ((await dependentProvider.planResourceChange({
+											type: dependentMeta.type,
+											priorState: dependentState.output,
+											proposedState: input
+										})).requiresReplacement) {
+											if (!allowsDependentReplace(dependentMeta.config?.replaceOnChanges, dependencyPaths)) throw ResourceError.wrap(dependentMeta.urn, dependentMeta.type, "update", /* @__PURE__ */ new Error(`Replacing ${meta$1.urn} requires ${dependentMeta.urn} to set replaceOnChanges for its dependency fields.`));
+										}
+									}
+								}
 								const priorState = { ...nodeState };
 								newResourceState = await createResource(node, appState.idempotentToken, input, opt);
 								if (newResourceState.output) meta$1.resolve(newResourceState.output);
-								if (!meta$1.config?.retainOnDelete) replacementDeletes.set(meta$1.urn, priorState);
+								if (!meta$1.config?.retainOnDelete) {
+									appState.pendingDeletes ??= {};
+									appState.pendingDeletes[meta$1.urn] = priorState;
+								}
 							} else {
 								for (const [dependentUrn, dependentNode] of nodeByUrn.entries()) {
 									if (!isResource(dependentNode)) continue;
@@ -1028,11 +1061,15 @@ const deployApp = async (app, opt) => {
 		}
 	}
 	const errors = await graph.run();
-	if (errors.length === 0 && replacementDeletes.size > 0) for (const [urn, nodeState] of replacementDeletes.entries()) try {
-		await deleteResource(appState.idempotentToken, urn, nodeState, opt);
-	} catch (error) {
-		if (error instanceof Error) errors.push(error);
-		else errors.push(/* @__PURE__ */ new Error(`${error}`));
+	if (errors.length === 0 && appState.pendingDeletes) {
+		for (const [urn, nodeState] of entries(appState.pendingDeletes)) try {
+			await deleteResource(appState.idempotentToken, urn, nodeState, opt);
+			delete appState.pendingDeletes[urn];
+		} catch (error) {
+			if (error instanceof Error) errors.push(error);
+			else errors.push(/* @__PURE__ */ new Error(`${error}`));
+		}
+		if (Object.keys(appState.pendingDeletes).length === 0) delete appState.pendingDeletes;
 	}
 	removeEmptyStackStates(appState);
 	delete appState.idempotentToken;
@@ -1097,26 +1134,50 @@ const refresh = async (app, opt) => {
 //#endregion
 //#region src/workspace/procedure/status.ts
 /**
-* Extract static values from inputs, replacing Output/Future/Promise with a placeholder.
-* This allows comparing config without needing to resolve dependencies.
+* Extract static values from inputs, omitting Output/Future/Promise values.
+* This allows comparing only the static parts of config without needing to resolve dependencies.
+* We omit dynamic values entirely rather than using placeholders, since the state file
+* contains resolved values that we can't meaningfully compare against.
 */
 const extractStaticInputs = (inputs) => {
-	if (inputs instanceof Output || inputs instanceof Future || inputs instanceof Promise) return "__unresolved__";
+	if (inputs instanceof Output || inputs instanceof Future || inputs instanceof Promise) return;
 	if (Array.isArray(inputs)) return inputs.map(extractStaticInputs);
 	if (inputs !== null && typeof inputs === "object" && inputs.constructor === Object) {
 		const result = {};
-		for (const [key, value] of Object.entries(inputs)) result[key] = extractStaticInputs(value);
+		for (const [key, value] of Object.entries(inputs)) {
+			const extracted = extractStaticInputs(value);
+			if (extracted !== void 0) result[key] = extracted;
+		}
 		return result;
 	}
 	return inputs;
 };
+/**
+* Remove keys from state that correspond to dynamic (Output/Future/Promise) values in config.
+* This ensures we only compare static values that exist in both.
+*/
+const filterStateToMatchConfig = (state, config) => {
+	if (config instanceof Output || config instanceof Future || config instanceof Promise) return;
+	if (Array.isArray(config) && Array.isArray(state)) return config.map((configItem, index) => filterStateToMatchConfig(state[index], configItem));
+	if (config !== null && typeof config === "object" && config.constructor === Object && state !== null && typeof state === "object") {
+		const result = {};
+		for (const [key, configValue] of Object.entries(config)) {
+			const stateValue = state[key];
+			const filtered = filterStateToMatchConfig(stateValue, configValue);
+			if (filtered !== void 0) result[key] = filtered;
+		}
+		return result;
+	}
+	return state;
+};
 const status = async (app, opt) => {
 	const appState = await opt.backend.state.get(app.urn);
-	const resources = [];
+	const stacks = [];
 	const configuredUrns = /* @__PURE__ */ new Set();
 	for (const stack of app.stacks) for (const node of stack.nodes) configuredUrns.add(getMeta(node).urn);
 	for (const stack of app.stacks) {
 		const stackState = appState?.stacks[stack.urn];
+		const resources = [];
 		for (const node of stack.nodes) {
 			const meta = getMeta(node);
 			const nodeState = stackState?.nodes[meta.urn];
@@ -1134,7 +1195,7 @@ const status = async (app, opt) => {
 				continue;
 			}
 			const currentInput = extractStaticInputs(meta.input);
-			const hasChanged = !compareState(extractStaticInputs(nodeState.input), currentInput);
+			const hasChanged = !compareState(filterStateToMatchConfig(nodeState.input, meta.input), currentInput);
 			resources.push({
 				...baseInfo,
 				status: hasChanged ? "changed" : "created"
@@ -1149,18 +1210,31 @@ const status = async (app, opt) => {
 				status: "stale"
 			});
 		}
+		stacks.push({
+			name: stack.name,
+			urn: stack.urn,
+			resources
+		});
 	}
 	if (appState) {
 		const configuredStackUrns = new Set(app.stacks.map((s) => s.urn));
-		for (const [stackUrn, stackState] of Object.entries(appState.stacks)) if (!configuredStackUrns.has(stackUrn)) for (const [urn, nodeState] of Object.entries(stackState.nodes)) resources.push({
-			urn,
-			type: nodeState.type,
-			provider: nodeState.provider,
-			tag: nodeState.tag,
-			status: "stale"
-		});
+		for (const [stackUrn, stackState] of Object.entries(appState.stacks)) if (!configuredStackUrns.has(stackUrn)) {
+			const resources = [];
+			for (const [urn, nodeState] of Object.entries(stackState.nodes)) resources.push({
+				urn,
+				type: nodeState.type,
+				provider: nodeState.provider,
+				tag: nodeState.tag,
+				status: "stale"
+			});
+			stacks.push({
+				name: stackState.name,
+				urn: stackUrn,
+				resources
+			});
+		}
 	}
-	return resources;
+	return stacks;
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@terraforge/core",
-	"version": "0.0.17",
+	"version": "0.0.19",
 	"type": "module",
 	"repository": {
 		"type": "git",