takomo 5.0.0 → 5.2.0

package/dist/takomo-stacks-context/config/build-stacks-context.d.ts

@@ -1,7 +1,7 @@
 import { InternalCredentialManager } from "../../takomo-aws-clients";
 import { InternalCommandContext } from "../../takomo-core";
 import { CommandPath, InternalStacksContext } from "../../takomo-stacks-model";
-import { TkmLogger } from "../../takomo-util";
+import { TkmLogger } from "../../utils/logging";
 import { StacksConfigRepository } from "../model";
 import { ConfigTree } from "./config-tree";
 export interface BuildConfigContextInput {

package/dist/takomo-stacks-context/config/build-stacks-context.js

@@ -4,7 +4,7 @@ exports.buildStacksContext = exports.validateCommandPath = void 0;
 const takomo_stacks_hooks_1 = require("../../takomo-stacks-hooks");
 const takomo_stacks_model_1 = require("../../takomo-stacks-model");
 const takomo_stacks_resolvers_1 = require("../../takomo-stacks-resolvers");
-const takomo_util_1 = require("../../takomo-util");
+const collections_1 = require("../../utils/collections");
 const common_1 = require("../common");
 const model_1 = require("../model");
 const collect_stack_groups_1 = require("./collect-stack-groups");
@@ -15,7 +15,7 @@ const validateCommandPath = (configTree, commandPath) => {
     if (!commandPath || commandPath === takomo_stacks_model_1.ROOT_STACK_GROUP_PATH) {
         return;
     }
-    const stackGroups = (0, takomo_util_1.collectFromHierarchy)(configTree.rootStackGroup, (node) => node.children);
+    const stackGroups = (0, collections_1.collectFromHierarchy)(configTree.rootStackGroup, (node) => node.children);
     const stackGroupPaths = stackGroups.map((s) => s.path);
     const stackPaths = stackGroups
         .map((s) => s.stacks)
@@ -53,7 +53,7 @@ const buildStacksContext = async ({ ctx, logger, credentialManager, commandPath,
     const rootStackGroup = await (0, process_config_tree_1.processConfigTree)(ctx, logger, credentialManager, credentialManagers, resolverRegistry, schemaRegistry, hookRegistry, commandPath ?? takomo_stacks_model_1.ROOT_STACK_GROUP_PATH, configTree, configRepository);
     const stackGroups = (0, collect_stack_groups_1.collectStackGroups)(rootStackGroup);
     const stacks = (0, collect_stacks_1.collectStacks)(stackGroups);
-    const stacksByPath = (0, takomo_util_1.arrayToMap)(stacks, (s) => s.path);
+    const stacksByPath = (0, collections_1.arrayToMap)(stacks, (s) => s.path);
     if (validateCommandRoles) {
         await Promise.all(Array.from(credentialManagers.values()).map((cm) => cm.getCallerIdentity()));
     }

package/dist/takomo-stacks-context/config/build-stacks-context.js.map

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

package/dist/takomo-stacks-context/config/create-stack-group-from-parent.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStackGroupFromParent = void 0;
 const takomo_stacks_model_1 = require("../../takomo-stacks-model");
-const takomo_util_1 = require("../../takomo-util");
+const objects_1 = require("../../utils/objects");
 const createStackGroupFromParent = (node, parent) => (0, takomo_stacks_model_1.createStackGroup)({
     name: node.name,
     regions: parent.regions,
@@ -15,7 +15,7 @@ const createStackGroupFromParent = (node, parent) => (0, takomo_stacks_model_1.c
     parentPath: parent.path,
     children: [],
     stacks: [],
-    data: (0, takomo_util_1.deepCopy)(parent.data),
+    data: (0, objects_1.deepCopy)(parent.data),
     hooks: parent.hooks,
     capabilities: parent.capabilities,
     accountIds: parent.accountIds,

package/dist/takomo-stacks-context/config/create-stack-group-from-parent.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-stack-group-from-parent.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/create-stack-group-from-parent.ts"],"names":[],"mappings":";;;AAAA,mEAAwE;AACxE,mDAA4C;AAGrC,MAAM,0BAA0B,GAAG,CACxC,IAA0B,EAC1B,MAAkB,EACN,EAAE,CACd,IAAA,sCAAgB,EAAC;IACf,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,cAAc,EAAE,MAAM,CAAC,cAAc;IACrC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,UAAU,EAAE,MAAM,CAAC,IAAI;IACvB,QAAQ,EAAE,EAAE;IACZ,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,IAAA,sBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;IACnB,YAAY,EAAE,MAAM,CAAC,YAAY;IACjC,UAAU,EAAE,MAAM,CAAC,UAAU;IAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;IACzB,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;IACnD,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;IACvD,OAAO,EAAE,MAAM,CAAC,OAAO;CACxB,CAAC,CAAA;AA1BS,QAAA,0BAA0B,8BA0BnC"}
+{"version":3,"file":"create-stack-group-from-parent.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/create-stack-group-from-parent.ts"],"names":[],"mappings":";;;AAAA,mEAAwE;AACxE,iDAA8C;AAGvC,MAAM,0BAA0B,GAAG,CACxC,IAA0B,EAC1B,MAAkB,EACN,EAAE,CACd,IAAA,sCAAgB,EAAC;IACf,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,cAAc,EAAE,MAAM,CAAC,cAAc;IACrC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,UAAU,EAAE,MAAM,CAAC,IAAI;IACvB,QAAQ,EAAE,EAAE;IACZ,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,IAAA,kBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;IACnB,YAAY,EAAE,MAAM,CAAC,YAAY;IACjC,UAAU,EAAE,MAAM,CAAC,UAAU;IAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;IACzB,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;IACnD,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;IACvD,OAAO,EAAE,MAAM,CAAC,OAAO;CACxB,CAAC,CAAA;AA1BS,QAAA,0BAA0B,8BA0BnC"}

package/dist/takomo-stacks-context/config/create-stack-group.d.ts

@@ -1,5 +1,5 @@
 import { CommandContext } from "../../takomo-core";
 import { SchemaRegistry, StackGroup } from "../../takomo-stacks-model";
-import { TkmLogger } from "../../takomo-util";
+import { TkmLogger } from "../../utils/logging";
 import { StackGroupConfigNode } from "./config-tree";
 export declare const doCreateStackGroup: (ctx: CommandContext, logger: TkmLogger, node: StackGroupConfigNode, schemaRegistry: SchemaRegistry, parent?: StackGroup) => Promise<StackGroup>;

package/dist/takomo-stacks-context/config/get-variables-for-stack-group.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVariablesForStackGroup = void 0;
-const takomo_util_1 = require("../../takomo-util");
-const getVariablesForStackGroup = (stackGroup) => (0, takomo_util_1.deepCopy)({
+const objects_1 = require("../../utils/objects");
+const getVariablesForStackGroup = (stackGroup) => (0, objects_1.deepCopy)({
     name: stackGroup.name,
     project: stackGroup.project,
     regions: stackGroup.regions,

package/dist/takomo-stacks-context/config/get-variables-for-stack-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-variables-for-stack-group.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/get-variables-for-stack-group.ts"],"names":[],"mappings":";;;AACA,mDAA4C;AAErC,MAAM,yBAAyB,GAAG,CAAC,UAAsB,EAAO,EAAE,CACvE,IAAA,sBAAQ,EAAC;IACP,IAAI,EAAE,UAAU,CAAC,IAAI;IACrB,OAAO,EAAE,UAAU,CAAC,OAAO;IAC3B,OAAO,EAAE,UAAU,CAAC,OAAO;IAC3B,WAAW,EAAE,UAAU,CAAC,WAAW;IACnC,IAAI,EAAE,UAAU,CAAC,IAAI;IACrB,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IAClD,MAAM,EAAE,UAAU,CAAC,IAAI;IACvB,cAAc,EAAE,UAAU,CAAC,cAAc;IACzC,OAAO,EAAE,UAAU,CAAC,OAAO;IAC3B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACjE,GAAG;QACH,KAAK;KACN,CAAC,CAAC;IACH,IAAI,EAAE,UAAU,CAAC,IAAI;IACrB,YAAY,EAAE,UAAU,CAAC,YAAY;IACrC,UAAU,EAAE,UAAU,CAAC,UAAU;IACjC,qBAAqB,EAAE,UAAU,CAAC,qBAAqB;CACxD,CAAC,CAAA;AAnBS,QAAA,yBAAyB,6BAmBlC"}
+{"version":3,"file":"get-variables-for-stack-group.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/get-variables-for-stack-group.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAEvC,MAAM,yBAAyB,GAAG,CAAC,UAAsB,EAAO,EAAE,CACvE,IAAA,kBAAQ,EAAC;IACP,IAAI,EAAE,UAAU,CAAC,IAAI;IACrB,OAAO,EAAE,UAAU,CAAC,OAAO;IAC3B,OAAO,EAAE,UAAU,CAAC,OAAO;IAC3B,WAAW,EAAE,UAAU,CAAC,WAAW;IACnC,IAAI,EAAE,UAAU,CAAC,IAAI;IACrB,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IAClD,MAAM,EAAE,UAAU,CAAC,IAAI;IACvB,cAAc,EAAE,UAAU,CAAC,cAAc;IACzC,OAAO,EAAE,UAAU,CAAC,OAAO;IAC3B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACjE,GAAG;QACH,KAAK;KACN,CAAC,CAAC;IACH,IAAI,EAAE,UAAU,CAAC,IAAI;IACrB,YAAY,EAAE,UAAU,CAAC,YAAY;IACrC,UAAU,EAAE,UAAU,CAAC,UAAU;IACjC,qBAAqB,EAAE,UAAU,CAAC,qBAAqB;CACxD,CAAC,CAAA;AAnBS,QAAA,yBAAyB,6BAmBlC"}

package/dist/takomo-stacks-context/config/parameters.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildParameters = void 0;
-const takomo_util_1 = require("../../takomo-util");
+const errors_1 = require("../../utils/errors");
 const model_1 = require("../model");
 const initializeResolver = async (ctx, stackPath, paramName, paramConfig, resolverRegistry, schemaRegistry) => {
     const resolverName = paramConfig.resolver;
@@ -10,7 +10,7 @@ const initializeResolver = async (ctx, stackPath, paramName, paramConfig, resolv
             .getRegisteredResolverNames()
             .map((r) => `  - ${r}`)
             .join("\n");
-        throw new takomo_util_1.TakomoError(`1 validation error(s) in stack ${stackPath}:\n\n` +
+        throw new errors_1.TakomoError(`1 validation error(s) in stack ${stackPath}:\n\n` +
             `  - Unknown resolver '${resolverName}' in parameter '${paramName}'\n\n` +
             `Available resolvers:\n${availableResolvers}`);
     }

package/dist/takomo-stacks-context/config/parameters.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/parameters.ts"],"names":[],"mappings":";;;AAKA,mDAA+C;AAC/C,oCAIiB;AAEjB,MAAM,kBAAkB,GAAG,KAAK,EAC9B,GAAmB,EACnB,SAAoB,EACpB,SAA4B,EAC5B,WAA4B,EAC5B,gBAAkC,EAClC,cAA8B,EACH,EAAE;IAC7B,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAA;IAEzC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE;QAC/C,MAAM,kBAAkB,GAAG,gBAAgB;aACxC,0BAA0B,EAAE;aAC5B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aACtB,IAAI,CAAC,IAAI,CAAC,CAAA;QACb,MAAM,IAAI,yBAAW,CACnB,kCAAkC,SAAS,OAAO;YAChD,yBAAyB,YAAY,mBAAmB,SAAS,OAAO;YACxE,yBAAyB,kBAAkB,EAAE,CAChD,CAAA;KACF;IAED,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,YAAY,CAClD,GAAG,EACH,SAAS,EACT,SAAS,EACT,YAAY,EACZ,WAAW,CACZ,CAAA;IAED,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM;QAC/B,CAAC,CAAC,MAAM,cAAc,CAAC,mBAAmB,CACtC,GAAG,EACH,SAAS,EACT,SAAS,EACT,WAAW,CAAC,MAAM,EAAE,IAAI,EACxB,WAAW,CAAC,MAAM,CACnB;QACH,CAAC,CAAC,SAAS,CAAA;IAEb,OAAO,IAAI,8BAAsB,CAAC,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;AAChF,CAAC,CAAA;AAEM,MAAM,eAAe,GAAG,KAAK,EAClC,GAAmB,EACnB,SAAoB,EACpB,UAAoD,EACpD,gBAAkC,EAClC,cAA8B,EACqB,EAAE;IACrD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAuC,CAAA;IAEpE,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE;QACvE,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACpC,kBAAkB,CAChB,GAAG,EACH,SAAS,EACT,GAAG,SAAS,IAAI,KAAK,GAAG,EACxB,IAAI,EACJ,gBAAgB,EAChB,cAAc,CACf,CACF,CACF,CAAA;YAED,aAAa,CAAC,GAAG,CACf,SAAS,EACT,IAAI,4BAAoB,CACtB,MAAM,EACN,SAAS,EACT,WAAW,CAAC,SAAS,EACrB,WAAW,CAAC,YAAY,CACzB,CACF,CAAA;SACF;aAAM;YACL,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CACvC,GAAG,EACH,SAAS,EACT,SAAS,EACT,WAAW,CAAC,MAAM,EAClB,gBAAgB,EAChB,cAAc,CACf,CAAA;YAED,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;SACvC;KACF;IAED,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA;AAhDY,QAAA,eAAe,mBAgD3B"}
+{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/parameters.ts"],"names":[],"mappings":";;;AAKA,+CAAgD;AAChD,oCAIiB;AAEjB,MAAM,kBAAkB,GAAG,KAAK,EAC9B,GAAmB,EACnB,SAAoB,EACpB,SAA4B,EAC5B,WAA4B,EAC5B,gBAAkC,EAClC,cAA8B,EACH,EAAE;IAC7B,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAA;IAEzC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE;QAC/C,MAAM,kBAAkB,GAAG,gBAAgB;aACxC,0BAA0B,EAAE;aAC5B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aACtB,IAAI,CAAC,IAAI,CAAC,CAAA;QACb,MAAM,IAAI,oBAAW,CACnB,kCAAkC,SAAS,OAAO;YAChD,yBAAyB,YAAY,mBAAmB,SAAS,OAAO;YACxE,yBAAyB,kBAAkB,EAAE,CAChD,CAAA;KACF;IAED,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,YAAY,CAClD,GAAG,EACH,SAAS,EACT,SAAS,EACT,YAAY,EACZ,WAAW,CACZ,CAAA;IAED,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM;QAC/B,CAAC,CAAC,MAAM,cAAc,CAAC,mBAAmB,CACtC,GAAG,EACH,SAAS,EACT,SAAS,EACT,WAAW,CAAC,MAAM,EAAE,IAAI,EACxB,WAAW,CAAC,MAAM,CACnB;QACH,CAAC,CAAC,SAAS,CAAA;IAEb,OAAO,IAAI,8BAAsB,CAAC,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;AAChF,CAAC,CAAA;AAEM,MAAM,eAAe,GAAG,KAAK,EAClC,GAAmB,EACnB,SAAoB,EACpB,UAAoD,EACpD,gBAAkC,EAClC,cAA8B,EACqB,EAAE;IACrD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAuC,CAAA;IAEpE,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE;QACvE,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACpC,kBAAkB,CAChB,GAAG,EACH,SAAS,EACT,GAAG,SAAS,IAAI,KAAK,GAAG,EACxB,IAAI,EACJ,gBAAgB,EAChB,cAAc,CACf,CACF,CACF,CAAA;YAED,aAAa,CAAC,GAAG,CACf,SAAS,EACT,IAAI,4BAAoB,CACtB,MAAM,EACN,SAAS,EACT,WAAW,CAAC,SAAS,EACrB,WAAW,CAAC,YAAY,CACzB,CACF,CAAA;SACF;aAAM;YACL,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CACvC,GAAG,EACH,SAAS,EACT,SAAS,EACT,WAAW,CAAC,MAAM,EAClB,gBAAgB,EAChB,cAAc,CACf,CAAA;YAED,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;SACvC;KACF;IAED,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA;AAhDY,QAAA,eAAe,mBAgD3B"}

package/dist/takomo-stacks-context/config/populate-properties-from-config-file.d.ts

@@ -1,5 +1,5 @@
 import { CommandContext } from "../../takomo-core";
 import { SchemaRegistry, StackGroup } from "../../takomo-stacks-model";
-import { TkmLogger } from "../../takomo-util";
+import { TkmLogger } from "../../utils/logging";
 import { StackGroupConfigNode } from "./config-tree";
 export declare const populatePropertiesFromConfigFile: (ctx: CommandContext, schemaRegistry: SchemaRegistry, logger: TkmLogger, variables: any, stackGroup: StackGroup, node: StackGroupConfigNode) => Promise<StackGroup>;

package/dist/takomo-stacks-context/config/populate-properties-from-config-file.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.populatePropertiesFromConfigFile = 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 objects_1 = require("../../utils/objects");
 const merge_stack_group_schemas_1 = require("./merge-stack-group-schemas");
 const populatePropertiesFromConfigFile = async (ctx, schemaRegistry, logger, variables, stackGroup, node) => {
     const configFile = await node.getConfig(variables);
@@ -54,8 +55,8 @@ const populatePropertiesFromConfigFile = async (ctx, schemaRegistry, logger, var
     else {
         props.tags = configFile.tags;
     }
-    props.data = (0, takomo_util_1.merge)(stackGroup.data, configFile.data);
-    props.hooks = (0, takomo_util_1.mergeArrays)({
+    props.data = (0, objects_1.merge)(stackGroup.data, configFile.data);
+    props.hooks = (0, collections_1.mergeArrays)({
         first: stackGroup.hooks,
         second: configFile.hooks,
         allowDuplicates: false,

package/dist/takomo-stacks-context/config/populate-properties-from-config-file.js.map

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

package/dist/takomo-stacks-context/config/process-config-tree.d.ts

@@ -4,7 +4,7 @@ import { InternalCommandContext } from "../../takomo-core";
 import { HookRegistry } from "../../takomo-stacks-hooks";
 import { CommandPath, InternalStack, SchemaRegistry, StackGroup, StackGroupPath, StackPath } from "../../takomo-stacks-model";
 import { ResolverRegistry } from "../../takomo-stacks-resolvers";
-import { TkmLogger } from "../../takomo-util";
+import { TkmLogger } from "../../utils/logging";
 import { StacksConfigRepository } from "../model";
 import { ConfigTree } from "./config-tree";
 export declare class ProcessStatus {

package/dist/takomo-stacks-context/config/process-config-tree.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processConfigTree = exports.ProcessStatus = void 0;
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_stacks_model_1 = require("../../takomo-stacks-model");
-const takomo_util_1 = require("../../takomo-util");
+const collections_1 = require("../../utils/collections");
 const dependencies_1 = require("../dependencies");
 const build_stack_1 = require("./build-stack");
 const create_stack_group_1 = require("./create-stack-group");
@@ -113,7 +113,7 @@ const processConfigTree = async (ctx, logger, credentialManager, credentialManag
     const allStacks = (0, dependencies_1.processStackDependencies)(status.getStacks());
     const allStackGroups = status.getStackGroups();
     const root = status.getRootStackGroup();
-    const stacksByPath = (0, takomo_util_1.arrayToMap)(allStacks, (s) => s.path);
+    const stacksByPath = (0, collections_1.arrayToMap)(allStacks, (s) => s.path);
     (0, dependencies_1.checkCyclicDependencies)(stacksByPath);
     (0, dependencies_1.checkObsoleteDependencies)(stacksByPath);
     return populateChildrenAndStacks(root, allStacks, allStackGroups);

package/dist/takomo-stacks-context/config/process-config-tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-config-tree.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/process-config-tree.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAqB;AAKrB,mEAWkC;AAElC,mDAAyD;AACzD,kDAIwB;AAExB,+CAA0C;AAE1C,6DAAyD;AAEzD,MAAa,aAAa;IAA1B;QACE,qCAAwB,IAAI,GAAG,EAA8B,EAAA;QAC7D,gCAAmB,IAAI,GAAG,EAA4B,EAAA;QACtD,mCAAsB,IAAI,GAAG,EAA4B,EAAA;QAEzD,sBAAiB,GAAG,GAAe,EAAE,CACnC,IAAI,CAAC,aAAa,CAAC,2CAAqB,CAAC,CAAA;QAE3C,0BAAqB,GAAG,CAAC,IAAoB,EAAW,EAAE,CACxD,uBAAA,IAAI,kCAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAE7B,qBAAgB,GAAG,CAAC,IAAe,EAAW,EAAE,CAAC,uBAAA,IAAI,6BAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAEvE,2BAAsB,GAAG,CAAC,UAAsB,EAAQ,EAAE;YACxD,uBAAA,IAAI,kCAAa,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QACpD,CAAC,CAAA;QAED,sBAAiB,GAAG,CAAC,KAAoB,EAAQ,EAAE;YACjD,uBAAA,IAAI,6BAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YACnC,uBAAA,IAAI,gCAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QACxC,CAAC,CAAA;QAED,kBAAa,GAAG,CAAC,IAAoB,EAAc,EAAE;YACnD,MAAM,UAAU,GAAG,uBAAA,IAAI,kCAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAC9C,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAAA;aAC1D;YAED,OAAO,UAAU,CAAA;QACnB,CAAC,CAAA;QAED,4BAAuB,GAAG,GAAoB,EAAE,CAC9C,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,gCAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QACtC,mBAAc,GAAG,GAAiB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,kCAAa,CAAC,MAAM,EAAE,CAAC,CAAA;QAC3E,cAAS,GAAG,GAAoB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,6BAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;QAEpE,UAAK,GAAG,GAAS,EAAE,CAAC,uBAAA,IAAI,gCAAW,CAAC,KAAK,EAAE,CAAA;IAC7C,CAAC;CAAA;AArCD,sCAqCC;;AAED,MAAM,yBAAyB,GAAG,CAChC,UAAsB,EACtB,SAAuC,EACvC,cAAyC,EAC7B,EAAE;IACd,MAAM,QAAQ,GAAG,cAAc;SAC5B,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;SACjD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC,CAAA;IAE9E,MAAM,MAAM,GAAG,SAAS;SACrB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,UAAU,CAAC,IAAI,CAAC;SACnD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAE3B,OAAO,IAAA,sCAAgB,EAAC;QACtB,GAAG,UAAU,CAAC,OAAO,EAAE;QACvB,MAAM;QACN,QAAQ;KACT,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,KAAK,EACvC,GAA2B,EAC3B,MAAiB,EACjB,iBAA4C,EAC5C,kBAA8D,EAC9D,gBAAkC,EAClC,cAA8B,EAC9B,YAA0B,EAC1B,WAAwB,EACxB,MAAqB,EACrB,IAA0B,EAC1B,gBAAwC,EACzB,EAAE;IACjB,MAAM,CAAC,KAAK,CAAC,8CAA8C,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;IACxE,IAAI,CAAC,IAAA,yCAAmB,EAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;QAChD,MAAM,CAAC,KAAK,CACV,sCAAsC,IAAI,CAAC,IAAI,iCAAiC,WAAW,GAAG,CAC/F,CAAA;QACD,OAAM;KACP;IAED,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5C,MAAM,CAAC,KAAK,CACV,sCAAsC,IAAI,CAAC,IAAI,wBAAwB,CACxE,CAAA;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU;YAC5B,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;YACvC,CAAC,CAAC,SAAS,CAAA;QAEb,MAAM,UAAU,GAAG,MAAM,IAAA,uCAAkB,EACzC,GAAG,EACH,MAAM,EACN,IAAI,EACJ,cAAc,EACd,MAAM,CACP,CAAA;QAED,MAAM,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAA;KAC1C;SAAM;QACL,MAAM,CAAC,KAAK,CACV,sCAAsC,IAAI,CAAC,IAAI,wBAAwB,CACxE,CAAA;KACF;IAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEzD,MAAM,eAAe,GAAG,iBAAiB,CAAC,MAAM;QAC9C,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,IAAI,CAAC,MAAM;aACR,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,yCAAmB,EAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7D,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAE5D,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,eAAe,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC5B,IAAA,wBAAU,EACR,GAAG,EACH,MAAM,EACN,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,KAAK,EACL,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAC/B,WAAW,EACX,MAAM,EACN,gBAAgB,CACjB,CACF,CACF,CAAA;IAED,eAAe,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;IACxD,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CACvD,IAAA,yCAAmB,EAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAC7C,CAAA;IAED,MAAM,OAAO,CAAC,GAAG,CACf,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC9B,2BAA2B,CACzB,GAAG,EACH,MAAM,EACN,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,WAAW,EACX,MAAM,EACN,KAAK,EACL,gBAAgB,CACjB,CACF,CACF,CAAA;AACH,CAAC,CAAA;AAEM,MAAM,iBAAiB,GAAG,KAAK,EACpC,GAA2B,EAC3B,MAAiB,EACjB,iBAA4C,EAC5C,kBAA8D,EAC9D,gBAAkC,EAClC,cAA8B,EAC9B,YAA0B,EAC1B,WAAwB,EACxB,UAAsB,EACtB,gBAAwC,EACnB,EAAE;IACvB,MAAM,IAAI,GAAG,UAAU,CAAC,cAAc,CAAA;IACtC,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAA;IAElC,IAAI,YAAY,GAAG,CAAC,WAAW,CAAC,CAAA;IAChC,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,MAAM,CAAC,WAAW,CAAC,2BAA2B,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,CAAA;QACnE,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE;YAC7B,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE,EAAE,CAAC,CAAA;YAC7D,MAAM,2BAA2B,CAC/B,GAAG,EACH,MAAM,EACN,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,EAAE,EACF,MAAM,EACN,IAAI,EACJ,gBAAgB,CACjB,CAAA;SACF;QAED,YAAY,GAAG,eAAC,CAAC,IAAI,CACnB,MAAM;aACH,uBAAuB,EAAE;aACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;aACxB,MAAM,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YAC3B,MAAM,qBAAqB,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;iBAChE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC;iBACE,eAAe,EAAE;iBACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,wCAAkB,EAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAC3D;iBACA,IAAI,EAAE,CAAA;YAET,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,GAAG,qBAAqB,CAAC,CAAA;QACxE,CAAC,EAAE,IAAI,KAAK,EAAa,CAAC,CAC7B,CAAA;QAED,MAAM,CAAC,KAAK,EAAE,CAAA;KACf;IAED,MAAM,SAAS,GAAG,IAAA,uCAAwB,EAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,EAAE,CAAA;IAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAA;IACvC,MAAM,YAAY,GAAG,IAAA,wBAAU,EAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAEzD,IAAA,sCAAuB,EAAC,YAAY,CAAC,CAAA;IACrC,IAAA,wCAAyB,EAAC,YAAY,CAAC,CAAA;IAEvC,OAAO,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;AACnE,CAAC,CAAA;AAhEY,QAAA,iBAAiB,qBAgE7B"}
+{"version":3,"file":"process-config-tree.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/process-config-tree.ts"],"names":[],"mappings":"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"}

package/dist/takomo-stacks-context/dependencies.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortStacksForDeploy = exports.sortStacksForUndeploy = exports.processStackDependencies = exports.populateDependents = exports.collectStackDirectDependents = exports.collectAllDependents = exports.collectAllDependencies = exports.checkObsoleteDependencies = exports.checkCyclicDependencies = exports.checkCyclicDependenciesForStack = void 0;
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_stacks_model_1 = require("../takomo-stacks-model");
-const takomo_util_1 = require("../takomo-util");
-const errors_1 = require("./errors");
+const errors_1 = require("../utils/errors");
+const errors_2 = require("./errors");
 const checkCyclicDependenciesForStack = (stack, stacks, collectedDependencies) => {
     if (stack.dependencies.length === 0) {
         return;
     }
     stack.dependencies.forEach((d) => {
         if (collectedDependencies.includes(d)) {
-            throw new takomo_util_1.TakomoError(`Cyclic dependency detected: ${collectedDependencies.join(" -> ")} -> ${d}`);
+            throw new errors_1.TakomoError(`Cyclic dependency detected: ${collectedDependencies.join(" -> ")} -> ${d}`);
         }
         (0, exports.checkCyclicDependenciesForStack)(stacks.get(d), stacks, [
             ...collectedDependencies,
@@ -45,7 +45,7 @@ const checkObsoleteDependencies = (stacks) => {
     })
         .filter(({ to }) => to.length > 0);
     if (stacksWithObsoleteDependencies.length > 0) {
-        throw new errors_1.ObsoleteDependenciesError(stacksWithObsoleteDependencies);
+        throw new errors_2.ObsoleteDependenciesError(stacksWithObsoleteDependencies);
     }
 };
 exports.checkObsoleteDependencies = checkObsoleteDependencies;
@@ -87,7 +87,7 @@ const processStackDependencies = (stacks) => {
                 .filter((other) => other.path.startsWith(dependency))
                 .map((other) => other.path);
             if (matching.length === 0) {
-                throw new takomo_util_1.TakomoError(`Dependency ${dependency} in stack ${stack.path} refers to a non-existing stack`);
+                throw new errors_1.TakomoError(`Dependency ${dependency} in stack ${stack.path} refers to a non-existing stack`);
             }
             return matching;
         });
@@ -100,7 +100,7 @@ const processStackDependencies = (stacks) => {
                     .filter((other) => other.path.startsWith(normalizedDependency))
                     .map((other) => other.path);
                 if (matching.length === 0) {
-                    throw new takomo_util_1.TakomoError(`Dependency ${dependency} in parameter ${parameterName} of stack ${stack.path} refers to a non-existing stack`);
+                    throw new errors_1.TakomoError(`Dependency ${dependency} in parameter ${parameterName} of stack ${stack.path} refers to a non-existing stack`);
                 }
                 return matching;
             });

package/dist/takomo-stacks-context/dependencies.js.map

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

package/dist/takomo-stacks-context/errors.d.ts

@@ -1,12 +1,9 @@
 import { StackPath } from "../takomo-stacks-model";
-import { TakomoError } from "../takomo-util";
+import { TakomoError } from "../utils/errors";
 interface Reference {
     readonly from: StackPath;
     readonly to: ReadonlyArray<StackPath>;
 }
-/**
- * @hidden
- */
 export declare class ObsoleteDependenciesError extends TakomoError {
     constructor(references: ReadonlyArray<Reference>);
 }

package/dist/takomo-stacks-context/errors.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObsoleteDependenciesError = void 0;
-const takomo_util_1 = require("../takomo-util");
-/**
- * @hidden
- */
-class ObsoleteDependenciesError extends takomo_util_1.TakomoError {
+const errors_1 = require("../utils/errors");
+class ObsoleteDependenciesError extends errors_1.TakomoError {
     constructor(references) {
         const message = `Dependencies to obsolete stacks detected.\n\nThe following ${references.length} stack(s) depend on stacks marked as obsolete:\n\n` +
             references.map(({ from, to }) => `  ${from}:\n${to

package/dist/takomo-stacks-context/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/takomo-stacks-context/errors.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAO5C;;GAEG;AACH,MAAa,yBAA0B,SAAQ,yBAAW;IACxD,YAAY,UAAoC;QAC9C,MAAM,OAAO,GACX,8DAA8D,UAAU,CAAC,MAAM,oDAAoD;YACnI,UAAU,CAAC,GAAG,CACZ,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CACf,KAAK,IAAI,MAAM,EAAE;iBACd,KAAK,EAAE;iBACP,IAAI,EAAE;iBACN,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,yBAAyB,CAAC;iBAC/C,IAAI,CAAC,EAAE,CAAC,EAAE,CAChB,CAAA;QAEH,KAAK,CAAC,OAAO,EAAE;YACb,IAAI,EAAE,8DAA8D;YACpE,YAAY,EAAE,CAAC,yCAAyC,CAAC;SAC1D,CAAC,CAAA;IACJ,CAAC;CACF;AAlBD,8DAkBC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/takomo-stacks-context/errors.ts"],"names":[],"mappings":";;;AACA,4CAA6C;AAO7C,MAAa,yBAA0B,SAAQ,oBAAW;IACxD,YAAY,UAAoC;QAC9C,MAAM,OAAO,GACX,8DAA8D,UAAU,CAAC,MAAM,oDAAoD;YACnI,UAAU,CAAC,GAAG,CACZ,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CACf,KAAK,IAAI,MAAM,EAAE;iBACd,KAAK,EAAE;iBACP,IAAI,EAAE;iBACN,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,yBAAyB,CAAC;iBAC/C,IAAI,CAAC,EAAE,CAAC,EAAE,CAChB,CAAA;QAEH,KAAK,CAAC,OAAO,EAAE;YACb,IAAI,EAAE,8DAA8D;YACpE,YAAY,EAAE,CAAC,yCAAyC,CAAC;SAC1D,CAAC,CAAA;IACJ,CAAC;CACF;AAlBD,8DAkBC"}

package/dist/takomo-stacks-context/model.d.ts

@@ -1,11 +1,14 @@
 import { AnySchema } from "joi";
-import { IamRoleArn, StackEvent } from "../takomo-aws-model";
+import { IamRoleArn } from "../takomo-aws-model";
+import { StackEvent } from "../takomo-aws-model/cloudformation";
 import { CommandStatus, EnvVars, Variables } from "../takomo-core";
 import { ParameterConfig, StackConfig } from "../takomo-stacks-config";
 import { HookRegistry } from "../takomo-stacks-hooks";
 import { BlueprintPath, CommandPath, InternalStack, Resolver, ResolverInput, ResolverName, SchemaRegistry, StackPath } from "../takomo-stacks-model";
 import { ResolverRegistry } from "../takomo-stacks-resolvers";
-import { TakomoError, TemplateEngine, Timer } from "../takomo-util";
+import { TakomoError } from "../utils/errors";
+import { TemplateEngine } from "../utils/templating";
+import { Timer } from "../utils/timer";
 import { ConfigTree } from "./config/config-tree";
 export declare class CommandPathMatchesNoStacksError extends TakomoError {
     constructor(commandPath: CommandPath, availableStackPaths: StackPath[]);

package/dist/takomo-stacks-context/model.js

@@ -13,8 +13,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SingleResolverExecutor_name, _SingleResolverExecutor_resolver, _SingleResolverExecutor_confidential, _SingleResolverExecutor_immutable, _SingleResolverExecutor_schema, _ListResolverExecutor_name, _ListResolverExecutor_resolvers, _ListResolverExecutor_confidential, _ListResolverExecutor_immutable, _ListResolverExecutor_schema;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListResolverExecutor = exports.SingleResolverExecutor = exports.CommandPathMatchesNoStacksError = void 0;
-const takomo_util_1 = require("../takomo-util");
-class CommandPathMatchesNoStacksError extends takomo_util_1.TakomoError {
+const errors_1 = require("../utils/errors");
+class CommandPathMatchesNoStacksError extends errors_1.TakomoError {
     constructor(commandPath, availableStackPaths) {
         const stackPaths = availableStackPaths.map((s) => `  - ${s}`).join("\n");
         super(`No stacks found within the given command path: ${commandPath}\n\nAvailable stack paths:\n\n${stackPaths}`);

package/dist/takomo-stacks-context/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/takomo-stacks-context/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/takomo-stacks-context/model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAiBA,4CAA6C;AAK7C,MAAa,+BAAgC,SAAQ,oBAAW;IAC9D,YAAY,WAAwB,EAAE,mBAAgC;QACpE,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAExE,KAAK,CACH,kDAAkD,WAAW,iCAAiC,UAAU,EAAE,CAC3G,CAAA;IACH,CAAC;CACF;AARD,0EAQC;AAqBD,MAAa,sBAAsB;IAOjC,YACE,IAAkB,EAClB,QAAkB,EAClB,WAA4B,EAC5B,MAAkB;QAVpB,+CAA4B;QAC5B,mDAA4B;QAC5B,uDAAgC;QAChC,oDAA4B;QAC5B,iDAA4B;QAe5B,YAAO,GAAG,KAAK,EAAE,KAAoB,EAAgB,EAAE,CACrD,uBAAA,IAAI,wCAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAE/B,mBAAc,GAAG,GAAY,EAAE;YAC7B,IAAI,uBAAA,IAAI,4CAAc,KAAK,IAAI,EAAE;gBAC/B,OAAO,IAAI,CAAA;aACZ;YAED,IAAI,uBAAA,IAAI,4CAAc,KAAK,KAAK,EAAE;gBAChC,OAAO,KAAK,CAAA;aACb;YAED,IAAI,uBAAA,IAAI,wCAAU,CAAC,YAAY,KAAK,SAAS,EAAE;gBAC7C,OAAO,KAAK,CAAA;aACb;YAED,IAAI,OAAO,uBAAA,IAAI,wCAAU,CAAC,YAAY,KAAK,UAAU,EAAE;gBACrD,OAAO,uBAAA,IAAI,wCAAU,CAAC,YAAY,EAAE,CAAA;aACrC;YAED,OAAO,uBAAA,IAAI,wCAAU,CAAC,YAAY,CAAA;QACpC,CAAC,CAAA;QAED,gBAAW,GAAG,GAAY,EAAE,CAAC,uBAAA,IAAI,yCAAW,CAAA;QAE5C,mBAAc,GAAG,GAAiB,EAAE;YAClC,IAAI,CAAC,uBAAA,IAAI,wCAAU,CAAC,WAAW,EAAE;gBAC/B,OAAO,EAAE,CAAA;aACV;YAED,IAAI,OAAO,uBAAA,IAAI,wCAAU,CAAC,WAAW,KAAK,UAAU,EAAE;gBACpD,OAAO,uBAAA,IAAI,wCAAU,CAAC,WAAW,EAAE,CAAA;aACpC;YAED,OAAO,uBAAA,IAAI,wCAAU,CAAC,WAAW,CAAA;QACnC,CAAC,CAAA;QAED,oBAAe,GAAG,GAAgB,EAAE;YAClC,IAAI,CAAC,uBAAA,IAAI,wCAAU,CAAC,YAAY,EAAE;gBAChC,OAAO,EAAE,CAAA;aACV;YAED,IAAI,OAAO,uBAAA,IAAI,wCAAU,CAAC,YAAY,KAAK,UAAU,EAAE;gBACrD,OAAO,uBAAA,IAAI,wCAAU,CAAC,YAAY,EAAE,CAAA;aACrC;YAED,OAAO,uBAAA,IAAI,wCAAU,CAAC,YAAY,CAAA;QACpC,CAAC,CAAA;QAED,YAAO,GAAG,GAAiB,EAAE,CAAC,uBAAA,IAAI,oCAAM,CAAA;QAExC,cAAS,GAAG,GAA0B,EAAE,CAAC,uBAAA,IAAI,sCAAQ,CAAA;QA1DnD,uBAAA,IAAI,gCAAS,IAAI,MAAA,CAAA;QACjB,uBAAA,IAAI,oCAAa,QAAQ,MAAA,CAAA;QACzB,uBAAA,IAAI,wCAAiB,WAAW,CAAC,YAAY,MAAA,CAAA;QAC7C,uBAAA,IAAI,qCAAc,WAAW,CAAC,SAAS,MAAA,CAAA;QACvC,uBAAA,IAAI,kCAAW,MAAM,MAAA,CAAA;IACvB,CAAC;CAsDF;AAxED,wDAwEC;;AAED;;GAEG;AACH,MAAa,oBAAoB;IAO/B,YACE,IAAkB,EAClB,SAA0C,EAC1C,SAAkB,EAClB,YAAsB,EACtB,MAAkB;QAXpB,6CAA4B;QAC5B,kDAAoD;QACpD,qDAAgC;QAChC,kDAA4B;QAC5B,+CAA4B;QAgB5B,YAAO,GAAG,KAAK,EAAE,KAAoB,EAAgB,EAAE,CACrD,OAAO,CAAC,GAAG,CACT,uBAAA,IAAI,uCAAW,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,CAC5C,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAC1D,CACF,CAAA;QAEH,mBAAc,GAAG,GAAY,EAAE;YAC7B,IAAI,uBAAA,IAAI,0CAAc,KAAK,IAAI,EAAE;gBAC/B,OAAO,IAAI,CAAA;aACZ;iBAAM,IAAI,uBAAA,IAAI,0CAAc,KAAK,KAAK,EAAE;gBACvC,OAAO,KAAK,CAAA;aACb;YAED,OAAO,uBAAA,IAAI,uCAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAA;QACtD,CAAC,CAAA;QACD,gBAAW,GAAG,GAAY,EAAE,CAAC,uBAAA,IAAI,uCAAW,CAAA;QAE5C,oBAAe,GAAG,GAAgB,EAAE,CAClC,uBAAA,IAAI,uCAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QAExD,mBAAc,GAAG,GAAiB,EAAE,CAClC,uBAAA,IAAI,uCAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QAEvD,YAAO,GAAG,GAAiB,EAAE,CAAC,uBAAA,IAAI,kCAAM,CAAA;QAExC,cAAS,GAAG,GAA0B,EAAE,CAAC,uBAAA,IAAI,oCAAQ,CAAA;QAjCnD,uBAAA,IAAI,8BAAS,IAAI,MAAA,CAAA;QACjB,uBAAA,IAAI,mCAAc,SAAS,MAAA,CAAA;QAC3B,uBAAA,IAAI,mCAAc,SAAS,MAAA,CAAA;QAC3B,uBAAA,IAAI,sCAAiB,YAAY,MAAA,CAAA;QACjC,uBAAA,IAAI,gCAAW,MAAM,MAAA,CAAA;IACvB,CAAC;CA6BF;AAhDD,oDAgDC"}

package/dist/takomo-stacks-hooks/checksum-hook.d.ts

@@ -1,5 +1,5 @@
 import { Hook, HookInput, HookOutput } from "../takomo-stacks-model";
-import { FilePath } from "../takomo-util";
+import { FilePath } from "../utils/files";
 export declare class ChecksumHook implements Hook {
     readonly algo = "sha1";
     readonly dir: FilePath;

package/dist/takomo-stacks-hooks/checksum-hook.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChecksumHook = void 0;
 const folder_hash_1 = require("folder-hash");
-const takomo_util_1 = require("../takomo-util");
+const files_1 = require("../utils/files");
 class ChecksumHook {
     constructor(config) {
         this.algo = "sha1";
@@ -16,7 +16,7 @@ class ChecksumHook {
         }
     }
     async execute(input) {
-        const name = (0, takomo_util_1.expandFilePath)(input.ctx.projectDir, this.dir);
+        const name = (0, files_1.expandFilePath)(input.ctx.projectDir, this.dir);
         const { hash } = await (0, folder_hash_1.hashElement)(name, {
             algo: this.algo,
             encoding: this.encoding,

package/dist/takomo-stacks-hooks/checksum-hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"checksum-hook.js","sourceRoot":"","sources":["../../src/takomo-stacks-hooks/checksum-hook.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,gDAAyD;AAEzD,MAAa,YAAY;IAKvB,YAAY,MAAW;QAJd,SAAI,GAAG,MAAM,CAAA;QAKpB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;SAC5C;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QAErB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,QAAQ,CAAA;QAC3C,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC9C,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAgB;QAC5B,MAAM,IAAI,GAAG,IAAA,4BAAc,EAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;QAE3D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,yBAAW,EAAC,IAAI,EAAE;YACvC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC,CAAA;QAEF,OAAO;YACL,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;SACZ,CAAA;IACH,CAAC;CACF;AA9BD,oCA8BC"}
+{"version":3,"file":"checksum-hook.js","sourceRoot":"","sources":["../../src/takomo-stacks-hooks/checksum-hook.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,0CAAyD;AAEzD,MAAa,YAAY;IAKvB,YAAY,MAAW;QAJd,SAAI,GAAG,MAAM,CAAA;QAKpB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;SAC5C;QACD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QAErB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,QAAQ,CAAA;QAC3C,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC9C,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAgB;QAC5B,MAAM,IAAI,GAAG,IAAA,sBAAc,EAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;QAE3D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,yBAAW,EAAC,IAAI,EAAE;YACvC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC,CAAA;QAEF,OAAO;YACL,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;SACZ,CAAA;IACH,CAAC;CACF;AA9BD,oCA8BC"}

package/dist/takomo-stacks-hooks/cmd-hook.d.ts

@@ -1,8 +1,5 @@
 import { Hook, HookInput, HookOutput } from "../takomo-stacks-model";
 declare type Capture = "last-line" | "all";
-/**
- * @hidden
- */
 export declare class CmdHook implements Hook {
     readonly command: string;
     readonly cwd?: string;

package/dist/takomo-stacks-hooks/cmd-hook.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdHook = void 0;
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_aws_clients_1 = require("../takomo-aws-clients");
-const takomo_util_1 = require("../takomo-util");
+const exec_1 = require("../utils/exec");
+const files_1 = require("../utils/files");
 const safeEnvVariablePattern = /^[a-zA-Z_]+[a-zA-Z0-9_]*$/;
 const captureValue = (capture, output) => {
     switch (capture) {
@@ -18,9 +19,6 @@ const captureValue = (capture, output) => {
             throw new Error(`Unknown value for capture: ${capture}`);
     }
 };
-/**
- * @hidden
- */
 class CmdHook {
     constructor(config) {
         if (!config.command) {
@@ -39,7 +37,7 @@ class CmdHook {
         const { ctx, status, operation, stage, logger, stack, variables } = input;
         try {
             const cwd = this.cwd
-                ? (0, takomo_util_1.expandFilePath)(ctx.projectDir, this.cwd)
+                ? (0, files_1.expandFilePath)(ctx.projectDir, this.cwd)
                 : ctx.projectDir;
             const hookValues = Object.entries(variables.hooks ?? {})
                 .filter(([hookName]) => {
@@ -75,7 +73,7 @@ class CmdHook {
                 region,
                 additionalVariables,
             });
-            const { stdout, success, error } = await (0, takomo_util_1.executeShellCommand)({
+            const { stdout, success, error } = await (0, exec_1.executeShellCommand)({
                 cwd,
                 env,
                 command: this.command,

package/dist/takomo-stacks-hooks/cmd-hook.js.map

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

package/dist/takomo-stacks-hooks/execute.d.ts

@@ -1,5 +1,5 @@
 import { HookExecutor, HookOperation, HooksExecutionOutput, HookStage, HookStatus, InternalStacksContext, Stack, StackOperationVariables } from "../takomo-stacks-model";
-import { TkmLogger } from "../takomo-util";
+import { TkmLogger } from "../utils/logging";
 interface ExecuteHooksProps {
     readonly ctx: InternalStacksContext;
     readonly stack: Stack;
@@ -10,8 +10,5 @@ interface ExecuteHooksProps {
     readonly logger: TkmLogger;
     readonly status?: HookStatus;
 }
-/**
- * @hidden
- */
 export declare const executeHooks: ({ ctx, stack, variables, hooks, operation, stage, logger, status, }: ExecuteHooksProps) => Promise<HooksExecutionOutput>;
 export {};

package/dist/takomo-stacks-hooks/execute.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeHooks = void 0;
-/**
- * @hidden
- */
 const executeHooks = async ({ ctx, stack, variables, hooks, operation, stage, logger, status, }) => {
     logger.debug(`About to execute hooks (operation: ${operation}, stage: ${stage}, status: ${status})`);
     const input = {

package/dist/takomo-stacks-hooks/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/takomo-stacks-hooks/execute.ts"],"names":[],"mappings":";;;AAuBA;;GAEG;AACI,MAAM,YAAY,GAAG,KAAK,EAAE,EACjC,GAAG,EACH,KAAK,EACL,SAAS,EACT,KAAK,EACL,SAAS,EACT,KAAK,EACL,MAAM,EACN,MAAM,GACY,EAAiC,EAAE;IACrD,MAAM,CAAC,KAAK,CACV,sCAAsC,SAAS,YAAY,KAAK,aAAa,MAAM,GAAG,CACvF,CAAA;IAED,MAAM,KAAK,GAAG;QACZ,GAAG;QACH,KAAK;QACL,SAAS;QACT,KAAK;QACL,SAAS;QACT,MAAM;QACN,MAAM;KACP,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IAE1D,MAAM,CAAC,KAAK,CAAC,SAAS,cAAc,CAAC,MAAM,mBAAmB,CAAC,CAAA;IAE/D,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;QACjC,MAAM,CAAC,KAAK,CACV,uBAAuB,IAAI,CAAC,MAAM,CAAC,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CACtE,CAAA;QAED,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;gBAChC,GAAG,KAAK;gBACR,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;aAChE,CAAC,CAAA;YAEF,MAAM,CAAC,KAAK,CACV,eAAe,IAAI,CAAC,MAAM,CAAC,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,IAAI,4BAA4B,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,OAAO,EAAE,CACxJ,CAAA;YAED,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAA;YAEhD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnB,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,QAAQ;oBACnC,MAAM,EAAE,OAAO;oBACf,KAAK,EAAE,MAAM,CAAC,KAAK;iBACpB,CAAA;aACF;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM;oBACjC,MAAM,EAAE,MAAM;iBACf,CAAA;aACF;SACF;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM,CAAC,KAAK,CACV,iDAAiD,IAAI,CAAC,MAAM,CAAC,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAC/F,KAAK,CACN,CAAA;YACD,OAAO;gBACL,KAAK;gBACL,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,OAAO;aAClC,CAAA;SACF;KACF;IAED,OAAO;QACL,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,UAAU;KACnB,CAAA;AACH,CAAC,CAAA;AA5EY,QAAA,YAAY,gBA4ExB"}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/takomo-stacks-hooks/execute.ts"],"names":[],"mappings":";;;AAuBO,MAAM,YAAY,GAAG,KAAK,EAAE,EACjC,GAAG,EACH,KAAK,EACL,SAAS,EACT,KAAK,EACL,SAAS,EACT,KAAK,EACL,MAAM,EACN,MAAM,GACY,EAAiC,EAAE;IACrD,MAAM,CAAC,KAAK,CACV,sCAAsC,SAAS,YAAY,KAAK,aAAa,MAAM,GAAG,CACvF,CAAA;IAED,MAAM,KAAK,GAAG;QACZ,GAAG;QACH,KAAK;QACL,SAAS;QACT,KAAK;QACL,SAAS;QACT,MAAM;QACN,MAAM;KACP,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IAE1D,MAAM,CAAC,KAAK,CAAC,SAAS,cAAc,CAAC,MAAM,mBAAmB,CAAC,CAAA;IAE/D,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;QACjC,MAAM,CAAC,KAAK,CACV,uBAAuB,IAAI,CAAC,MAAM,CAAC,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CACtE,CAAA;QAED,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;gBAChC,GAAG,KAAK;gBACR,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;aAChE,CAAC,CAAA;YAEF,MAAM,CAAC,KAAK,CACV,eAAe,IAAI,CAAC,MAAM,CAAC,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,IAAI,4BAA4B,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,OAAO,EAAE,CACxJ,CAAA;YAED,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAA;YAEhD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnB,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,QAAQ;oBACnC,MAAM,EAAE,OAAO;oBACf,KAAK,EAAE,MAAM,CAAC,KAAK;iBACpB,CAAA;aACF;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM;oBACjC,MAAM,EAAE,MAAM;iBACf,CAAA;aACF;SACF;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM,CAAC,KAAK,CACV,iDAAiD,IAAI,CAAC,MAAM,CAAC,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAC/F,KAAK,CACN,CAAA;YACD,OAAO;gBACL,KAAK;gBACL,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,OAAO;aAClC,CAAA;SACF;KACF;IAED,OAAO;QACL,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,UAAU;KACnB,CAAA;AACH,CAAC,CAAA;AA5EY,QAAA,YAAY,gBA4ExB"}

package/dist/takomo-stacks-hooks/hook-registry.d.ts

@@ -1,5 +1,6 @@
 import { Hook, HookConfig, HookProvider, HookType } from "../takomo-stacks-model";
-import { FilePath, TkmLogger } from "../takomo-util";
+import { FilePath } from "../utils/files";
+import { TkmLogger } from "../utils/logging";
 export interface HookRegistry {
     readonly initHook: (props: HookConfig) => Promise<Hook>;
     readonly hasProvider: (type: HookType) => boolean;

package/dist/takomo-stacks-hooks/hook-registry.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHookRegistry = void 0;
-const takomo_util_1 = require("../takomo-util");
-class InvalidHookProviderConfigurationError extends takomo_util_1.TakomoError {
+const errors_1 = require("../utils/errors");
+class InvalidHookProviderConfigurationError extends errors_1.TakomoError {
     constructor(sourceDescription, details, options) {
         super(`Invalid hook provider configuration in ${sourceDescription}:\n\n${details}`, options);
     }

package/dist/takomo-stacks-hooks/hook-registry.js.map

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