@terraforge/terraform 0.0.14 → 0.0.17

package/dist/index.mjs

@@ -1966,6 +1966,23 @@ const formatAttributePath = (state) => {
 		});
 	});
 };
+const getNestedValue = (obj, path) => {
+	let current = obj;
+	for (const key of path) {
+		if (current === null || current === void 0) return current;
+		if (Array.isArray(current)) current = current[key];
+		else if (typeof current === "object") current = current[key];
+		else return;
+	}
+	return current;
+};
+const filterRequiresReplace = (paths, priorState, proposedState) => {
+	return paths.filter((path) => {
+		const priorValue = getNestedValue(priorState, path);
+		const proposedValue = getNestedValue(proposedState, path);
+		return JSON.stringify(priorValue) !== JSON.stringify(proposedValue);
+	});
+};
 var IncorrectType = class extends TypeError {
 	constructor(type, path) {
 		super(`${path.join(".")} should be a ${type}`);
@@ -2018,7 +2035,7 @@ const formatInputState = (schema, state, includeSchemaFields = true, path = [])
 	throw new Error(`Unknown schema type: ${schema.type}`);
 };
 const formatOutputState = (schema, state, path = []) => {
-	if (state === null) return;
+	if (state === null) return null;
 	if (schema.type === "array") {
 		if (Array.isArray(state)) return state.map((item, i) => formatOutputState(schema.item, item, [...path, i]));
 		throw new IncorrectType(schema.type, path);
@@ -2050,7 +2067,7 @@ const formatOutputState = (schema, state, path = []) => {
 				object[camelCase(key)] = formatOutputState(prop, value, [...path, key]);
 			}
 			return object;
-		} else return;
+		} else return null;
 		throw new IncorrectType(schema.type, path);
 	}
 	return state;
@@ -2103,28 +2120,36 @@ const createPlugin5 = async ({ server, client }) => {
 		async planResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, {
+				...priorState,
+				...proposedState
+			});
+			const configState = formatInputState(schema$1, proposedState);
 			const plan = await client.call("PlanResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				proposedNewState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(preparedProposedState)
+				config: encodeDynamicValue(configState)
 			});
 			const plannedState = decodeDynamicValue(plan.plannedState);
 			return {
-				requiresReplace: formatAttributePath(plan.requiresReplace),
+				requiresReplace: filterRequiresReplace(formatAttributePath(plan.requiresReplace), preparedPriorState, preparedProposedState),
 				plannedState
 			};
 		},
 		async applyResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, {
+				...priorState,
+				...proposedState
+			});
+			const configState = formatInputState(schema$1, proposedState);
 			return formatOutputState(schema$1, decodeDynamicValue((await client.call("ApplyResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				plannedState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(preparedProposedState)
+				config: encodeDynamicValue(configState)
 			})).newState));
 		}
 	};
@@ -2177,28 +2202,36 @@ const createPlugin6 = async ({ server, client }) => {
 		async planResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, {
+				...priorState,
+				...proposedState
+			});
+			const configState = formatInputState(schema$1, proposedState);
 			const plan = await client.call("PlanResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				proposedNewState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(preparedProposedState)
+				config: encodeDynamicValue(configState)
 			});
 			const plannedState = decodeDynamicValue(plan.plannedState);
 			return {
-				requiresReplace: formatAttributePath(plan.requiresReplace),
+				requiresReplace: filterRequiresReplace(formatAttributePath(plan.requiresReplace), preparedPriorState, preparedProposedState),
 				plannedState
 			};
 		},
 		async applyResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, {
+				...priorState,
+				...proposedState
+			});
+			const configState = formatInputState(schema$1, proposedState);
 			return formatOutputState(schema$1, decodeDynamicValue((await client.call("ApplyResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				plannedState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(preparedProposedState)
+				config: encodeDynamicValue(configState)
 			})).newState));
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@terraforge/terraform",
-	"version": "0.0.14",
+	"version": "0.0.17",
 	"type": "module",
 	"repository": {
 		"type": "git",
@@ -26,7 +26,7 @@
 		"test": "bun test"
 	},
 	"peerDependencies": {
-		"@terraforge/core": "0.0.11"
+		"@terraforge/core": "0.0.19"
 	},
 	"dependencies": {
 		"@grpc/grpc-js": "1.12.6",