takomo 5.0.0 → 5.1.0

package/dist/takomo-execution-plans/config-set/execute/group.d.ts

@@ -1,7 +1,8 @@
 import { InternalCredentialManager } from "../../../takomo-aws-clients";
 import { ConfigSetContext } from "../../../takomo-config-sets";
 import { CommandOutput, OperationState } from "../../../takomo-core";
-import { Timer, TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
+import { Timer } from "../../../utils/timer";
 import { ConfigSetExecutionGroup, ConfigSetGroupExecutionResult, ConfigSetTargetExecutor, ConfigSetTargetListener } from "../model";
 export interface ExecuteGroupProps<R extends CommandOutput, C> {
     readonly targetListener: ConfigSetTargetListener;

package/dist/takomo-execution-plans/config-set/execute/group.js

@@ -37,12 +37,11 @@ const executeGroup = async ({ targetListener, group, timer, state, logger, execu
     }));
     await Promise.all(operations.map((o) => o()));
     await targetListener.onGroupComplete(group);
-    timer.stop();
     return {
         ...(0, takomo_core_1.resolveCommandOutputBase)(results),
         groupId: group.id,
         results,
-        timer,
+        timer: timer.stop(),
     };
 };
 exports.executeGroup = executeGroup;

package/dist/takomo-execution-plans/config-set/execute/group.js.map

