@gershy/lilac 0.0.11 → 0.0.12

package/cmp/cjs/main.js

@@ -30,6 +30,7 @@ const terraform_ts_1 = require("./petal/terraform/terraform.js");
 const aws_ts_1 = require("./util/aws.js");
 const clearing_1 = require("@gershy/clearing");
 const procTerraform_ts_1 = __importDefault(require("./util/procTerraform.js"));
+const util_try_with_healing_1 = __importDefault(require("@gershy/util-try-with-healing"));
 const { File, Provider, Terraform } = terraform_ts_1.PetalTerraform;
 class Flower {
     constructor() { }
@@ -261,26 +262,17 @@ class Garden {
         if (mode === 'test')
             throw Error('test mode not implemented yet');
         const { bootFact, mainFact } = await this.prepare();
-        const tryWithHealing = async (args) => {
-            const { fn, heal, canHeal } = args;
-            return fn().catch(async (err) => {
-                if (!canHeal(err))
-                    throw err;
-                await heal();
-                return fn();
-            });
-        };
         const logicalApply = (args) => {
-            return tryWithHealing({
+            return (0, util_try_with_healing_1.default)({
                 fn: () => this.terraformApply(args.mainFact),
                 canHeal: err => (err.output ?? '')[has]('please run "terraform init"'),
-                heal: () => tryWithHealing({
+                heal: () => (0, util_try_with_healing_1.default)({
                     fn: async () => {
                         await this.terraformInit(args.mainFact);
                         await this.ctx.patioFact.kid(['main', '.terraform.lock.hcl']).setData(await args.mainFact.kid(['.terraform.lock.hcl']).getData('str'));
                     },
                     canHeal: err => true,
-                    heal: () => tryWithHealing({
+                    heal: () => (0, util_try_with_healing_1.default)({
                         fn: () => this.terraformApply(args.bootFact),
                         canHeal: err => (err.output ?? '')[has]('please run "terraform init"'),
                         heal: () => this.terraformInit(args.bootFact)

package/cmp/mjs/main.js

@@ -10,6 +10,7 @@ import { PetalTerraform } from "./petal/terraform/terraform.js";
 import { regions as awsRegions } from "./util/aws.js";
 import { isCls, skip } from '@gershy/clearing';
 import procTerraform from "./util/procTerraform.js";
+import tryWithHealing from '@gershy/util-try-with-healing';
 const { File, Provider, Terraform } = PetalTerraform;
 export class Flower {
     constructor() { }
@@ -239,15 +240,6 @@ export class Garden {
         if (mode === 'test')
             throw Error('test mode not implemented yet');
         const { bootFact, mainFact } = await this.prepare();
-        const tryWithHealing = async (args) => {
-            const { fn, heal, canHeal } = args;
-            return fn().catch(async (err) => {
-                if (!canHeal(err))
-                    throw err;
-                await heal();
-                return fn();
-            });
-        };
         const logicalApply = (args) => {
             return tryWithHealing({
                 fn: () => this.terraformApply(args.mainFact),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gershy/lilac",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Luscious infrastructure Living as Code - an opinionated approach to IAC",
   "keywords": [
     "lilac",
@@ -31,7 +31,8 @@
     "@gershy/logger": "^0.0.3",
     "@gershy/util-http": "^0.0.4",
     "@gershy/util-nodejs-proc": "^0.0.10",
-    "@gershy/util-phrasing": "^0.0.4"
+    "@gershy/util-phrasing": "^0.0.4",
+    "@gershy/util-try-with-healing": "^0.0.2"
   },
   "type": "module",
   "files": [