@terraforge/core 0.0.23 → 0.0.25

package/dist/index.d.mts

@@ -355,7 +355,14 @@ declare class WorkSpace {
   /**
    * Refresh the state of the resources & data-sources inside your app.
    */
-  refresh(app: App, options?: ProcedureOptions): Promise<void>;
+  refresh(app: App, options?: ProcedureOptions): Promise<{
+    operations: {
+      urn: URN;
+      operation: "delete" | "update";
+      commit(): void;
+    }[];
+    commit: () => Promise<void>;
+  } | undefined>;
   /**
    * Get the status of all resources in the app by comparing current config with state file.
    */

package/dist/index.mjs

@@ -1119,33 +1119,45 @@ const refresh = async (app, opt) => {
 		return opt.filters.includes(stackName);
 	}).map(([_, state]) => state);
 	if (appState && filteredStacks.length > 0) {
-		await Promise.all(filteredStacks.map((stackState) => {
-			return Promise.all(Object.values(stackState.nodes).map((nodeState) => {
+		const filteredOperations = (await Promise.all(filteredStacks.map((stackState) => {
+			return Promise.all(Object.entries(stackState.nodes).map(([_urn, nodeState]) => {
+				const urn = _urn;
 				return queue(async () => {
 					const provider = findProvider(opt.providers, nodeState.provider);
-					if (nodeState.tag === "data") {
-						const result = await provider.getData?.({
-							type: nodeState.type,
-							state: nodeState.output
-						});
-						if (result && !compareState(result.state, nodeState.output)) {
-							nodeState.output = result.state;
-							nodeState.input = result.state;
+					let result;
+					if (nodeState.tag === "data") result = await provider.getData?.({
+						type: nodeState.type,
+						state: nodeState.output
+					});
+					else result = await provider.getResource({
+						type: nodeState.type,
+						state: nodeState.output
+					});
+					if (!result) return {
+						urn,
+						operation: "delete",
+						commit() {
+							delete stackState.nodes[urn];
 						}
-					} else if (nodeState.tag === "resource") {
-						const result = await provider.getResource({
-							type: nodeState.type,
-							state: nodeState.output
-						});
-						if (result && !compareState(result.state, nodeState.output)) {
-							nodeState.output = result.state;
+					};
+					else if (!compareState(result.state, nodeState.output)) return {
+						urn,
+						operation: "update",
+						commit() {
 							nodeState.input = result.state;
+							nodeState.output = result.state;
 						}
-					}
+					};
 				});
 			}));
-		}));
-		await opt.backend.state.update(app.urn, appState);
+		}))).flat().filter((op) => !!op);
+		if (filteredOperations.length === 0) return;
+		return {
+			operations: filteredOperations,
+			async commit() {
+				await opt.backend.state.update(app.urn, appState);
+			}
+		};
 	}
 };
 
@@ -1300,17 +1312,43 @@ var WorkSpace = class {
 	/**
 	* Refresh the state of the resources & data-sources inside your app.
 	*/
-	refresh(app, options = {}) {
-		return lockApp(this.props.backend.lock, app, async () => {
-			try {
-				await refresh(app, {
-					...this.props,
-					...options
-				});
-			} finally {
+	async refresh(app, options = {}) {
+		let releaseLock;
+		try {
+			releaseLock = await this.props.backend.lock.lock(app.urn);
+		} catch (error) {
+			throw new Error(`Already in progress: ${app.urn}`);
+		}
+		const releaseExit = onExit(async () => {
+			await this.destroyProviders();
+			await releaseLock();
+		});
+		try {
+			const result = await refresh(app, {
+				...this.props,
+				...options
+			});
+			if (!result) {
 				await this.destroyProviders();
+				await releaseLock();
+				releaseExit();
+				return;
 			}
-		});
+			return {
+				operations: result.operations,
+				commit: async () => {
+					await result.commit();
+					await this.destroyProviders();
+					await releaseLock();
+					releaseExit();
+				}
+			};
+		} catch (error) {
+			await this.destroyProviders();
+			await releaseLock();
+			releaseExit();
+			throw error;
+		}
 	}
 	/**
 	* Get the status of all resources in the app by comparing current config with state file.

package/package.json

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