@@ -1 +1 @@
-{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/group.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAG3C,sDAI6B;AAU7B,qCAAwC;AAmBxC,MAAM,kBAAkB,GACtB,CAA6B,EAC3B,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,OAAO,EACP,cAAc,EACd,GAAG,EACH,QAAQ,EACR,wBAAwB,GACM,EAAsB,EAAE,CACxD,GAAG,EAAE,CACH,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;IACxB,MAAM,cAAc,CAAC,aAAa,EAAE,CAAA;IACpC,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAAO;QACvC,MAAM;QACN,KAAK;QACL,QAAQ;QACR,GAAG;QACH,wBAAwB;QACxB,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAClC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;KACtC,CAAC,CAAA;IAEF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACpB,MAAM,cAAc,CAAC,gBAAgB,EAAE,CAAA;IACvC,OAAO,MAAM,CAAA;AACf,CAAC,CAAC,CAAA;AAcC,MAAM,YAAY,GAAG,KAAK,EAA8B,EAC7D,cAAc,EACd,KAAK,EACL,KAAK,EACL,KAAK,EACL,MAAM,EACN,QAAQ,EACR,GAAG,EACH,iBAAiB,EACjB,wBAAwB,GACA,EAA6C,EAAE;IACvE,MAAM,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAExC,MAAM,MAAM,GAAG,kBAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAA;IACxD,MAAM,OAAO,GAAG,IAAI,KAAK,EAAqC,CAAA;IAE9D,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9C,kBAAkB,CAAO;QACvB,KAAK;QACL,MAAM;QACN,MAAM;QACN,OAAO;QACP,KAAK;QACL,cAAc;QACd,QAAQ;QACR,GAAG;QACH,MAAM;QACN,wBAAwB;KACzB,CAAC,CACH,CAAA;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAE7C,MAAM,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IAE3C,KAAK,CAAC,IAAI,EAAE,CAAA;IACZ,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,OAAO;QACP,KAAK;KACN,CAAA;AACH,CAAC,CAAA;AA1CY,QAAA,YAAY,gBA0CxB"}
+{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/group.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAG3C,sDAI6B;AAW7B,qCAAwC;AAmBxC,MAAM,kBAAkB,GACtB,CAA6B,EAC3B,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,OAAO,EACP,cAAc,EACd,GAAG,EACH,QAAQ,EACR,wBAAwB,GACM,EAAsB,EAAE,CACxD,GAAG,EAAE,CACH,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;IACxB,MAAM,cAAc,CAAC,aAAa,EAAE,CAAA;IACpC,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAAO;QACvC,MAAM;QACN,KAAK;QACL,QAAQ;QACR,GAAG;QACH,wBAAwB;QACxB,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAClC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;KACtC,CAAC,CAAA;IAEF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACpB,MAAM,cAAc,CAAC,gBAAgB,EAAE,CAAA;IACvC,OAAO,MAAM,CAAA;AACf,CAAC,CAAC,CAAA;AAcC,MAAM,YAAY,GAAG,KAAK,EAA8B,EAC7D,cAAc,EACd,KAAK,EACL,KAAK,EACL,KAAK,EACL,MAAM,EACN,QAAQ,EACR,GAAG,EACH,iBAAiB,EACjB,wBAAwB,GACA,EAA6C,EAAE;IACvE,MAAM,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAExC,MAAM,MAAM,GAAG,kBAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAA;IACxD,MAAM,OAAO,GAAG,IAAI,KAAK,EAAqC,CAAA;IAE9D,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9C,kBAAkB,CAAO;QACvB,KAAK;QACL,MAAM;QACN,MAAM;QACN,OAAO;QACP,KAAK;QACL,cAAc;QACd,QAAQ;QACR,GAAG;QACH,MAAM;QACN,wBAAwB;KACzB,CAAC,CACH,CAAA;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAE7C,MAAM,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IAE3C,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,OAAO;QACP,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;KACpB,CAAA;AACH,CAAC,CAAA;AAzCY,QAAA,YAAY,gBAyCxB"}

package/dist/takomo-execution-plans/config-set/execute/plan.d.ts

@@ -1,7 +1,8 @@
 import { InternalCredentialManager } from "../../../takomo-aws-clients";
 import { ConfigSetContext } from "../../../takomo-config-sets";
 import { CommandOutput, OperationState } from "../../../takomo-core";
-import { Timer, TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
+import { Timer } from "../../../utils/timer";
 import { ConfigSetExecutionPlan, ConfigSetPlanExecutionResult, ConfigSetTargetExecutor, ConfigSetTargetListenerProvider } from "../model";
 export interface ExecuteConfigSetPlanProps<R extends CommandOutput, C> {
     readonly plan: ConfigSetExecutionPlan<C>;

package/dist/takomo-execution-plans/config-set/execute/plan.js

@@ -22,11 +22,10 @@ const executeConfigSetPlan = async ({ logger, plan, timer, executor, concurrentT
         });
         results.push(result);
     }
-    timer.stop();
     return {
         ...(0, takomo_core_1.resolveCommandOutputBase)(results),
         results,
-        timer,
+        timer: timer.stop(),
         outputFormat: "text",
     };
 };

package/dist/takomo-execution-plans/config-set/execute/plan.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/plan.ts"],"names":[],"mappings":";;;AAEA,sDAI6B;AAS7B,mCAAsC;AAc/B,MAAM,oBAAoB,GAAG,KAAK,EAA8B,EACrE,MAAM,EACN,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,GAAG,EACH,KAAK,EACL,sBAAsB,EACtB,wBAAwB,GACQ,EAEhC,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IAErC,MAAM,OAAO,GAAG,IAAI,KAAK,EAAoC,CAAA;IAC7D,KAAK,MAAM,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE;QAC/D,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAO;YACtC,KAAK;YACL,MAAM;YACN,GAAG;YACH,QAAQ;YACR,KAAK;YACL,iBAAiB;YACjB,UAAU;YACV,sBAAsB;YACtB,wBAAwB;YACxB,kBAAkB,EAAE,kBAAkB,GAAG,CAAC;YAC1C,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC;SACzC,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,KAAK,CAAC,IAAI,EAAE,CAAA;IACZ,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,OAAO;QACP,KAAK;QACL,YAAY,EAAE,MAAM;KACrB,CAAA;AACH,CAAC,CAAA;AAxCY,QAAA,oBAAoB,wBAwChC"}
+{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/plan.ts"],"names":[],"mappings":";;;AAEA,sDAI6B;AAU7B,mCAAsC;AAc/B,MAAM,oBAAoB,GAAG,KAAK,EAA8B,EACrE,MAAM,EACN,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,GAAG,EACH,KAAK,EACL,sBAAsB,EACtB,wBAAwB,GACQ,EAEhC,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IAErC,MAAM,OAAO,GAAG,IAAI,KAAK,EAAoC,CAAA;IAC7D,KAAK,MAAM,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE;QAC/D,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAO;YACtC,KAAK;YACL,MAAM;YACN,GAAG;YACH,QAAQ;YACR,KAAK;YACL,iBAAiB;YACjB,UAAU;YACV,sBAAsB;YACtB,wBAAwB;YACxB,kBAAkB,EAAE,kBAAkB,GAAG,CAAC;YAC1C,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC;SACzC,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,OAAO;QACP,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;QACnB,YAAY,EAAE,MAAM;KACrB,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,oBAAoB,wBAuChC"}

package/dist/takomo-execution-plans/config-set/execute/stage.d.ts

@@ -1,7 +1,8 @@
 import { InternalCredentialManager } from "../../../takomo-aws-clients";
 import { ConfigSetContext } from "../../../takomo-config-sets";
 import { CommandOutput, OperationState } from "../../../takomo-core";
-import { Timer, TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
+import { Timer } from "../../../utils/timer";
 import { ConfigSetExecutionStage, ConfigSetStageExecutionResult, ConfigSetTargetExecutor, ConfigSetTargetListenerProvider } from "../model";
 interface ExecuteStageProps<R extends CommandOutput, C> {
     readonly stage: ConfigSetExecutionStage<C>;

package/dist/takomo-execution-plans/config-set/execute/stage.js

@@ -29,11 +29,10 @@ const executeStage = async ({ stage, logger, executor, state, concurrentTargets,
         });
         results.push(result);
     }
-    timer.stop();
     return {
         ...(0, takomo_core_1.resolveCommandOutputBase)(results),
         results,
-        timer,
+        timer: timer.stop(),
         stageName,
     };
 };

package/dist/takomo-execution-plans/config-set/execute/stage.js.map

@@ -1 +1 @@
-{"version":3,"file":"stage.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/stage.ts"],"names":[],"mappings":";;;AAEA,sDAI6B;AAS7B,mCAAsC;AAgBtC,MAAM,YAAY,GAAG,CAAC,KAAuC,EAAU,EAAE,CACvE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC,CAAC,CAAA;AAEzD,MAAM,YAAY,GAAG,KAAK,EAA8B,EAC7D,KAAK,EACL,MAAM,EACN,QAAQ,EACR,KAAK,EACL,iBAAiB,EACjB,sBAAsB,EACtB,GAAG,EACH,kBAAkB,EAClB,UAAU,EACV,wBAAwB,EACxB,KAAK,GACmB,EAA6C,EAAE;IACvE,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAA;IACjC,MAAM,CAAC,IAAI,CAAC,gBAAgB,SAAS,GAAG,CAAC,CAAA;IAEzC,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IAEvC,MAAM,cAAc,GAAG,sBAAsB,CAAC;QAC5C,SAAS;QACT,kBAAkB;QAClB,UAAU;QACV,WAAW;KACZ,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,IAAI,KAAK,EAAoC,CAAA;IAC7D,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;QAChC,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAO;YACtC,KAAK;YACL,GAAG;YACH,QAAQ;YACR,cAAc;YACd,KAAK;YACL,iBAAiB;YACjB,wBAAwB;YACxB,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;SACrC,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,KAAK,CAAC,IAAI,EAAE,CAAA;IAEZ,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,OAAO;QACP,KAAK;QACL,SAAS;KACV,CAAA;AACH,CAAC,CAAA;AAjDY,QAAA,YAAY,gBAiDxB"}
+{"version":3,"file":"stage.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/stage.ts"],"names":[],"mappings":";;;AAEA,sDAI6B;AAU7B,mCAAsC;AAgBtC,MAAM,YAAY,GAAG,CAAC,KAAuC,EAAU,EAAE,CACvE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC,CAAC,CAAA;AAEzD,MAAM,YAAY,GAAG,KAAK,EAA8B,EAC7D,KAAK,EACL,MAAM,EACN,QAAQ,EACR,KAAK,EACL,iBAAiB,EACjB,sBAAsB,EACtB,GAAG,EACH,kBAAkB,EAClB,UAAU,EACV,wBAAwB,EACxB,KAAK,GACmB,EAA6C,EAAE;IACvE,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAA;IACjC,MAAM,CAAC,IAAI,CAAC,gBAAgB,SAAS,GAAG,CAAC,CAAA;IAEzC,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IAEvC,MAAM,cAAc,GAAG,sBAAsB,CAAC;QAC5C,SAAS;QACT,kBAAkB;QAClB,UAAU;QACV,WAAW;KACZ,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,IAAI,KAAK,EAAoC,CAAA;IAC7D,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;QAChC,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAO;YACtC,KAAK;YACL,GAAG;YACH,QAAQ;YACR,cAAc;YACd,KAAK;YACL,iBAAiB;YACjB,wBAAwB;YACxB,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;SACrC,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,OAAO;QACP,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;QACnB,SAAS;KACV,CAAA;AACH,CAAC,CAAA;AA/CY,QAAA,YAAY,gBA+CxB"}

package/dist/takomo-execution-plans/config-set/execute/target.d.ts

@@ -1,7 +1,8 @@
 import { InternalCredentialManager } from "../../../takomo-aws-clients";
 import { ConfigSetContext } from "../../../takomo-config-sets";
 import { CommandOutput, OperationState } from "../../../takomo-core";
-import { Timer, TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
+import { Timer } from "../../../utils/timer";
 import { ConfigSetExecutionTarget, ConfigSetTargetExecutionResult, ConfigSetTargetExecutor } from "../model";
 export interface ExecuteTargetProps<R extends CommandOutput, C> {
     readonly executor: ConfigSetTargetExecutor<R, C>;

package/dist/takomo-execution-plans/config-set/execute/target.js

@@ -18,12 +18,11 @@ const executeTarget = async ({ target, logger, timer, state, executor, ctx, defa
         });
         results.push(result);
     }
-    timer.stop();
     return {
         ...(0, takomo_core_1.resolveCommandOutputBase)(results),
         results,
         targetId: target.id,
-        timer,
+        timer: timer.stop(),
     };
 };
 exports.executeTarget = executeTarget;

package/dist/takomo-execution-plans/config-set/execute/target.js.map

@@ -1 +1 @@
-{"version":3,"file":"target.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/target.ts"],"names":[],"mappings":";;;AAEA,sDAI6B;AAQ7B,6CAA+C;AAYxC,MAAM,aAAa,GAAG,KAAK,EAA8B,EAC9D,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,QAAQ,EACR,GAAG,EACH,wBAAwB,GACC,EAA8C,EAAE;IACzE,MAAM,OAAO,GAAG,IAAI,KAAK,EAA+B,CAAA;IAExD,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAgB,EAAO;YAC1C,MAAM;YACN,SAAS;YACT,KAAK;YACL,QAAQ;YACR,GAAG;YACH,MAAM;YACN,wBAAwB;YACxB,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;SACxC,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,KAAK,CAAC,IAAI,EAAE,CAAA;IAEZ,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,OAAO;QACP,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,KAAK;KACN,CAAA;AACH,CAAC,CAAA;AAjCY,QAAA,aAAa,iBAiCzB"}
+{"version":3,"file":"target.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/target.ts"],"names":[],"mappings":";;;AAEA,sDAI6B;AAS7B,6CAA+C;AAYxC,MAAM,aAAa,GAAG,KAAK,EAA8B,EAC9D,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,QAAQ,EACR,GAAG,EACH,wBAAwB,GACC,EAA8C,EAAE;IACzE,MAAM,OAAO,GAAG,IAAI,KAAK,EAA+B,CAAA;IAExD,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAgB,EAAO;YAC1C,MAAM;YACN,SAAS;YACT,KAAK;YACL,QAAQ;YACR,GAAG;YACH,MAAM;YACN,wBAAwB;YACxB,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;SACxC,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,OAAO;QACP,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;KACpB,CAAA;AACH,CAAC,CAAA;AA/BY,QAAA,aAAa,iBA+BzB"}

