@terraforge/core 0.0.30 → 0.0.32

package/dist/index.d.mts

@@ -194,6 +194,7 @@ type NodeState = {
   provider: string;
   input: State;
   output: State;
+  drifted?: boolean;
   dependencies: URN[];
   lifecycle?: {
     retainOnDelete?: boolean;
@@ -258,8 +259,12 @@ type RefreshResourceProps<T = State> = {
   priorOutputState: T;
 };
 type RefreshResourceResult<T = State> = {
-  kind: 'unchanged' | 'updated';
+  kind: 'unchanged';
   state: T;
+} | {
+  kind: 'updated';
+  state: T;
+  inputState: T;
 } | {
   kind: 'deleted';
 };
@@ -368,11 +373,17 @@ declare class WorkSpace {
    * Refresh the state of the resources & data-sources inside your app.
    */
   refresh(app: App, options?: ProcedureOptions): Promise<{
-    operations: {
+    operations: ({
+      urn: URN;
+      operation: "delete";
+      commit(): void;
+    } | {
       urn: URN;
-      operation: "delete" | "update";
+      operation: "update";
+      before: State;
+      after: State;
       commit(): void;
-    }[];
+    })[];
     commit: () => Promise<void>;
   } | undefined>;
   /**

package/dist/index.mjs

@@ -953,19 +953,20 @@ const deployApp = async (app, opt) => {
 							const dataSourceState = await getDataSource(meta$1, input, opt);
 							nodeState = stackState.nodes[meta$1.urn] = {
 								...dataSourceState,
+								drifted: void 0,
 								...partialNewResourceState
 							};
-						} else if (!compareState(nodeState.input, input)) {
+						} else if (!compareState(nodeState.input, input) || nodeState.drifted) {
 							const dataSourceState = await getDataSource(meta$1, input, opt);
 							Object.assign(nodeState, {
 								...dataSourceState,
+								drifted: void 0,
 								...partialNewResourceState
 							});
 						} else Object.assign(nodeState, partialNewResourceState);
 					}
 					if (isResource(node)) {
 						const meta$1 = getMeta(node);
-						const provider = findProvider(opt.providers, meta$1.provider);
 						if (!nodeState) if (meta$1.config?.import) {
 							const importedState = await importResource(node, input, opt);
 							const newResourceState = await updateResource(node, appState.idempotentToken, importedState.input, importedState.output, input, opt);
@@ -983,17 +984,12 @@ const deployApp = async (app, opt) => {
 						}
 						else {
 							const inputChanged = !compareState(nodeState.input, input);
-							const plannedChange = provider.planResourceChange ? await provider.planResourceChange({
-								type: meta$1.type,
-								priorState: nodeState.output,
-								proposedState: input
-							}) : void 0;
-							const hasDrift = !inputChanged && !!provider.refreshResource && !!plannedChange && !compareState(plannedChange.state, nodeState.output);
+							const hasDrift = !!nodeState.drifted;
 							if (!inputChanged && !hasDrift) Object.assign(nodeState, partialNewResourceState);
 							else {
 								let newResourceState;
 								const ignoreReplace = forcedUpdateDependents.has(meta$1.urn);
-								if (!ignoreReplace && (requiresReplacement(nodeState.input, input, meta$1.config?.replaceOnChanges ?? []) || !inputChanged && (plannedChange?.requiresReplacement ?? false))) if (meta$1.config?.createBeforeReplace) {
+								if (!ignoreReplace && requiresReplacement(nodeState.input, input, meta$1.config?.replaceOnChanges ?? [])) if (meta$1.config?.createBeforeReplace) {
 									meta$1.resolve(input);
 									try {
 										for (const [dependentUrn, dependentNode] of nodeByUrn.entries()) {
@@ -1074,6 +1070,7 @@ const deployApp = async (app, opt) => {
 								}
 								Object.assign(nodeState, {
 									input,
+									drifted: void 0,
 									...newResourceState,
 									...partialNewResourceState
 								});
@@ -1122,6 +1119,9 @@ const hydrate = async (app, opt) => {
 
 //#endregion
 //#region src/workspace/procedure/refresh.ts
+const copy = (value) => {
+	return JSON.parse(JSON.stringify(value));
+};
 const createDeleteOperation = (urn, stackState) => {
 	return {
 		urn,
@@ -1131,15 +1131,15 @@ const createDeleteOperation = (urn, stackState) => {
 		}
 	};
 };
-const createUpdateOperation = (urn, state, nodeState) => {
-	console.log(urn);
-	console.log(nodeState.output);
-	console.log(state);
+const createUpdateOperation = (urn, state, before, after, nodeState) => {
 	return {
 		urn,
 		operation: "update",
+		before: copy(before),
+		after: copy(after),
 		commit() {
 			nodeState.output = state;
+			nodeState.drifted = true;
 		}
 	};
 };
@@ -1163,7 +1163,7 @@ const refresh = async (app, opt) => {
 						});
 						if (!result) return createDeleteOperation(urn, stackState);
 						if (compareState(result.state, nodeState.output)) return;
-						return createUpdateOperation(urn, result.state, nodeState);
+						return createUpdateOperation(urn, result.state, nodeState.input, result.state, nodeState);
 					}
 					if (!provider.refreshResource) return;
 					const refreshed = await provider.refreshResource({
@@ -1173,7 +1173,7 @@ const refresh = async (app, opt) => {
 					});
 					if (!refreshed || refreshed.kind === "unchanged") return;
 					if (refreshed.kind === "deleted") return createDeleteOperation(urn, stackState);
-					return createUpdateOperation(urn, refreshed.state, nodeState);
+					return createUpdateOperation(urn, refreshed.state, nodeState.input, refreshed.inputState, nodeState);
 				});
 			}));
 		}))).flat().filter((op) => !!op);

package/package.json

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