@terraforge/terraform 0.0.25 → 0.0.27

package/dist/index.mjs

@@ -235,6 +235,24 @@ const sortStateValues = (values) => {
 		return 0;
 	});
 };
+const tryNormalizeJsonString = (value) => {
+	const trimmed = value.trim();
+	if (!(trimmed.startsWith("{") || trimmed.startsWith("["))) return value;
+	try {
+		return stableStringify(JSON.parse(trimmed));
+	} catch {
+		return value;
+	}
+};
+const uniqueStateValues = (values) => {
+	const seen = /* @__PURE__ */ new Set();
+	return values.filter((value) => {
+		const key = stableStringify(value);
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	});
+};
 const encodeDynamicValue = (value) => {
 	return {
 		msgpack: pack(value),
@@ -299,20 +317,24 @@ const shouldIncludeFieldForComparison = (schema, inputValue) => {
 };
 const normalizeStateForComparison = (schema, state, inputState) => {
 	if (!shouldIncludeFieldForComparison(schema, inputState)) return;
+	if ((schema.optional || schema.computed) && (state === null || typeof state === "undefined") && isEmptyOutputValue(inputState)) state = inputState;
 	if (state === null || typeof state === "undefined") return state;
 	if (schema.type === "array") {
 		if (!Array.isArray(state)) return state;
-		const normalized = state.map((item, index) => {
+		const filtered = state.map((item, index) => {
 			const inputItem = Array.isArray(inputState) ? inputState[index] : void 0;
 			return normalizeStateForComparison(schema.item, item, inputItem);
-		});
-		return schema.collectionKind === "set" ? sortStateValues(normalized) : normalized;
+		}).filter((item) => typeof item !== "undefined");
+		if (schema.collectionKind === "set") return sortStateValues(uniqueStateValues(filtered.filter((item) => item !== null)));
+		return filtered;
 	}
 	if (schema.type === "record") {
 		if (typeof state !== "object" || state === null) return state;
-		return Object.fromEntries(Object.entries(state).map(([key, value]) => {
+		return Object.fromEntries(Object.entries(state).flatMap(([key, value]) => {
 			const inputValue = inputState && typeof inputState === "object" ? inputState[key] : void 0;
-			return [key, normalizeStateForComparison(schema.item, value, inputValue)];
+			const normalized = normalizeStateForComparison(schema.item, value, inputValue);
+			if (typeof normalized === "undefined") return [];
+			return [[key, normalized]];
 		}));
 	}
 	if (schema.type === "object") {
@@ -333,6 +355,9 @@ const normalizeStateForComparison = (schema, state, inputState) => {
 			return [[camelCase(key), normalized]];
 		}));
 	}
+	if (schema.type === "string") {
+		if (typeof state === "string") return tryNormalizeJsonString(state);
+	}
 	return state;
 };
 const formatInputState = (schema, state, includeSchemaFields = true, path = []) => {
@@ -426,16 +451,6 @@ const formatOutputState = (schema, state, path = []) => {
 
 //#endregion
 //#region src/provider.ts
-const areStatesEqual = (left, right) => {
-	const replacer = (_, value) => {
-		if (value !== null && value instanceof Object && !Array.isArray(value)) return Object.keys(value).sort().reduce((sorted, key) => {
-			sorted[key] = value[key];
-			return sorted;
-		}, {});
-		return value;
-	};
-	return JSON.stringify(left, replacer) === JSON.stringify(right, replacer);
-};
 var TerraformProvider = class {
 	configured;
 	plugin;
@@ -529,14 +544,9 @@ var TerraformProvider = class {
 		const schema = getResourceSchema(plugin.schema().resources, type);
 		const refreshedState = await plugin.readResource(type, priorOutputState);
 		if (!refreshedState) return { kind: "deleted" };
-		const mergedState = {
-			...refreshedState,
-			...priorInputState
-		};
-		const { requiresReplace, plannedState } = await plugin.planResourceChange(type, refreshedState, mergedState, priorInputState);
-		const normalizedPlannedState = normalizeStateForComparison(schema, plannedState, priorInputState);
+		const normalizedPriorInputState = normalizeStateForComparison(schema, priorInputState, priorInputState);
 		const normalizedRefreshedState = normalizeStateForComparison(schema, refreshedState, priorInputState);
-		if (requiresReplace.length === 0 && areStatesEqual(normalizedPlannedState, normalizedRefreshedState)) return {
+		if (stableStringify(normalizedPriorInputState) === stableStringify(normalizedRefreshedState)) return {
 			kind: "unchanged",
 			state: refreshedState
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@terraforge/terraform",
-	"version": "0.0.25",
+	"version": "0.0.27",
 	"type": "module",
 	"repository": {
 		"type": "git",