package/dist/takomo-execution-plans/config-set/model.d.ts

@@ -2,7 +2,8 @@ import { InternalCredentialManager } from "../../takomo-aws-clients";
 import { ConfigSet, ConfigSetName, ConfigSetType, StageName } from "../../takomo-config-sets";
 import { CommandOutput, CommandOutputBase, OperationState } from "../../takomo-core";
 import { CommandPath } from "../../takomo-stacks-model";
-import { Timer, TkmLogger } from "../../takomo-util";
+import { TkmLogger } from "../../utils/logging";
+import { Timer } from "../../utils/timer";
 import { ExecutionGroupId, ExecutionTargetId } from "../model";
 export interface CommandPathExecutionResult<R extends CommandOutput> extends CommandOutputBase {
     readonly commandPath: CommandPath;

package/dist/takomo-iam-commands/command.js

@@ -7,7 +7,7 @@ exports.generateIamPoliciesCommand = void 0;
 const joi_1 = __importDefault(require("joi"));
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_aws_schema_1 = require("../takomo-aws-schema");
-const takomo_util_1 = require("../takomo-util");
+const validation_1 = require("../utils/validation");
 const getEventsFromRegion = async (awsClientProvider, credentialManager, logger, region, startTime, endTime) => {
     const credentials = await credentialManager.getCredentials();
     const ct = await awsClientProvider.createCloudTrailClient({
@@ -57,14 +57,13 @@ const generateIamPolicies = async (awsClientProvider, io, input, credentialManag
         actions: ramda_1.default.uniq(eventList.map((e) => e.eventSource.split(".")[0] + ":" + e.eventName)).sort(),
     }))
         .filter(({ identity }) => identities.includes(identity));
-    timer.stop();
     return {
         policies,
         message: "Success",
         status: "SUCCESS",
         success: true,
         outputFormat: input.outputFormat,
-        timer,
+        timer: timer.stop(),
     };
 };
 const inputSchema = (ctx) => {
@@ -77,7 +76,7 @@ const inputSchema = (ctx) => {
         startTime: joi_1.default.date().required(),
     }).unknown(true);
 };
-const generateIamPoliciesCommand = async ({ ctx, io, input, credentialManager, }) => (0, takomo_util_1.validateInput)(inputSchema(ctx), input)
+const generateIamPoliciesCommand = async ({ ctx, io, input, credentialManager, }) => (0, validation_1.validateInput)(inputSchema(ctx), input)
     .then((input) => generateIamPolicies(ctx.awsClientProvider, io, input, credentialManager))
     .then(io.printOutput);
 exports.generateIamPoliciesCommand = generateIamPoliciesCommand;

package/dist/takomo-iam-commands/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/takomo-iam-commands/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/takomo-iam-commands/command.ts"],"names":[],"mappings":"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"}

package/dist/takomo-init-command/command.js

@@ -7,19 +7,18 @@ exports.initProjectCommand = void 0;
 const joi_1 = __importDefault(require("joi"));
 const takomo_aws_schema_1 = require("../takomo-aws-schema");
 const takomo_core_1 = require("../takomo-core");
-const takomo_util_1 = require("../takomo-util");
+const validation_1 = require("../utils/validation");
 const initProject = async (ctx, io, input, configRepository) => {
     const { timer } = input;
     const info = await io.promptProjectInformation(ctx, input);
     const description = await configRepository.putProjectConfig(info);
-    timer.stop();
     return {
         description,
         message: "Success",
         status: "SUCCESS",
         success: true,
         outputFormat: input.outputFormat,
-        timer,
+        timer: timer.stop(),
     };
 };
 const inputSchema = (ctx) => {
@@ -31,7 +30,7 @@ const inputSchema = (ctx) => {
         createSamples: joi_1.default.boolean(),
     }).unknown(true);
 };
-const initProjectCommand = async ({ ctx, io, input, configRepository }) => (0, takomo_util_1.validateInput)(inputSchema(ctx), input)
+const initProjectCommand = async ({ ctx, io, input, configRepository }) => (0, validation_1.validateInput)(inputSchema(ctx), input)
     .then((input) => initProject(ctx, io, input, configRepository))
     .then(io.printOutput);
 exports.initProjectCommand = initProjectCommand;

package/dist/takomo-init-command/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/takomo-init-command/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAoC;AACpC,4DAAuD;AACvD,gDAIuB;AACvB,gDAA8C;AAQ9C,MAAM,WAAW,GAAG,KAAK,EACvB,GAAmB,EACnB,EAAiB,EACjB,KAAuB,EACvB,gBAAyC,EACb,EAAE;IAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IACvB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,wBAAwB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC1D,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAEjE,KAAK,CAAC,IAAI,EAAE,CAAA;IAEZ,OAAO;QACL,WAAW;QACX,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,KAAK;KACN,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,GAAmB,EAAa,EAAE;IACrD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,oCAAgB,EAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,gCAAkB,GAAE,CAAA;IAExC,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,OAAO;QACP,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE;QAC3C,aAAa,EAAE,aAAG,CAAC,OAAO,EAAE;KAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAEM,MAAM,kBAAkB,GAK3B,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAA8B,EAAE,CAC7E,IAAA,2BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC;KACnC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;KAC9D,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AARZ,QAAA,kBAAkB,sBAQN"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/takomo-init-command/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAoC;AACpC,4DAAuD;AACvD,gDAIuB;AACvB,oDAAmD;AAQnD,MAAM,WAAW,GAAG,KAAK,EACvB,GAAmB,EACnB,EAAiB,EACjB,KAAuB,EACvB,gBAAyC,EACb,EAAE;IAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IACvB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,wBAAwB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC1D,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAEjE,OAAO;QACL,WAAW;QACX,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;KACpB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,GAAmB,EAAa,EAAE;IACrD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,oCAAgB,EAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,gCAAkB,GAAE,CAAA;IAExC,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,OAAO;QACP,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE;QAC3C,aAAa,EAAE,aAAG,CAAC,OAAO,EAAE;KAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAEM,MAAM,kBAAkB,GAK3B,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAA8B,EAAE,CAC7E,IAAA,0BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC;KACnC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;KAC9D,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AARZ,QAAA,kBAAkB,sBAQN"}

