takomo 5.0.0 → 5.2.0

package/dist/takomo-deployment-targets-commands/common/plan/select-deployment-groups.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.selectDeploymentGroups = void 0;
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_config_sets_1 = require("../../../takomo-config-sets");
-const takomo_util_1 = require("../../../takomo-util");
+const collections_1 = require("../../../utils/collections");
+const errors_1 = require("../../../utils/errors");
 const create_deployment_target_name_pattern_matcher_1 = require("./create-deployment-target-name-pattern-matcher");
 const sortGroups = (a, b) => {
     const order = a.priority - b.priority;
@@ -17,23 +18,23 @@ const selectDeploymentGroups = (ctx, props) => {
     if (groups.length > 0) {
         groups.forEach((groupPath) => {
             if (!ctx.hasDeploymentGroup(groupPath)) {
-                throw new takomo_util_1.TakomoError(`Deployment group '${groupPath}' not found`);
+                throw new errors_1.TakomoError(`Deployment group '${groupPath}' not found`);
             }
         });
     }
     if (commandPath && !configSetName) {
-        throw new takomo_util_1.TakomoError("If you provide command path, you must provide config set, too");
+        throw new errors_1.TakomoError("If you provide command path, you must provide config set, too");
     }
     if (configSetName) {
         if (!ctx.hasConfigSet(configSetName)) {
-            throw new takomo_util_1.TakomoError(`Config set '${configSetName}' not found`);
+            throw new errors_1.TakomoError(`Config set '${configSetName}' not found`);
         }
     }
     const rootGroups = groups.length === 0
         ? ctx.rootDeploymentGroups
         : groups.reduce((collected, path) => [...collected, ctx.getDeploymentGroup(path)], new Array());
     const flattenedGroups = rootGroups
-        .map((group) => (0, takomo_util_1.collectFromHierarchy)(group, (o) => o.children, {
+        .map((group) => (0, collections_1.collectFromHierarchy)(group, (o) => o.children, {
         sortSiblings: sortGroups,
         filter: (o) => o.status === "active",
     }))

package/dist/takomo-deployment-targets-commands/common/plan/select-deployment-groups.js.map

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

package/dist/takomo-deployment-targets-commands/operation/command.js

@@ -5,17 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploymentTargetsOperationCommand = void 0;
 const joi_1 = __importDefault(require("joi"));
-const takomo_config_sets_1 = require("../../takomo-config-sets");
+const config_sets_schema_1 = require("../../schema/config-sets-schema");
+const deployment_targets_schema_1 = require("../../schema/deployment-targets-schema");
+const stacks_schema_1 = require("../../schema/stacks-schema");
 const takomo_core_1 = require("../../takomo-core");
 const takomo_deployment_targets_context_1 = require("../../takomo-deployment-targets-context");
-const takomo_deployment_targets_schema_1 = require("../../takomo-deployment-targets-schema");
-const takomo_stacks_schema_1 = require("../../takomo-stacks-schema");
-const takomo_util_1 = require("../../takomo-util");
+const validation_1 = require("../../utils/validation");
 const plan_1 = require("./plan");
 const inputSchema = (regions) => {
-    const { commandPath } = (0, takomo_stacks_schema_1.createStacksSchemas)({ regions });
-    const { configSetName } = (0, takomo_config_sets_1.createConfigSetsSchemas)({ regions });
-    const { deploymentGroupPath, deploymentTargetNamePattern, label } = (0, takomo_deployment_targets_schema_1.createDeploymentTargetsSchemas)({ regions });
+    const { commandPath } = (0, stacks_schema_1.createStacksSchemas)({ regions });
+    const { configSetName } = (0, config_sets_schema_1.createConfigSetsSchemas)({ regions });
+    const { deploymentGroupPath, deploymentTargetNamePattern, label } = (0, deployment_targets_schema_1.createDeploymentTargetsSchemas)({ regions });
     return joi_1.default.object({
         groups: joi_1.default.array().items(deploymentGroupPath).unique(),
         targets: joi_1.default.array().items(deploymentTargetNamePattern).unique(),
@@ -37,7 +37,7 @@ const validateFeatureFlags = (ctx, input) => {
         throw new takomo_core_1.FeatureDisabledError("deploymentTargetsTearDown");
     }
 };
-const deploymentTargetsOperationCommand = async ({ ctx, input, configRepository, io, credentialManager, }) => (0, takomo_util_1.validateInput)(inputSchema(ctx.regions), input)
+const deploymentTargetsOperationCommand = async ({ ctx, input, configRepository, io, credentialManager, }) => (0, validation_1.validateInput)(inputSchema(ctx.regions), input)
     .then(() => {
     validateFeatureFlags(ctx, input);
     return (0, takomo_deployment_targets_context_1.createDeploymentTargetsContext)({

package/dist/takomo-deployment-targets-commands/operation/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAqB;AAErB,iEAAkE;AAClE,mDAI0B;AAC1B,+FAGgD;AAChD,6FAAuF;AACvF,qEAAgE;AAChE,mDAAiD;AAMjD,iCAAuC;AAEvC,MAAM,WAAW,GAAG,CAAC,OAA8B,EAAE,EAAE;IACrD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,0CAAmB,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IACxD,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,4CAAuB,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9D,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,KAAK,EAAE,GAC/D,IAAA,iEAA8B,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC7C,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE;QACvD,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,MAAM,EAAE;QAChE,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;QACzC,iBAAiB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,SAAS,EAAE,aAAa;QACxB,WAAW;KACZ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAC3B,GAA2B,EAC3B,KAAsC,EAChC,EAAE;IACR,IACE,KAAK,CAAC,SAAS,KAAK,UAAU;QAC9B,KAAK,CAAC,aAAa,KAAK,UAAU;QAClC,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,yBAAyB,EACrD;QACA,MAAM,IAAI,kCAAoB,CAAC,2BAA2B,CAAC,CAAA;KAC5D;IAED,IACE,KAAK,CAAC,SAAS,KAAK,UAAU;QAC9B,KAAK,CAAC,aAAa,KAAK,WAAW;QACnC,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,yBAAyB,EACrD;QACA,MAAM,IAAI,kCAAoB,CAAC,2BAA2B,CAAC,CAAA;KAC5D;AACH,CAAC,CAAA;AAEM,MAAM,iCAAiC,GAK1C,KAAK,EAAE,EACT,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,EAAE,EACF,iBAAiB,GAClB,EAA6C,EAAE,CAC9C,IAAA,2BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;KAC3C,IAAI,CAAC,GAAG,EAAE;IACT,oBAAoB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAChC,OAAO,IAAA,kEAA8B,EAAC;QACpC,GAAG;QACH,gBAAgB;QAChB,iBAAiB;QACjB,MAAM,EAAE,EAAE;KACX,CAAC,CAAA;AACJ,CAAC,CAAC;KACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACZ,IAAA,qBAAc,EAAC;IACb,GAAG;IACH,KAAK;IACL,EAAE;IACF,KAAK,EAAE,KAAK,CAAC,KAAK;CACnB,CAAC,CACH;KACA,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AA9BZ,QAAA,iCAAiC,qCA8BrB"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAqB;AACrB,wEAAyE;AACzE,sFAAuF;AACvF,8DAAgE;AAEhE,mDAI0B;AAC1B,+FAGgD;AAChD,uDAAsD;AAMtD,iCAAuC;AAEvC,MAAM,WAAW,GAAG,CAAC,OAA8B,EAAE,EAAE;IACrD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,mCAAmB,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IACxD,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,4CAAuB,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9D,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,KAAK,EAAE,GAC/D,IAAA,0DAA8B,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC7C,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE;QACvD,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,MAAM,EAAE;QAChE,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;QACzC,iBAAiB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,SAAS,EAAE,aAAa;QACxB,WAAW;KACZ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAC3B,GAA2B,EAC3B,KAAsC,EAChC,EAAE;IACR,IACE,KAAK,CAAC,SAAS,KAAK,UAAU;QAC9B,KAAK,CAAC,aAAa,KAAK,UAAU;QAClC,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,yBAAyB,EACrD;QACA,MAAM,IAAI,kCAAoB,CAAC,2BAA2B,CAAC,CAAA;KAC5D;IAED,IACE,KAAK,CAAC,SAAS,KAAK,UAAU;QAC9B,KAAK,CAAC,aAAa,KAAK,WAAW;QACnC,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,yBAAyB,EACrD;QACA,MAAM,IAAI,kCAAoB,CAAC,2BAA2B,CAAC,CAAA;KAC5D;AACH,CAAC,CAAA;AAEM,MAAM,iCAAiC,GAK1C,KAAK,EAAE,EACT,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,EAAE,EACF,iBAAiB,GAClB,EAA6C,EAAE,CAC9C,IAAA,0BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;KAC3C,IAAI,CAAC,GAAG,EAAE;IACT,oBAAoB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAChC,OAAO,IAAA,kEAA8B,EAAC;QACpC,GAAG;QACH,gBAAgB;QAChB,iBAAiB;QACjB,MAAM,EAAE,EAAE;KACX,CAAC,CAAA;AACJ,CAAC,CAAC;KACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACZ,IAAA,qBAAc,EAAC;IACb,GAAG;IACH,KAAK;IACL,EAAE;IACF,KAAK,EAAE,KAAK,CAAC,KAAK;CACnB,CAAC,CACH;KACA,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AA9BZ,QAAA,iCAAiC,qCA8BrB"}

package/dist/takomo-deployment-targets-commands/operation/confirm.js

@@ -10,14 +10,13 @@ const confirmOperation = async (holder) => {
     const answer = await io.confirmOperation(plan);
     switch (answer) {
         case "CANCEL":
-            timer.stop();
             return {
                 results: [],
                 outputFormat: input.outputFormat,
                 message: "Cancelled",
                 status: "CANCELLED",
                 success: false,
-                timer,
+                timer: timer.stop(),
             };
         case "CONTINUE_AND_REVIEW":
             return (0, execute_1.executeOperation)({

package/dist/takomo-deployment-targets-commands/operation/confirm.js.map

@@ -1 +1 @@
-{"version":3,"file":"confirm.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/confirm.ts"],"names":[],"mappings":";;;AAAA,uCAA4C;AAGrC,MAAM,gBAAgB,GAAG,KAAK,EACnC,MAAkB,EACyB,EAAE;IAC7C,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAE9C,IAAI,GAAG,CAAC,kBAAkB,EAAE;QAC1B,OAAO,IAAA,0BAAgB,EAAC,MAAM,CAAC,CAAA;KAChC;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAC9C,QAAQ,MAAM,EAAE;QACd,KAAK,QAAQ;YACX,KAAK,CAAC,IAAI,EAAE,CAAA;YACZ,OAAO;gBACL,OAAO,EAAE,EAAE;gBACX,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,OAAO,EAAE,WAAW;gBACpB,MAAM,EAAE,WAAW;gBACnB,OAAO,EAAE,KAAK;gBACd,KAAK;aACN,CAAA;QACH,KAAK,qBAAqB;YACxB,OAAO,IAAA,0BAAgB,EAAC;gBACtB,GAAG,MAAM;gBACT,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,EAAE;aACjD,CAAC,CAAA;QACJ,KAAK,oBAAoB;YACvB,OAAO,IAAA,0BAAgB,EAAC;gBACtB,GAAG,MAAM;gBACT,GAAG,EAAE;oBACH,GAAG,MAAM,CAAC,GAAG;oBACb,kBAAkB,EAAE,IAAI;oBACxB,cAAc,EAAE;wBACd,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc;wBAC5B,kBAAkB,EAAE,IAAI;qBACzB;iBACF;aACF,CAAC,CAAA;QACJ;YACE,MAAM,IAAI,KAAK,CAAC,mBAAmB,MAAM,GAAG,CAAC,CAAA;KAChD;AACH,CAAC,CAAA;AAzCY,QAAA,gBAAgB,oBAyC5B"}
+{"version":3,"file":"confirm.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/confirm.ts"],"names":[],"mappings":";;;AAAA,uCAA4C;AAGrC,MAAM,gBAAgB,GAAG,KAAK,EACnC,MAAkB,EACyB,EAAE;IAC7C,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAE9C,IAAI,GAAG,CAAC,kBAAkB,EAAE;QAC1B,OAAO,IAAA,0BAAgB,EAAC,MAAM,CAAC,CAAA;KAChC;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAC9C,QAAQ,MAAM,EAAE;QACd,KAAK,QAAQ;YACX,OAAO;gBACL,OAAO,EAAE,EAAE;gBACX,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,OAAO,EAAE,WAAW;gBACpB,MAAM,EAAE,WAAW;gBACnB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;aACpB,CAAA;QACH,KAAK,qBAAqB;YACxB,OAAO,IAAA,0BAAgB,EAAC;gBACtB,GAAG,MAAM;gBACT,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,EAAE;aACjD,CAAC,CAAA;QACJ,KAAK,oBAAoB;YACvB,OAAO,IAAA,0BAAgB,EAAC;gBACtB,GAAG,MAAM;gBACT,GAAG,EAAE;oBACH,GAAG,MAAM,CAAC,GAAG;oBACb,kBAAkB,EAAE,IAAI;oBACxB,cAAc,EAAE;wBACd,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc;wBAC5B,kBAAkB,EAAE,IAAI;qBACzB;iBACF;aACF,CAAC,CAAA;QACJ;YACE,MAAM,IAAI,KAAK,CAAC,mBAAmB,MAAM,GAAG,CAAC,CAAA;KAChD;AACH,CAAC,CAAA;AAxCY,QAAA,gBAAgB,oBAwC5B"}

package/dist/takomo-deployment-targets-commands/operation/create-deployment-target-variables.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDeploymentTargetVariables = void 0;
-const takomo_util_1 = require("../../takomo-util");
+const objects_1 = require("../../utils/objects");
 const createDeploymentTargetVariables = ({ ctx, target, }) => {
-    return (0, takomo_util_1.deepCopy)({
+    return (0, objects_1.deepCopy)({
         env: ctx.variables.env,
         var: target.vars,
         context: ctx.variables.context,

package/dist/takomo-deployment-targets-commands/operation/create-deployment-target-variables.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-deployment-target-variables.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/create-deployment-target-variables.ts"],"names":[],"mappings":";;;AAEA,mDAA4C;AAQrC,MAAM,+BAA+B,GAAG,CAAC,EAC9C,GAAG,EACH,MAAM,GAC+B,EAAO,EAAE;IAC9C,OAAO,IAAA,sBAAQ,EAAC;QACd,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG;QACtB,GAAG,EAAE,MAAM,CAAC,IAAI;QAChB,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,OAAO;QAC9B,MAAM,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,EAAE;YACf,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS;YAChC,eAAe,EAAE;gBACf,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI;gBACtC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI;aACvC;SACF;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AAjBY,QAAA,+BAA+B,mCAiB3C"}
+{"version":3,"file":"create-deployment-target-variables.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/create-deployment-target-variables.ts"],"names":[],"mappings":";;;AAEA,iDAA8C;AAQvC,MAAM,+BAA+B,GAAG,CAAC,EAC9C,GAAG,EACH,MAAM,GAC+B,EAAO,EAAE;IAC9C,OAAO,IAAA,kBAAQ,EAAC;QACd,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG;QACtB,GAAG,EAAE,MAAM,CAAC,IAAI;QAChB,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,OAAO;QAC9B,MAAM,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,EAAE;YACf,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS;YAChC,eAAe,EAAE;gBACf,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI;gBACtC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI;aACvC;SACF;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AAjBY,QAAA,+BAA+B,mCAiB3C"}

package/dist/takomo-deployment-targets-commands/operation/execute.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeOperation = void 0;
 const takomo_execution_plans_1 = require("../../takomo-execution-plans");
 const takomo_stacks_commands_1 = require("../../takomo-stacks-commands");
-const takomo_util_1 = require("../../takomo-util");
+const errors_1 = require("../../utils/errors");
 const create_deployment_target_variables_1 = require("./create-deployment-target-variables");
 const executeOperationInternal = async (operation, input, target, credentialManager, io, ctx, configRepository, logger, expectNoChanges, prune) => {
     switch (operation) {
@@ -37,10 +37,9 @@ const createExecutor = ({ outputFormat, configRepository, operation, ctx, io, ex
     return async ({ timer, logger, state, commandPath, configSet, target, defaultCredentialManager, }) => {
         if (state.failed) {
             logger.debug("Cancel operation");
-            timer.stop();
             return {
                 outputFormat,
-                timer,
+                timer: timer.stop(),
                 status: "CANCELLED",
                 message: "Cancelled",
                 success: false,
@@ -63,7 +62,7 @@ const createExecutor = ({ outputFormat, configRepository, operation, ctx, io, ex
             if (target.data.accountId) {
                 const identity = await credentialManager.getCallerIdentity();
                 if (identity.accountId !== target.data.accountId) {
-                    throw new takomo_util_1.TakomoError(`Current credentials belong to AWS account ${identity.accountId}, but the deployment target can be deployed only to account: ${target.data.accountId}`);
+                    throw new errors_1.TakomoError(`Current credentials belong to AWS account ${identity.accountId}, but the deployment target can be deployed only to account: ${target.data.accountId}`);
                 }
             }
             return await executeOperationInternal(operation, input, target.data, credentialManager, io, {

package/dist/takomo-deployment-targets-commands/operation/execute.js.map

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

package/dist/takomo-deployment-targets-commands/operation/model.d.ts

@@ -5,7 +5,8 @@ import { DeploymentGroupPath, DeploymentTargetNamePattern, Label } from "../../t
 import { ConfigSetExecutionPlan, ConfigSetPlanExecutionResult, ConfigSetTargetListener, CreateConfigSetTargetListenerProps } from "../../takomo-execution-plans";
 import { DeployStacksIO, StacksOperationOutput, UndeployStacksIO } from "../../takomo-stacks-commands";
 import { CommandPath, DeploymentOperation } from "../../takomo-stacks-model";
-import { Timer, TkmLogger } from "../../takomo-util";
+import { TkmLogger } from "../../utils/logging";
+import { Timer } from "../../utils/timer";
 import { PlannedDeploymentTarget } from "../common/plan/model";
 export declare type ConfirmOperationAnswer = "CANCEL" | "CONTINUE_AND_REVIEW" | "CONTINUE_NO_REVIEW";
 export declare type TargetsExecutionPlan = ConfigSetExecutionPlan<PlannedDeploymentTarget>;

package/dist/takomo-deployment-targets-commands/operation/plan.js

@@ -19,9 +19,8 @@ const planDeployment = async (holder) => {
         targetsSelectionCriteria: input,
     });
     if (plan.stages.length === 0) {
-        timer.stop();
         io.info("No targets to deploy");
-        return skippedResult(timer, input.outputFormat);
+        return skippedResult(timer.stop(), input.outputFormat);
     }
     return (0, confirm_1.confirmOperation)({
         ...holder,

package/dist/takomo-deployment-targets-commands/operation/plan.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/plan.ts"],"names":[],"mappings":";;;AAEA,wFAA8E;AAC9E,uCAA4C;AAG5C,MAAM,aAAa,GAAG,CACpB,KAAY,EACZ,YAA0B,EACQ,EAAE,CAAC,CAAC;IACtC,KAAK;IACL,YAAY;IACZ,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,sBAAsB;CAChC,CAAC,CAAA;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,MAAqB,EACsB,EAAE;IAC7C,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAExC,MAAM,IAAI,GAAG,MAAM,IAAA,+CAAmB,EAAC;QACrC,GAAG;QACH,MAAM,EAAE,EAAE;QACV,wBAAwB,EAAE,KAAK;KAChC,CAAC,CAAA;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,KAAK,CAAC,IAAI,EAAE,CAAA;QACZ,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QAC/B,OAAO,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAA;KAChD;IAED,OAAO,IAAA,0BAAgB,EAAC;QACtB,GAAG,MAAM;QACT,IAAI;KACL,CAAC,CAAA;AACJ,CAAC,CAAA;AArBY,QAAA,cAAc,kBAqB1B"}
+{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/plan.ts"],"names":[],"mappings":";;;AAEA,wFAA8E;AAC9E,uCAA4C;AAG5C,MAAM,aAAa,GAAG,CACpB,KAAY,EACZ,YAA0B,EACQ,EAAE,CAAC,CAAC;IACtC,KAAK;IACL,YAAY;IACZ,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,sBAAsB;CAChC,CAAC,CAAA;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,MAAqB,EACsB,EAAE;IAC7C,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;IAExC,MAAM,IAAI,GAAG,MAAM,IAAA,+CAAmB,EAAC;QACrC,GAAG;QACH,MAAM,EAAE,EAAE;QACV,wBAAwB,EAAE,KAAK;KAChC,CAAC,CAAA;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QAC/B,OAAO,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,YAAY,CAAC,CAAA;KACvD;IAED,OAAO,IAAA,0BAAgB,EAAC;QACtB,GAAG,MAAM;QACT,IAAI;KACL,CAAC,CAAA;AACJ,CAAC,CAAA;AApBY,QAAA,cAAc,kBAoB1B"}

package/dist/takomo-deployment-targets-commands/run/command.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploymentTargetsRunCommand = void 0;
 const joi_1 = __importDefault(require("joi"));
+const deployment_targets_schema_1 = require("../../schema/deployment-targets-schema");
 const takomo_deployment_targets_context_1 = require("../../takomo-deployment-targets-context");
-const takomo_deployment_targets_schema_1 = require("../../takomo-deployment-targets-schema");
-const takomo_util_1 = require("../../takomo-util");
+const validation_1 = require("../../utils/validation");
 const plan_1 = require("./plan");
 const inputSchema = (regions) => {
-    const { deploymentGroupPath, deploymentTargetNamePattern, label } = (0, takomo_deployment_targets_schema_1.createDeploymentTargetsSchemas)({ regions });
+    const { deploymentGroupPath, deploymentTargetNamePattern, label } = (0, deployment_targets_schema_1.createDeploymentTargetsSchemas)({ regions });
     return joi_1.default.object({
         groups: joi_1.default.array().items(deploymentGroupPath).unique(),
         targets: joi_1.default.array().items(deploymentTargetNamePattern).unique(),
@@ -18,7 +18,7 @@ const inputSchema = (regions) => {
         concurrentTargets: joi_1.default.number().min(1).max(50),
     }).unknown(true);
 };
-const deploymentTargetsRunCommand = async ({ ctx, input, configRepository, io, credentialManager, }) => (0, takomo_util_1.validateInput)(inputSchema(ctx.regions), input)
+const deploymentTargetsRunCommand = async ({ ctx, input, configRepository, io, credentialManager, }) => (0, validation_1.validateInput)(inputSchema(ctx.regions), input)
     .then(() => (0, takomo_deployment_targets_context_1.createDeploymentTargetsContext)({
     ctx,
     configRepository,

package/dist/takomo-deployment-targets-commands/run/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/run/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAqB;AAGrB,+FAGgD;AAChD,6FAAuF;AACvF,mDAAiD;AAMjD,iCAAgC;AAChC,MAAM,WAAW,GAAG,CAAC,OAA8B,EAAE,EAAE;IACrD,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,KAAK,EAAE,GAC/D,IAAA,iEAA8B,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC7C,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE;QACvD,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,MAAM,EAAE;QAChE,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;QACzC,iBAAiB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;KAC/C,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAEM,MAAM,2BAA2B,GAKpC,KAAK,EAAE,EACT,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,EAAE,EACF,iBAAiB,GAClB,EAAuC,EAAE,CACxC,IAAA,2BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;KAC3C,IAAI,CAAC,GAAG,EAAE,CACT,IAAA,kEAA8B,EAAC;IAC7B,GAAG;IACH,gBAAgB;IAChB,iBAAiB;IACjB,MAAM,EAAE,EAAE;CACX,CAAC,CACH;KACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACZ,IAAA,cAAO,EAAC;IACN,GAAG;IACH,KAAK;IACL,EAAE;CACH,CAAC,CACH;KACA,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AA5BZ,QAAA,2BAA2B,+BA4Bf"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/run/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAqB;AACrB,sFAAuF;AAGvF,+FAGgD;AAChD,uDAAsD;AAMtD,iCAAgC;AAChC,MAAM,WAAW,GAAG,CAAC,OAA8B,EAAE,EAAE;IACrD,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,KAAK,EAAE,GAC/D,IAAA,0DAA8B,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC7C,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE;QACvD,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,MAAM,EAAE;QAChE,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;QACzC,iBAAiB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;KAC/C,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAEM,MAAM,2BAA2B,GAKpC,KAAK,EAAE,EACT,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,EAAE,EACF,iBAAiB,GAClB,EAAuC,EAAE,CACxC,IAAA,0BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;KAC3C,IAAI,CAAC,GAAG,EAAE,CACT,IAAA,kEAA8B,EAAC;IAC7B,GAAG;IACH,gBAAgB;IAChB,iBAAiB;IACjB,MAAM,EAAE,EAAE;CACX,CAAC,CACH;KACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACZ,IAAA,cAAO,EAAC;IACN,GAAG;IACH,KAAK;IACL,EAAE;CACH,CAAC,CACH;KACA,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AA5BZ,QAAA,2BAA2B,+BA4Bf"}

package/dist/takomo-deployment-targets-commands/run/confirm.js

@@ -4,9 +4,8 @@ exports.confirmRun = void 0;
 const run_1 = require("./run");
 const confirmRun = async ({ ctx, input, io, plan, listener, }) => {
     if (!ctx.autoConfirmEnabled && !(await io.confirmRun(plan))) {
-        input.timer.stop();
         return {
-            timer: input.timer,
+            timer: input.timer.stop(),
             success: true,
             status: "CANCELLED",
             message: "Cancelled",

package/dist/takomo-deployment-targets-commands/run/confirm.js.map

@@ -1 +1 @@
-{"version":3,"file":"confirm.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/run/confirm.ts"],"names":[],"mappings":";;;AAQA,+BAA2B;AAUpB,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EACJ,QAAQ,GACQ,EAAuC,EAAE;IACzD,IAAI,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;QAC3D,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QAClB,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,WAAW;YACpB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,MAAM,EAAE,SAAS;SAClB,CAAA;KACF;IAED,OAAO,IAAA,SAAG,EAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAA;AAChD,CAAC,CAAA;AApBY,QAAA,UAAU,cAoBtB"}
+{"version":3,"file":"confirm.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/run/confirm.ts"],"names":[],"mappings":";;;AAQA,+BAA2B;AAUpB,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EACJ,QAAQ,GACQ,EAAuC,EAAE;IACzD,IAAI,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;QAC3D,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;YACzB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,WAAW;YACpB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,MAAM,EAAE,SAAS;SAClB,CAAA;KACF;IAED,OAAO,IAAA,SAAG,EAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAA;AAChD,CAAC,CAAA;AAnBY,QAAA,UAAU,cAmBtB"}

package/dist/takomo-deployment-targets-commands/run/model.d.ts

@@ -3,7 +3,7 @@ import { IamRoleArn, IamRoleName } from "../../takomo-aws-model";
 import { CommandInput, CommandOutput, CommandOutputBase, IO } from "../../takomo-core";
 import { DeploymentGroupConfig, DeploymentTargetConfig } from "../../takomo-deployment-targets-config";
 import { DeploymentGroupPath, DeploymentTargetName, DeploymentTargetNamePattern, Label } from "../../takomo-deployment-targets-model";
-import { Timer } from "../../takomo-util";
+import { Timer } from "../../utils/timer";
 import { DeploymentTargetsListener } from "../operation/model";
 export interface DeploymentTargetsRunInput extends CommandInput {
     readonly groups: ReadonlyArray<DeploymentGroupPath>;

package/dist/takomo-deployment-targets-commands/run/plan.js

@@ -5,7 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.planRun = void 0;
 const ramda_1 = __importDefault(require("ramda"));
-const takomo_util_1 = require("../../takomo-util");
+const collections_1 = require("../../utils/collections");
+const errors_1 = require("../../utils/errors");
 const create_deployment_target_name_pattern_matcher_1 = require("../common/plan/create-deployment-target-name-pattern-matcher");
 const confirm_1 = require("./confirm");
 const planRun = async ({ ctx, input, io, }) => {
@@ -13,7 +14,7 @@ const planRun = async ({ ctx, input, io, }) => {
     if (groups.length > 0) {
         groups.forEach((groupPath) => {
             if (!ctx.hasDeploymentGroup(groupPath)) {
-                throw new takomo_util_1.TakomoError(`Deployment group '${groupPath}' not found`);
+                throw new errors_1.TakomoError(`Deployment group '${groupPath}' not found`);
             }
         });
     }
@@ -27,7 +28,7 @@ const planRun = async ({ ctx, input, io, }) => {
         return order !== 0 ? order : a.name.localeCompare(b.name);
     };
     const groupsToLaunch = deploymentGroupsToLaunch
-        .map((ou) => (0, takomo_util_1.collectFromHierarchy)(ou, (o) => o.children, {
+        .map((ou) => (0, collections_1.collectFromHierarchy)(ou, (o) => o.children, {
         sortSiblings: sortGroups,
         filter: (o) => o.status === "active",
     }))
@@ -52,9 +53,8 @@ const planRun = async ({ ctx, input, io, }) => {
         .filter((ou) => ou.targets.length > 0);
     const selectedTargets = grs.map((g) => g.targets).flat();
     if (selectedTargets.length === 0) {
-        timer.stop();
         return {
-            timer,
+            timer: timer.stop(),
             success: true,
             status: "SKIPPED",
             message: "No targets",

package/dist/takomo-deployment-targets-commands/run/plan.js.map

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

package/dist/takomo-deployment-targets-commands/run/run.d.ts

@@ -1,7 +1,8 @@
 import { OperationState } from "../../takomo-core";
 import { DeploymentGroupConfig, DeploymentTargetConfig } from "../../takomo-deployment-targets-config";
 import { DeploymentTargetsContext } from "../../takomo-deployment-targets-context";
-import { Timer, TkmLogger } from "../../takomo-util";
+import { TkmLogger } from "../../utils/logging";
+import { Timer } from "../../utils/timer";
 import { DeploymentTargetsListener } from "../operation/model";
 import { DeploymentGroupRunResult, DeploymentTargetRunResult, DeploymentTargetsRunInput, DeploymentTargetsRunIO, DeploymentTargetsRunOutput, TargetsRunPlan } from "./model";
 export declare const processDeploymentTarget: (props: RunProps, group: DeploymentGroupConfig, target: DeploymentTargetConfig, timer: Timer, state: OperationState, logger: TkmLogger, mapArgs: unknown) => Promise<DeploymentTargetRunResult>;

package/dist/takomo-deployment-targets-commands/run/run.js

@@ -11,7 +11,8 @@ const ramda_1 = __importDefault(require("ramda"));
 const util_1 = require("util");
 const takomo_aws_clients_1 = require("../../takomo-aws-clients");
 const takomo_core_1 = require("../../takomo-core");
-const takomo_util_1 = require("../../takomo-util");
+const files_1 = require("../../utils/files");
+const yaml_1 = require("../../utils/yaml");
 const execP = (0, util_1.promisify)(child_process_1.exec);
 const getDeploymentRole = (currentIdentity, group, target, disableMapRole, roleName) => {
     if (disableMapRole) {
@@ -51,7 +52,7 @@ const captureValue = ({ captureAfterLine, captureLastLine, captureBeforeLine, },
         .join("");
 };
 const runJsMapFunction = async ({ ctx, mapCommand, group, target, logger, credentials, mapArgs, }) => {
-    const mapFunctionFullPath = (0, takomo_util_1.expandFilePath)(ctx.projectDir, mapCommand);
+    const mapFunctionFullPath = (0, files_1.expandFilePath)(ctx.projectDir, mapCommand);
     logger.debug(`Run map function from file: ${mapFunctionFullPath}`);
     // eslint-disable-next-line
     const mapperFn = require(mapFunctionFullPath);
@@ -105,7 +106,7 @@ const runReduceProcessCommand = async ({ credentials, ctx, reduceCommand, target
     return stdout;
 };
 const runJsReduceFunction = ({ credentials, ctx, reduceCommand, targetResults, }) => {
-    const fullReduceFunctionPath = (0, takomo_util_1.expandFilePath)(ctx.projectDir, reduceCommand);
+    const fullReduceFunctionPath = (0, files_1.expandFilePath)(ctx.projectDir, reduceCommand);
     // eslint-disable-next-line
     const reduceFn = require(fullReduceFunctionPath);
     return reduceFn({
@@ -137,13 +138,12 @@ const processDeploymentTarget = async (props, group, target, timer, state, logge
     const { ctx, input } = props;
     const { mapCommand } = input;
     if (state.failed) {
-        timer.stop();
         return {
             message: "Cancelled",
             status: "CANCELLED",
             success: false,
             name: target.name,
-            timer,
+            timer: timer.stop(),
         };
     }
     logger.info("Start run");
@@ -159,26 +159,24 @@ const processDeploymentTarget = async (props, group, target, timer, state, logge
             input,
             mapArgs,
         });
-        timer.stop();
         return {
             status: "SUCCESS",
             name: target.name,
             success: true,
             message: "Success",
+            timer: timer.stop(),
             value,
-            timer,
         };
     }
     catch (error) {
-        timer.stop();
         logger.error(`Map command failed for target '${target.name}'`, error);
         return {
             status: "FAILED",
             name: target.name,
             success: false,
             message: "Error",
+            timer: timer.stop(),
             error,
-            timer,
         };
     }
 };
@@ -198,12 +196,11 @@ const processDeploymentGroup = async (props, group, timer, state, listener, mapA
     const deploymentPolicy = cockatiel_1.Policy.bulkhead(concurrentTargets, 10000);
     const operations = group.targets.map((target) => convertToOperation(props, group, timer, state, target, results, deploymentPolicy, listener, mapArgs));
     await Promise.all(operations.map((o) => o()));
-    timer.stop();
     return {
         ...(0, takomo_core_1.resolveCommandOutputBase)(results),
         results,
         path: group.path,
-        timer,
+        timer: timer.stop(),
     };
 };
 exports.processDeploymentGroup = processDeploymentGroup;
@@ -213,14 +210,14 @@ const convertArgs = async (projectDir, args) => {
     }
     if (args.startsWith("file:")) {
         const filePath = args.substr(5);
-        const fullFilePath = (0, takomo_util_1.expandFilePath)(projectDir, filePath);
-        const contents = await (0, takomo_util_1.readFileContents)(fullFilePath);
+        const fullFilePath = (0, files_1.expandFilePath)(projectDir, filePath);
+        const contents = await (0, files_1.readFileContents)(fullFilePath);
         switch ((0, path_1.extname)(filePath)) {
             case ".json":
                 return JSON.parse(contents);
             case ".yml":
             case ".yaml":
-                return (0, takomo_util_1.parseYaml)(fullFilePath, contents);
+                return (0, yaml_1.parseYaml)(fullFilePath, contents);
             default:
                 return contents;
         }
@@ -243,11 +240,10 @@ const run = async (props) => {
         .flat()
         .map((r) => r.value);
     if (!outputBase.success || !input.reduceCommand) {
-        childTimer.stop();
         return {
             ...outputBase,
             result: targetResults,
-            timer: childTimer,
+            timer: childTimer.stop(),
             outputFormat: input.outputFormat,
         };
     }
@@ -259,16 +255,14 @@ const run = async (props) => {
             credentials: reduceCredentials,
             reduceCommand: input.reduceCommand,
         });
-        childTimer.stop();
         return {
             ...outputBase,
             result,
-            timer: childTimer,
+            timer: childTimer.stop(),
             outputFormat: input.outputFormat,
         };
     }
     catch (error) {
-        childTimer.stop();
         io.error(`Reduce command failed`, error);
         return {
             error,
@@ -276,7 +270,7 @@ const run = async (props) => {
             message: "Reduce command failed",
             success: false,
             status: "FAILED",
-            timer: childTimer,
+            timer: childTimer.stop(),
             outputFormat: input.outputFormat,
         };
     }

package/dist/takomo-deployment-targets-commands/run/run.js.map

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

package/dist/takomo-deployment-targets-config/build-deployment-config.d.ts

@@ -2,6 +2,7 @@ import { Result } from "neverthrow";
 import { ConfigSet, ConfigSetName } from "../takomo-config-sets";
 import { CommandContext } from "../takomo-core";
 import { DeploymentGroupPath, DeploymentTargetsSchemaRegistry } from "../takomo-deployment-targets-model";
-import { TkmLogger, ValidationError } from "../takomo-util";
+import { ValidationError } from "../utils/errors";
+import { TkmLogger } from "../utils/logging";
 import { DeploymentConfig } from "./model";
 export declare const buildDeploymentConfig: (ctx: CommandContext, logger: TkmLogger, schemaRegistry: DeploymentTargetsSchemaRegistry, externalDeploymentTargets: Map<DeploymentGroupPath, ReadonlyArray<unknown>>, externalConfigSets: Map<ConfigSetName, ConfigSet>, record: Record<string, unknown>) => Promise<Result<DeploymentConfig, ValidationError>>;