package/dist/takomo-stacks-commands/stacks/common/load-current-cf-stacks.d.ts

@@ -1,6 +1,6 @@
 import { CloudFormationStackSummary } from "../../../takomo-aws-model";
 import { InternalStack } from "../../../takomo-stacks-model";
-import { TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
 export interface StackPair {
     readonly stack: InternalStack;
     readonly current?: CloudFormationStackSummary;

package/dist/takomo-stacks-commands/stacks/common/load-current-cf-stacks.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadCurrentCfStacks = void 0;
 const takomo_stacks_model_1 = require("../../../takomo-stacks-model");
-const takomo_util_1 = require("../../../takomo-util");
+const collections_1 = require("../../../utils/collections");
+const strings_1 = require("../../../utils/strings");
 const makeCredentialsRegionHash = async (stack) => {
     const { accessKeyId, secretAccessKey, sessionToken } = await stack.getCredentials();
-    return (0, takomo_util_1.checksum)([stack.region, accessKeyId, secretAccessKey, sessionToken].join(":"));
+    return (0, strings_1.checksum)([stack.region, accessKeyId, secretAccessKey, sessionToken].join(":"));
 };
 const loadCfStacks = (stacks) => {
     const stackNames = (0, takomo_stacks_model_1.getStackNames)(stacks);
@@ -40,7 +41,7 @@ const loadCurrentCfStacks = async (logger, stacks) => {
             current: cfStacks.get(stack.name),
         }));
     }));
-    const pairsByPath = (0, takomo_util_1.arrayToMap)(pairs.flat(), (p) => p.stack.path);
+    const pairsByPath = (0, collections_1.arrayToMap)(pairs.flat(), (p) => p.stack.path);
     return stacks.map((stack) => pairsByPath.get(stack.path));
 };
 exports.loadCurrentCfStacks = loadCurrentCfStacks;

package/dist/takomo-stacks-commands/stacks/common/load-current-cf-stacks.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-current-cf-stacks.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/common/load-current-cf-stacks.ts"],"names":[],"mappings":";;;AAKA,sEAA2E;AAC3E,sDAAsE;AAEtE,MAAM,yBAAyB,GAAG,KAAK,EACrC,KAAoB,EACH,EAAE;IACnB,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,EAAE,GAClD,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;IAE9B,OAAO,IAAA,sBAAQ,EACb,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACrE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,MAAoC,EACiB,EAAE;IACvD,MAAM,UAAU,GAAG,IAAA,mCAAa,EAAC,MAAM,CAAC,CAAA;IACxC,OAAO,MAAM,CAAC,CAAC,CAAC;SACb,uBAAuB,EAAE;SACzB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAA;AAC9D,CAAC,CAAA;AAOD,MAAM,iBAAiB,GAAG,CACxB,cAAsD,EACxB,EAAE;IAChC,MAAM,YAAY,GAAG,IAAI,GAAG,EAA2B,CAAA;IACvD,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SACnB;aAAM;YACL,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;SAChC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAEM,MAAM,mBAAmB,GAAG,KAAK,EACtC,MAAiB,EACjB,MAAoC,EACD,EAAE;IACrC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;IAElC,MAAM,cAAc,GAClB,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACzB,MAAM,IAAI,GAAG,MAAM,yBAAyB,CAAC,KAAK,CAAC,CAAA;QACnD,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC,CAAC,CACH,CAAA;IAEH,MAAM,YAAY,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAA;IAEtD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAA;QAC3C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC5B,KAAK;YACL,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC,CAAA;IACL,CAAC,CAAC,CACH,CAAA;IAED,MAAM,WAAW,GAAG,IAAA,wBAAU,EAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEjE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC,CAAA;AAC5D,CAAC,CAAA;AA7BY,QAAA,mBAAmB,uBA6B/B"}
+{"version":3,"file":"load-current-cf-stacks.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/common/load-current-cf-stacks.ts"],"names":[],"mappings":";;;AAIA,sEAA2E;AAC3E,4DAAuD;AAEvD,oDAAiD;AAEjD,MAAM,yBAAyB,GAAG,KAAK,EACrC,KAAoB,EACH,EAAE;IACnB,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,EAAE,GAClD,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;IAE9B,OAAO,IAAA,kBAAQ,EACb,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACrE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,MAAoC,EACiB,EAAE;IACvD,MAAM,UAAU,GAAG,IAAA,mCAAa,EAAC,MAAM,CAAC,CAAA;IACxC,OAAO,MAAM,CAAC,CAAC,CAAC;SACb,uBAAuB,EAAE;SACzB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAA;AAC9D,CAAC,CAAA;AAOD,MAAM,iBAAiB,GAAG,CACxB,cAAsD,EACxB,EAAE;IAChC,MAAM,YAAY,GAAG,IAAI,GAAG,EAA2B,CAAA;IACvD,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SACnB;aAAM;YACL,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;SAChC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAEM,MAAM,mBAAmB,GAAG,KAAK,EACtC,MAAiB,EACjB,MAAoC,EACD,EAAE;IACrC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;IAElC,MAAM,cAAc,GAClB,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACzB,MAAM,IAAI,GAAG,MAAM,yBAAyB,CAAC,KAAK,CAAC,CAAA;QACnD,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC,CAAC,CACH,CAAA;IAEH,MAAM,YAAY,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAA;IAEtD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAA;QAC3C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC5B,KAAK;YACL,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC,CAAA;IACL,CAAC,CAAC,CACH,CAAA;IAED,MAAM,WAAW,GAAG,IAAA,wBAAU,EAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEjE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC,CAAA;AAC5D,CAAC,CAAA;AA7BY,QAAA,mBAAmB,uBA6B/B"}

package/dist/takomo-stacks-commands/stacks/common/states.d.ts

@@ -1,7 +1,7 @@
-import { StackEvent } from "../../../takomo-aws-model";
+import { StackEvent } from "../../../takomo-aws-model/cloudformation";
 import { CommandStatus } from "../../../takomo-core";
 import { InternalStack, StackOperationType } from "../../../takomo-stacks-model";
-import { Timer } from "../../../takomo-util";
+import { Timer } from "../../../utils/timer";
 import { StacksOperationListener } from "./model";
 import { StackOperationTransitions } from "./transitions";
 export interface InitialStackOperationState {

package/dist/takomo-stacks-commands/stacks/common/steps.js

@@ -49,10 +49,9 @@ const executeSteps = async (state) => {
     while (!result.completed) {
         result = await executeStep(logger, result.stepName, result.step, result.state);
     }
-    totalTimer.stop();
     await stacksOperationListener.onStackOperationComplete(stack, {
         ...result.props,
-        timer: totalTimer,
+        timer: totalTimer.stop(),
     });
     return { ...result.props, timer: totalTimer };
 };

package/dist/takomo-stacks-commands/stacks/common/steps.js.map

@@ -1 +1 @@
-{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/common/steps.ts"],"names":[],"mappings":";;;AAMA,MAAa,uBAAuB;IAIlC,YAAY,KAAmC;QAHtC,cAAS,GAAG,IAAI,CAAA;QAIvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;CACF;AAPD,0DAOC;AAQD,MAAa,wBAAwB;IAMnC,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAoC;QAL9D,cAAS,GAAG,KAAK,CAAA;QAMxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;CACF;AAXD,4DAWC;AAQD,MAAM,WAAW,GAAG,KAAK,EACvB,MAAiB,EACjB,QAAgB,EAChB,IAA2B,EAC3B,KAAQ,EACa,EAAE;IACvB,MAAM,CAAC,KAAK,CAAC,eAAe,QAAQ,GAAG,CAAC,CAAA;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IACnD,IAAI;QACF,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,CAAA;KACzB;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,4BAA4B,QAAQ,IAAI,EAAE,KAAK,CAAC,CAAA;QAC7D,OAAO,IAAI,uBAAuB,CAAC;YACjC,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,2BAA2B,EAAE,KAAK,CAAC,2BAA2B;YAC9D,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,OAAO,EAAE,OAAO;YAChB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,KAAK;YACd,KAAK;SACN,CAAC,CAAA;KACH;YAAS;QACR,KAAK,CAAC,IAAI,EAAE,CAAA;QACZ,MAAM,CAAC,KAAK,CACV,SAAS,QAAQ,kBAAkB,KAAK,CAAC,uBAAuB,EAAE,EAAE,CACrE,CAAA;KACF;AACH,CAAC,CAAA;AAEM,MAAM,YAAY,GAAG,KAAK,EAC/B,KAAiC,EACX,EAAE;IACxB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,uBAAuB,EAAE,GAAG,KAAK,CAAA;IACzE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;IAE3B,MAAM,uBAAuB,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAA;IAE1D,IAAI,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC3C,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE;QACxB,MAAM,GAAG,MAAM,WAAW,CACxB,MAAM,EACN,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,KAAK,CACb,CAAA;KACF;IAED,UAAU,CAAC,IAAI,EAAE,CAAA;IAEjB,MAAM,uBAAuB,CAAC,wBAAwB,CAAC,KAAK,EAAE;QAC5D,GAAG,MAAM,CAAC,KAAK;QACf,KAAK,EAAE,UAAU;KAClB,CAAC,CAAA;IAEF,OAAO,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;AAC/C,CAAC,CAAA;AA1BY,QAAA,YAAY,gBA0BxB"}
+{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/common/steps.ts"],"names":[],"mappings":";;;AAMA,MAAa,uBAAuB;IAIlC,YAAY,KAAmC;QAHtC,cAAS,GAAG,IAAI,CAAA;QAIvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;CACF;AAPD,0DAOC;AAQD,MAAa,wBAAwB;IAMnC,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAoC;QAL9D,cAAS,GAAG,KAAK,CAAA;QAMxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;CACF;AAXD,4DAWC;AAQD,MAAM,WAAW,GAAG,KAAK,EACvB,MAAiB,EACjB,QAAgB,EAChB,IAA2B,EAC3B,KAAQ,EACa,EAAE;IACvB,MAAM,CAAC,KAAK,CAAC,eAAe,QAAQ,GAAG,CAAC,CAAA;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IACnD,IAAI;QACF,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,CAAA;KACzB;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,4BAA4B,QAAQ,IAAI,EAAE,KAAK,CAAC,CAAA;QAC7D,OAAO,IAAI,uBAAuB,CAAC;YACjC,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,2BAA2B,EAAE,KAAK,CAAC,2BAA2B;YAC9D,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,OAAO,EAAE,OAAO;YAChB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,KAAK;YACd,KAAK;SACN,CAAC,CAAA;KACH;YAAS;QACR,KAAK,CAAC,IAAI,EAAE,CAAA;QACZ,MAAM,CAAC,KAAK,CACV,SAAS,QAAQ,kBAAkB,KAAK,CAAC,uBAAuB,EAAE,EAAE,CACrE,CAAA;KACF;AACH,CAAC,CAAA;AAEM,MAAM,YAAY,GAAG,KAAK,EAC/B,KAAiC,EACX,EAAE;IACxB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,uBAAuB,EAAE,GAAG,KAAK,CAAA;IACzE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;IAE3B,MAAM,uBAAuB,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAA;IAE1D,IAAI,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC3C,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE;QACxB,MAAM,GAAG,MAAM,WAAW,CACxB,MAAM,EACN,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,KAAK,CACb,CAAA;KACF;IAED,MAAM,uBAAuB,CAAC,wBAAwB,CAAC,KAAK,EAAE;QAC5D,GAAG,MAAM,CAAC,KAAK;QACf,KAAK,EAAE,UAAU,CAAC,IAAI,EAAE;KACzB,CAAC,CAAA;IAEF,OAAO,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;AAC/C,CAAC,CAAA;AAxBY,QAAA,YAAY,gBAwBxB"}

package/dist/takomo-stacks-commands/stacks/deploy/command.js

@@ -7,7 +7,7 @@ exports.deployStacksCommand = void 0;
 const joi_1 = __importDefault(require("joi"));
 const takomo_stacks_context_1 = require("../../../takomo-stacks-context");
 const takomo_stacks_schema_1 = require("../../../takomo-stacks-schema");
-const takomo_util_1 = require("../../../takomo-util");
+const validation_1 = require("../../../utils/validation");
 const execute_deploy_context_1 = require("./execute-deploy-context");
 const plan_1 = require("./plan");
 const validate_1 = require("./validate");
@@ -33,7 +33,7 @@ const inputSchema = (ctx) => {
         commandPath: commandPath.required(),
     }).unknown(true);
 };
-const deployStacksCommand = ({ credentialManager, ctx, input, configRepository, io, }) => (0, takomo_util_1.validateInput)(inputSchema(ctx), input)
+const deployStacksCommand = ({ credentialManager, ctx, input, configRepository, io, }) => (0, validation_1.validateInput)(inputSchema(ctx), input)
     .then((input) => (0, takomo_stacks_context_1.buildStacksContext)({
     ctx,
     configRepository,

package/dist/takomo-stacks-commands/stacks/deploy/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAoC;AAEpC,0EAGuC;AAEvC,wEAAmE;AACnE,sDAAoD;AAEpD,qEAA+D;AAE/D,iCAA8C;AAC9C,yCAAqD;AAErD,MAAM,WAAW,GAAG,KAAK,EACvB,KAAiC,EACjC,GAA0B,EAC1B,EAAkB,EACmB,EAAE;IACvC,IAAI,KAAK,CAAC,WAAW,EAAE;QACrB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAClE,OAAO;YACL,GAAG,KAAK;YACR,WAAW;SACZ,CAAA;KACF;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,KAAK,EACxB,GAA0B,EAC1B,gBAAwC,EACxC,EAAkB,EAClB,KAAiC,EACD,EAAE;IAClC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;IAEvD,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAqB,EACtC,GAAG,CAAC,MAAM,EACV,aAAa,CAAC,WAAW,EACzB,aAAa,CAAC,kBAAkB,EAChC,EAAE,CACH,CAAA;IAED,MAAM,IAAA,mCAAwB,EAAC,IAAI,CAAC,CAAA;IAEpC,OAAO,IAAA,6CAAoB,EAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAA;AAC7E,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,GAAmB,EAAa,EAAE;IACrD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,0CAAmB,EAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IACrE,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;KACpC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAEM,MAAM,mBAAmB,GAK5B,CAAC,EACH,iBAAiB,EACjB,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,EAAE,GACH,EAAkC,EAAE,CACnC,IAAA,2BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC;KACnC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACd,IAAA,0CAAkB,EAAC;IACjB,GAAG;IACH,gBAAgB;IAChB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW;IAC9D,MAAM,EAAE,EAAE;IACV,iBAAiB;IACjB,oBAAoB,EAAE,KAAK;CAC5B,CAAC,CACH;KACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;KAC7D,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AAxBZ,QAAA,mBAAmB,uBAwBP"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAoC;AAEpC,0EAGuC;AAEvC,wEAAmE;AACnE,0DAAyD;AAEzD,qEAA+D;AAE/D,iCAA8C;AAC9C,yCAAqD;AAErD,MAAM,WAAW,GAAG,KAAK,EACvB,KAAiC,EACjC,GAA0B,EAC1B,EAAkB,EACmB,EAAE;IACvC,IAAI,KAAK,CAAC,WAAW,EAAE;QACrB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAClE,OAAO;YACL,GAAG,KAAK;YACR,WAAW;SACZ,CAAA;KACF;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,KAAK,EACxB,GAA0B,EAC1B,gBAAwC,EACxC,EAAkB,EAClB,KAAiC,EACD,EAAE;IAClC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;IAEvD,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAqB,EACtC,GAAG,CAAC,MAAM,EACV,aAAa,CAAC,WAAW,EACzB,aAAa,CAAC,kBAAkB,EAChC,EAAE,CACH,CAAA;IAED,MAAM,IAAA,mCAAwB,EAAC,IAAI,CAAC,CAAA;IAEpC,OAAO,IAAA,6CAAoB,EAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAA;AAC7E,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,GAAmB,EAAa,EAAE;IACrD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,0CAAmB,EAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IACrE,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;KACpC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAEM,MAAM,mBAAmB,GAK5B,CAAC,EACH,iBAAiB,EACjB,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,EAAE,GACH,EAAkC,EAAE,CACnC,IAAA,0BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC;KACnC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACd,IAAA,0CAAkB,EAAC;IACjB,GAAG;IACH,gBAAgB;IAChB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW;IAC9D,MAAM,EAAE,EAAE;IACV,iBAAiB;IACjB,oBAAoB,EAAE,KAAK;CAC5B,CAAC,CACH;KACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;KAC7D,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AAxBZ,QAAA,mBAAmB,uBAwBP"}

package/dist/takomo-stacks-commands/stacks/deploy/deploy-stack.d.ts

@@ -1,7 +1,7 @@
 import { CloudFormationStackSummary } from "../../../takomo-aws-model";
 import { StacksConfigRepository } from "../../../takomo-stacks-context";
 import { InternalStack, InternalStacksContext, StackOperationType, StackResult } from "../../../takomo-stacks-model";
-import { Timer } from "../../../takomo-util";
+import { Timer } from "../../../utils/timer";
 import { StacksOperationListener } from "../common/model";
 import { DeployStacksIO, DeployState } from "./model";
 export declare const deployStack: (timer: Timer, ctx: InternalStacksContext, io: DeployStacksIO, state: DeployState, stack: InternalStack, dependencies: Promise<StackResult>[], operationType: StackOperationType, configRepository: StacksConfigRepository, stacksOperationListener: StacksOperationListener, expectNoChanges: boolean, currentStack?: CloudFormationStackSummary) => Promise<StackResult>;

package/dist/takomo-stacks-commands/stacks/deploy/deploy-stack.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-stack.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/deploy-stack.ts"],"names":[],"mappings":";;;AAUA,2CAA8C;AAG9C,+CAA4D;AAE5D,MAAM,cAAc,GAAG,CACrB,MAAiB,EACjB,KAAoB,EACpB,gCAAyC,EACnC,EAAE;IACR,MAAM,QAAQ,GAAG,gCAAgC;QAC/C,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK;QACb,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;AAC5D,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,KAAK,EAC9B,KAAY,EACZ,GAA0B,EAC1B,EAAkB,EAClB,KAAkB,EAClB,KAAoB,EACpB,YAAoC,EACpC,aAAiC,EACjC,gBAAwC,EACxC,uBAAgD,EAChD,eAAwB,EACxB,YAAyC,EACnB,EAAE;IACxB,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEzC,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,IAAI,CAAC,iBAAiB,YAAY,CAAC,MAAM,EAAE,CAAC,CAAA;KACpD;SAAM;QACL,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;KACrC;IAED,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAEnE,MAAM,SAAS,GAAG;QAChB,GAAG,GAAG,CAAC,SAAS;QAChB,KAAK,EAAE,EAAE;KACV,CAAA;IAED,MAAM,YAAY,GAA4B;QAC5C,EAAE;QACF,KAAK;QACL,SAAS;QACT,MAAM;QACN,YAAY;QACZ,aAAa;QACb,KAAK;QACL,YAAY;QACZ,GAAG;QACH,gBAAgB;QAChB,uBAAuB;QACvB,eAAe;QACf,2BAA2B,EAAE,YAAY,KAAK,SAAS;QACvD,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QACxC,WAAW,EAAE,IAAA,0CAA4B,GAAE;KAC5C,CAAA;IAED,OAAO,IAAA,oBAAY,EAAC,YAAY,CAAC,CAAA;AACnC,CAAC,CAAA;AA/CY,QAAA,WAAW,eA+CvB"}
+{"version":3,"file":"deploy-stack.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/deploy-stack.ts"],"names":[],"mappings":";;;AAWA,2CAA8C;AAG9C,+CAA4D;AAE5D,MAAM,cAAc,GAAG,CACrB,MAAiB,EACjB,KAAoB,EACpB,gCAAyC,EACnC,EAAE;IACR,MAAM,QAAQ,GAAG,gCAAgC;QAC/C,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK;QACb,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;AAC5D,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,KAAK,EAC9B,KAAY,EACZ,GAA0B,EAC1B,EAAkB,EAClB,KAAkB,EAClB,KAAoB,EACpB,YAAoC,EACpC,aAAiC,EACjC,gBAAwC,EACxC,uBAAgD,EAChD,eAAwB,EACxB,YAAyC,EACnB,EAAE;IACxB,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEzC,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,IAAI,CAAC,iBAAiB,YAAY,CAAC,MAAM,EAAE,CAAC,CAAA;KACpD;SAAM;QACL,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;KACrC;IAED,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAEnE,MAAM,SAAS,GAAG;QAChB,GAAG,GAAG,CAAC,SAAS;QAChB,KAAK,EAAE,EAAE;KACV,CAAA;IAED,MAAM,YAAY,GAA4B;QAC5C,EAAE;QACF,KAAK;QACL,SAAS;QACT,MAAM;QACN,YAAY;QACZ,aAAa;QACb,KAAK;QACL,YAAY;QACZ,GAAG;QACH,gBAAgB;QAChB,uBAAuB;QACvB,eAAe;QACf,2BAA2B,EAAE,YAAY,KAAK,SAAS;QACvD,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QACxC,WAAW,EAAE,IAAA,0CAA4B,GAAE;KAC5C,CAAA;IAED,OAAO,IAAA,oBAAY,EAAC,YAAY,CAAC,CAAA;AACnC,CAAC,CAAA;AA/CY,QAAA,WAAW,eA+CvB"}

package/dist/takomo-stacks-commands/stacks/deploy/errors.d.ts

@@ -1,5 +1,5 @@
 import { InternalStack } from "../../../takomo-stacks-model";
-import { TakomoError } from "../../../takomo-util";
+import { TakomoError } from "../../../utils/errors";
 export declare class IncompatibleIgnoreDependenciesOptionOnLaunchError extends TakomoError {
     constructor(stacks: ReadonlyArray<InternalStack>);
 }

package/dist/takomo-stacks-commands/stacks/deploy/errors.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IncompatibleIgnoreDependenciesOptionOnLaunchError = void 0;
-const takomo_util_1 = require("../../../takomo-util");
-class IncompatibleIgnoreDependenciesOptionOnLaunchError extends takomo_util_1.TakomoError {
+const errors_1 = require("../../../utils/errors");
+class IncompatibleIgnoreDependenciesOptionOnLaunchError extends errors_1.TakomoError {
     constructor(stacks) {
         const stackPaths = stacks.map((s) => `  - ${s.path}`).join("\n");
         super("Incompatible option --ignore-dependencies. Expected exactly " +

package/dist/takomo-stacks-commands/stacks/deploy/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/errors.ts"],"names":[],"mappings":";;;AACA,sDAAkD;AAElD,MAAa,iDAAkD,SAAQ,yBAAW;IAChF,YAAY,MAAoC;QAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEhE,KAAK,CACH,8DAA8D;YAC5D,oCAAoC,MAAM,CAAC,MAAM,qCAAqC,UAAU,EAAE,EACpG;YACE,IAAI,EAAE,wFAAwF;YAC9F,YAAY,EAAE;gBACZ,oGAAoG;aACrG;SACF,CACF,CAAA;IACH,CAAC;CACF;AAfD,8GAeC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/errors.ts"],"names":[],"mappings":";;;AACA,kDAAmD;AAEnD,MAAa,iDAAkD,SAAQ,oBAAW;IAChF,YAAY,MAAoC;QAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEhE,KAAK,CACH,8DAA8D;YAC5D,oCAAoC,MAAM,CAAC,MAAM,qCAAqC,UAAU,EAAE,EACpG;YACE,IAAI,EAAE,wFAAwF;YAC9F,YAAY,EAAE;gBACZ,oGAAoG;aACrG;SACF,CACF,CAAA;IACH,CAAC;CACF;AAfD,8GAeC"}

package/dist/takomo-stacks-commands/stacks/deploy/execute-deploy-context.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeDeployContext = void 0;
 const cockatiel_1 = require("cockatiel");
 const takomo_core_1 = require("../../../takomo-core");
-const takomo_util_1 = require("../../../takomo-util");
 const deploy_stack_1 = require("./deploy-stack");
 const errors_1 = require("./errors");
 const confirmDeploy = async (autoConfirm, plan, io) => {
@@ -30,12 +29,11 @@ const executeStacksInParallel = async (ctx, io, state, timer, operations, ignore
         return executions;
     }, map);
     const results = await Promise.all(Array.from(executions.values()));
-    timer.stop();
     return {
         ...(0, takomo_core_1.resolveCommandOutputBase)(results),
         outputFormat,
         results,
-        timer,
+        timer: timer.stop(),
     };
 };
 const executeDeployContext = async (ctx, input, io, plan, configRepository) => {
@@ -49,14 +47,13 @@ const executeDeployContext = async (ctx, input, io, plan, configRepository) => {
     const state = { cancelled: false, autoConfirm };
     const confirmAnswer = await confirmDeploy(autoConfirm, plan, io);
     if (confirmAnswer === "CANCEL") {
-        timer.stop();
         return {
             outputFormat: input.outputFormat,
             success: false,
             results: [],
             status: "CANCELLED",
             message: "Cancelled",
-            timer,
+            timer: timer.stop(),
         };
     }
     if (confirmAnswer === "CONTINUE_NO_REVIEW") {
@@ -74,11 +71,9 @@ const executeDeployContext = async (ctx, input, io, plan, configRepository) => {
             ? []
             : stack.dependencies.map((d) => Promise.resolve(executions.get(d)));
         if (state.cancelled) {
-            const t = (0, takomo_util_1.createTimer)("deploy");
-            t.stop();
             executions.set(stack.path, {
                 status: "CANCELLED",
-                timer: t,
+                timer: timer.startChild("deploy").stop(),
                 stack,
                 success: false,
                 events: [],
@@ -102,12 +97,11 @@ const executeDeployContext = async (ctx, input, io, plan, configRepository) => {
         }
     }
     const results = Array.from(executions.values());
-    timer.stop();
     return {
         ...(0, takomo_core_1.resolveCommandOutputBase)(results),
         outputFormat: input.outputFormat,
         results,
-        timer,
+        timer: timer.stop(),
     };
 };
 exports.executeDeployContext = executeDeployContext;

package/dist/takomo-stacks-commands/stacks/deploy/execute-deploy-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute-deploy-context.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/execute-deploy-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execute-deploy-context.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/execute-deploy-context.ts"],"names":[],"mappings":"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"}

package/dist/takomo-stacks-commands/stacks/deploy/model.d.ts

@@ -1,5 +1,6 @@
 import { AnySchema } from "joi";
-import { DetailedChangeSet, DetailedCloudFormationStack, StackEvent, StackParameterKey, StackParameterValue, TagKey, TagValue, TemplateBody, TemplateSummary } from "../../../takomo-aws-model";
+import { DetailedChangeSet, DetailedCloudFormationStack, StackParameterKey, StackParameterValue, TagKey, TagValue, TemplateBody, TemplateSummary } from "../../../takomo-aws-model";
+import { StackEvent } from "../../../takomo-aws-model/cloudformation";
 import { IO } from "../../../takomo-core";
 import { CommandPath, InternalStack, StackGroup, StackOperationType, StackPath } from "../../../takomo-stacks-model";
 import { StacksOperationOutput } from "../../model";

package/dist/takomo-stacks-commands/stacks/deploy/plan.d.ts

@@ -1,6 +1,6 @@
 import { CloudFormationStackSummary, StackStatus } from "../../../takomo-aws-model";
 import { CommandPath, InternalStack, StackOperationType, StackPath } from "../../../takomo-stacks-model";
-import { TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
 /**
  * TODO: Move somewhere else
  */

package/dist/takomo-stacks-commands/stacks/deploy/plan.js

@@ -7,7 +7,7 @@ exports.buildStacksDeployPlan = exports.resolveOperationType = exports.collectSt
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_stacks_context_1 = require("../../../takomo-stacks-context");
 const takomo_stacks_model_1 = require("../../../takomo-stacks-model");
-const takomo_util_1 = require("../../../takomo-util");
+const collections_1 = require("../../../utils/collections");
 const load_current_cf_stacks_1 = require("../common/load-current-cf-stacks");
 /**
  * TODO: Move somewhere else
@@ -51,7 +51,7 @@ const convertToOperation = ({ stack, current, }) => ({
     currentStack: current,
 });
 const buildStacksDeployPlan = async (stacks, commandPath, ignoreDependencies, logger) => {
-    const stacksByPath = (0, takomo_util_1.arrayToMap)(stacks, takomo_stacks_model_1.getStackPath);
+    const stacksByPath = (0, collections_1.arrayToMap)(stacks, takomo_stacks_model_1.getStackPath);
     const stacksToDeploy = stacks
         .filter((s) => (0, takomo_stacks_model_1.isWithinCommandPath)(s.path, commandPath))
         .reduce((collected, stack) => ramda_1.default.uniq([

package/dist/takomo-stacks-commands/stacks/deploy/plan.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/plan.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAKrB,0EAAoE;AACpE,sEAQqC;AACrC,sDAA4D;AAC5D,6EAGyC;AAEzC;;GAEG;AACI,MAAM,wBAAwB,GAAG,CACtC,YAA2C,EAC3C,KAAoB,EACM,EAAE,CAC5B,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;IAClD,MAAM,eAAe,GAAG,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACpD,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,UAAU,YAAY,CAAC,CAAA;KACrE;IAED,OAAO,eAAC,CAAC,IAAI,CAAC;QACZ,UAAU;QACV,GAAG,SAAS;QACZ,GAAG,IAAA,gCAAwB,EAAC,YAAY,EAAE,eAAe,CAAC;KAC3D,CAAC,CAAA;AACJ,CAAC,EAAE,IAAI,KAAK,EAAa,CAAC,CAAA;AAff,QAAA,wBAAwB,4BAeT;AAYrB,MAAM,oBAAoB,GAAG,CAClC,MAAoB,EACA,EAAE;IACtB,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,QAAQ,CAAA;KAChB;IAED,QAAQ,MAAM,EAAE;QACd,KAAK,iBAAiB,CAAC;QACvB,KAAK,iBAAiB,CAAC;QACvB,KAAK,0BAA0B,CAAC;QAChC,KAAK,wBAAwB,CAAC;QAC9B,KAAK,iBAAiB;YACpB,OAAO,QAAQ,CAAA;QACjB,KAAK,eAAe,CAAC;QACrB,KAAK,mBAAmB,CAAC;QACzB,KAAK,iBAAiB,CAAC;QACvB,KAAK,oBAAoB;YACvB,OAAO,UAAU,CAAA;QACnB;YACE,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,EAAE,CAAC,CAAA;KACzD;AACH,CAAC,CAAA;AAtBY,QAAA,oBAAoB,wBAsBhC;AAED,MAAM,kBAAkB,GAAG,CAAC,EAC1B,KAAK,EACL,OAAO,GACG,EAAwB,EAAE,CAAC,CAAC;IACtC,KAAK;IACL,IAAI,EAAE,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,CAAC;IAC3C,YAAY,EAAE,OAAO;CACtB,CAAC,CAAA;AAEK,MAAM,qBAAqB,GAAG,KAAK,EACxC,MAAoC,EACpC,WAAwB,EACxB,kBAA2B,EAC3B,MAAiB,EACU,EAAE;IAC7B,MAAM,YAAY,GAAG,IAAA,wBAAU,EAAC,MAAM,EAAE,kCAAY,CAAC,CAAA;IACrD,MAAM,cAAc,GAAG,MAAM;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yCAAmB,EAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;SACvD,MAAM,CACL,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CACnB,eAAC,CAAC,IAAI,CAAC;QACL,KAAK,CAAC,IAAI;QACV,GAAG,SAAS;QACZ,GAAG,IAAA,gCAAwB,EAAC,YAAY,EAAE,KAAK,CAAC;KACjD,CAAC,EACJ,IAAI,KAAK,EAAa,CACvB;SACA,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;SAChD,MAAM,CAAC,mCAAa,CAAC,CAAA;IAExB,MAAM,YAAY,GAAG,IAAA,2CAAmB,EAAC,cAAc,CAAC,CAAA;IACxD,MAAM,UAAU,GAAG,MAAM,IAAA,4CAAmB,EAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAClE,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAErD,OAAO;QACL,UAAU,EAAE,kBAAkB;YAC5B,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yCAAmB,EAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC1E,CAAC,CAAC,UAAU;KACf,CAAA;AACH,CAAC,CAAA;AA9BY,QAAA,qBAAqB,yBA8BjC"}
+{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/plan.ts"],"names":[],"mappings":"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"}

package/dist/takomo-stacks-commands/stacks/deploy/states.d.ts

@@ -1,8 +1,9 @@
-import { ClientRequestToken, CloudFormationStackSummary, DetailedChangeSet, DetailedCloudFormationStack, StackEvent, StackId, TemplateBody, TemplateSummary } from "../../../takomo-aws-model";
+import { ClientRequestToken, CloudFormationStack, CloudFormationStackSummary, DetailedChangeSet, DetailedCloudFormationStack, StackId, TemplateBody, TemplateSummary } from "../../../takomo-aws-model";
+import { StackEvent } from "../../../takomo-aws-model/cloudformation";
 import { CommandStatus } from "../../../takomo-core";
 import { StacksConfigRepository } from "../../../takomo-stacks-context";
 import { InternalStacksContext, StackOperationType, StackOperationVariables, StackResult } from "../../../takomo-stacks-model";
-import { TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
 import { InitialStackOperationState } from "../common/states";
 import { DeployStacksIO, DeployState, StackParameterInfo, StackTagInfo } from "./model";
 import { DeployStackTransitions } from "./transitions";
@@ -67,5 +68,6 @@ export interface StackOperationResultHolder extends InitialDeployStackState {
     readonly success: boolean;
     readonly status: CommandStatus;
     readonly events: ReadonlyArray<StackEvent>;
+    readonly stackAfterOperation?: CloudFormationStack;
     readonly error?: Error;
 }

package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-change-set-create.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initiateChangeSetCreate = exports.resolveChangeSetType = void 0;
 const takomo_stacks_model_1 = require("../../../../takomo-stacks-model");
-const takomo_util_1 = require("../../../../takomo-util");
+const strings_1 = require("../../../../utils/strings");
 const resolveChangeSetType = (type) => {
     switch (type) {
         case "UPDATE":
@@ -17,7 +17,7 @@ const resolveChangeSetType = (type) => {
 exports.resolveChangeSetType = resolveChangeSetType;
 const initiateChangeSetCreate = async (state) => {
     const { stack, operationType, templateS3Url, templateBody, parameters, tags, logger, transitions, } = state;
-    const clientToken = (0, takomo_util_1.uuid)();
+    const clientToken = (0, strings_1.uuid)();
     const changeSetName = `change-${clientToken}`;
     const changeSetType = (0, exports.resolveChangeSetType)(operationType);
     const templateLocation = templateS3Url || templateBody;