takomo 5.6.0 → 6.0.0-alpha.1

package/dist/takomo-config-repository-fs/config-sets/config-sets-loader.js

@@ -1,26 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfigSetsFromConfigSetsDir = void 0;
-const ramda_1 = __importDefault(require("ramda"));
-const readdirp_1 = __importDefault(require("readdirp"));
-const constants_1 = require("../../takomo-stacks-model/constants");
-const collections_1 = require("../../utils/collections");
-const loadConfigSetsFromConfigSetsDir = async (configSetsDir) => {
-    const dirs = await readdirp_1.default.promise(configSetsDir, {
+import * as R from "ramda";
+import readdirp from "readdirp";
+import { ROOT_STACK_GROUP_PATH } from "../../takomo-stacks-model/constants.js";
+import { arrayToMap } from "../../utils/collections.js";
+export const loadConfigSetsFromConfigSetsDir = async (configSetsDir) => {
+    const dirs = await readdirp.promise(configSetsDir, {
         alwaysStat: true,
         depth: 1,
         type: "directories",
     });
-    return (0, collections_1.arrayToMap)(dirs.map(ramda_1.default.prop("basename")).map((name) => ({
+    return arrayToMap(dirs.map(R.prop("basename")).map((name) => ({
         name,
         description: "",
         vars: {},
-        commandPaths: [constants_1.ROOT_STACK_GROUP_PATH],
+        commandPaths: [ROOT_STACK_GROUP_PATH],
         legacy: false,
-    })), ramda_1.default.prop("name"));
+    })), R.prop("name"));
 };
-exports.loadConfigSetsFromConfigSetsDir = loadConfigSetsFromConfigSetsDir;
 //# sourceMappingURL=config-sets-loader.js.map

package/dist/takomo-config-repository-fs/config-sets/config-sets-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-sets-loader.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/config-sets/config-sets-loader.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AACrB,wDAA+B;AAE/B,mEAA2E;AAC3E,yDAAoD;AAG7C,MAAM,+BAA+B,GAAG,KAAK,EAClD,aAAuB,EACiB,EAAE;IAC1C,MAAM,IAAI,GAAG,MAAM,kBAAQ,CAAC,OAAO,CAAC,aAAa,EAAE;QACjD,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,aAAa;KACpB,CAAC,CAAA;IAEF,OAAO,IAAA,wBAAU,EACf,IAAI,CAAC,GAAG,CAAC,eAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI;QACJ,WAAW,EAAE,EAAE;QACf,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,CAAC,iCAAqB,CAAC;QACrC,MAAM,EAAE,KAAK;KACd,CAAC,CAAC,EACH,eAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CACf,CAAA;AACH,CAAC,CAAA;AAnBY,QAAA,+BAA+B,mCAmB3C"}
+{"version":3,"file":"config-sets-loader.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/config-sets/config-sets-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;AAC1B,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,aAAuB,EACiB,EAAE;IAC1C,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE;QACjD,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,aAAa;KACpB,CAAC,CAAA;IAEF,OAAO,UAAU,CACf,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI;QACJ,WAAW,EAAE,EAAE;QACf,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,CAAC,qBAAqB,CAAC;QACrC,MAAM,EAAE,KAAK;KACd,CAAC,CAAC,EACH,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CACf,CAAA;AACH,CAAC,CAAA"}

package/dist/takomo-config-repository-fs/constants.d.ts

@@ -1,4 +1,4 @@
-import { FilePath } from "../utils/files";
+import { FilePath } from "../utils/files.js";
 export declare const CONFIG_FILE_EXTENSION = ".yml";
 export declare const TEMPLATES_DIR = "templates";
 export declare const STACKS_DIR = "stacks";
@@ -13,7 +13,8 @@ export declare const CONFIG_SETS_DIR = "config-sets";
 export declare const DEFAULT_DEPLOYMENT_CONFIG_FILE = "targets.yml";
 export declare const STACK_GROUP_CONFIG_FILE_NAME = "config.yml";
 export declare const TAKOMO_PROJECT_CONFIG_FILE_NAME = "takomo.yml";
-export declare const CACHE_DIR = ".takomo-cache";
+export declare const CACHE_DIR = "cache";
+export declare const TMP_DIR = ".takomo";
 export interface ProjectFilePaths {
     readonly projectDir: FilePath;
     readonly stacksDir: FilePath;

package/dist/takomo-config-repository-fs/constants.js

@@ -1,43 +1,37 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectFilePaths = exports.CACHE_DIR = exports.TAKOMO_PROJECT_CONFIG_FILE_NAME = exports.STACK_GROUP_CONFIG_FILE_NAME = exports.DEFAULT_DEPLOYMENT_CONFIG_FILE = exports.CONFIG_SETS_DIR = exports.DEPLOYMENT_DIR = exports.RESOLVERS_DIR = exports.HOOKS_DIR = exports.SCHEMAS_DIR = exports.BLUEPRINTS_DIR = exports.HELPERS_DIR = exports.PARTIALS_DIR = exports.STACKS_DIR = exports.TEMPLATES_DIR = exports.CONFIG_FILE_EXTENSION = void 0;
-const path_1 = __importDefault(require("path"));
-exports.CONFIG_FILE_EXTENSION = ".yml";
-exports.TEMPLATES_DIR = "templates";
-exports.STACKS_DIR = "stacks";
-exports.PARTIALS_DIR = "partials";
-exports.HELPERS_DIR = "helpers";
-exports.BLUEPRINTS_DIR = "blueprints";
-exports.SCHEMAS_DIR = "schemas";
-exports.HOOKS_DIR = "hooks";
-exports.RESOLVERS_DIR = "resolvers";
-exports.DEPLOYMENT_DIR = "deployment";
-exports.CONFIG_SETS_DIR = "config-sets";
-exports.DEFAULT_DEPLOYMENT_CONFIG_FILE = "targets.yml";
-exports.STACK_GROUP_CONFIG_FILE_NAME = "config.yml";
-exports.TAKOMO_PROJECT_CONFIG_FILE_NAME = "takomo.yml";
-exports.CACHE_DIR = ".takomo-cache";
-const createProjectFilePaths = (projectDir) => ({
+import path from "path";
+export const CONFIG_FILE_EXTENSION = ".yml";
+export const TEMPLATES_DIR = "templates";
+export const STACKS_DIR = "stacks";
+export const PARTIALS_DIR = "partials";
+export const HELPERS_DIR = "helpers";
+export const BLUEPRINTS_DIR = "blueprints";
+export const SCHEMAS_DIR = "schemas";
+export const HOOKS_DIR = "hooks";
+export const RESOLVERS_DIR = "resolvers";
+export const DEPLOYMENT_DIR = "deployment";
+export const CONFIG_SETS_DIR = "config-sets";
+export const DEFAULT_DEPLOYMENT_CONFIG_FILE = "targets.yml";
+export const STACK_GROUP_CONFIG_FILE_NAME = "config.yml";
+export const TAKOMO_PROJECT_CONFIG_FILE_NAME = "takomo.yml";
+export const CACHE_DIR = "cache";
+export const TMP_DIR = ".takomo";
+export const createProjectFilePaths = (projectDir) => ({
     projectDir,
-    hooksDir: path_1.default.join(projectDir, exports.HOOKS_DIR),
-    helpersDir: path_1.default.join(projectDir, exports.HELPERS_DIR),
-    partialsDir: path_1.default.join(projectDir, exports.PARTIALS_DIR),
-    resolversDir: path_1.default.join(projectDir, exports.RESOLVERS_DIR),
-    stacksDir: path_1.default.join(projectDir, exports.STACKS_DIR),
-    templatesDir: path_1.default.join(projectDir, exports.TEMPLATES_DIR),
-    schemasDir: path_1.default.join(projectDir, exports.SCHEMAS_DIR),
-    blueprintsDir: path_1.default.join(projectDir, exports.BLUEPRINTS_DIR),
-    projectConfigFile: path_1.default.join(projectDir, exports.TAKOMO_PROJECT_CONFIG_FILE_NAME),
-    projectConfigFileName: exports.TAKOMO_PROJECT_CONFIG_FILE_NAME,
-    stackGroupConfigFileName: exports.STACK_GROUP_CONFIG_FILE_NAME,
-    configFileExtension: exports.CONFIG_FILE_EXTENSION,
-    defaultDeploymentConfigFileName: exports.DEFAULT_DEPLOYMENT_CONFIG_FILE,
-    deploymentDir: path_1.default.join(projectDir, exports.DEPLOYMENT_DIR),
-    configSetsDir: path_1.default.join(projectDir, exports.CONFIG_SETS_DIR),
-    cacheDir: path_1.default.join(projectDir, exports.CACHE_DIR),
+    hooksDir: path.join(projectDir, HOOKS_DIR),
+    helpersDir: path.join(projectDir, HELPERS_DIR),
+    partialsDir: path.join(projectDir, PARTIALS_DIR),
+    resolversDir: path.join(projectDir, RESOLVERS_DIR),
+    stacksDir: path.join(projectDir, STACKS_DIR),
+    templatesDir: path.join(projectDir, TEMPLATES_DIR),
+    schemasDir: path.join(projectDir, SCHEMAS_DIR),
+    blueprintsDir: path.join(projectDir, BLUEPRINTS_DIR),
+    projectConfigFile: path.join(projectDir, TAKOMO_PROJECT_CONFIG_FILE_NAME),
+    projectConfigFileName: TAKOMO_PROJECT_CONFIG_FILE_NAME,
+    stackGroupConfigFileName: STACK_GROUP_CONFIG_FILE_NAME,
+    configFileExtension: CONFIG_FILE_EXTENSION,
+    defaultDeploymentConfigFileName: DEFAULT_DEPLOYMENT_CONFIG_FILE,
+    deploymentDir: path.join(projectDir, DEPLOYMENT_DIR),
+    configSetsDir: path.join(projectDir, CONFIG_SETS_DIR),
+    cacheDir: path.join(projectDir, TMP_DIR, CACHE_DIR),
 });
-exports.createProjectFilePaths = createProjectFilePaths;
 //# sourceMappingURL=constants.js.map

package/dist/takomo-config-repository-fs/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/takomo-config-repository-fs/constants.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAGV,QAAA,qBAAqB,GAAG,MAAM,CAAA;AAC9B,QAAA,aAAa,GAAG,WAAW,CAAA;AAC3B,QAAA,UAAU,GAAG,QAAQ,CAAA;AACrB,QAAA,YAAY,GAAG,UAAU,CAAA;AACzB,QAAA,WAAW,GAAG,SAAS,CAAA;AACvB,QAAA,cAAc,GAAG,YAAY,CAAA;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAA;AACvB,QAAA,SAAS,GAAG,OAAO,CAAA;AACnB,QAAA,aAAa,GAAG,WAAW,CAAA;AAC3B,QAAA,cAAc,GAAG,YAAY,CAAA;AAC7B,QAAA,eAAe,GAAG,aAAa,CAAA;AAC/B,QAAA,8BAA8B,GAAG,aAAa,CAAA;AAC9C,QAAA,4BAA4B,GAAG,YAAY,CAAA;AAC3C,QAAA,+BAA+B,GAAG,YAAY,CAAA;AAC9C,QAAA,SAAS,GAAG,eAAe,CAAA;AAsBjC,MAAM,sBAAsB,GAAG,CACpC,UAAoB,EACF,EAAE,CAAC,CAAC;IACtB,UAAU;IACV,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAS,CAAC;IAC1C,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAW,CAAC;IAC9C,WAAW,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAY,CAAC;IAChD,YAAY,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,qBAAa,CAAC;IAClD,SAAS,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAU,CAAC;IAC5C,YAAY,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,qBAAa,CAAC;IAClD,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAW,CAAC;IAC9C,aAAa,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,sBAAc,CAAC;IACpD,iBAAiB,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,uCAA+B,CAAC;IACzE,qBAAqB,EAAE,uCAA+B;IACtD,wBAAwB,EAAE,oCAA4B;IACtD,mBAAmB,EAAE,6BAAqB;IAC1C,+BAA+B,EAAE,sCAA8B;IAC/D,aAAa,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,sBAAc,CAAC;IACpD,aAAa,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAe,CAAC;IACrD,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAS,CAAC;CAC3C,CAAC,CAAA;AApBW,QAAA,sBAAsB,0BAoBjC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/takomo-config-repository-fs/constants.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AAGvB,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAA;AAC3C,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAA;AACxC,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAA;AAClC,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAA;AACtC,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAA;AACpC,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAA;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAA;AACpC,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAA;AAChC,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAA;AACxC,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAA;AAC1C,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAA;AAC5C,MAAM,CAAC,MAAM,8BAA8B,GAAG,aAAa,CAAA;AAC3D,MAAM,CAAC,MAAM,4BAA4B,GAAG,YAAY,CAAA;AACxD,MAAM,CAAC,MAAM,+BAA+B,GAAG,YAAY,CAAA;AAC3D,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAA;AAChC,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAA;AAsBhC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,UAAoB,EACF,EAAE,CAAC,CAAC;IACtB,UAAU;IACV,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;IAC1C,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC;IAC9C,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC;IAChD,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC;IAClD,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC;IAC5C,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC;IAClD,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC;IAC9C,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC;IACpD,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,+BAA+B,CAAC;IACzE,qBAAqB,EAAE,+BAA+B;IACtD,wBAAwB,EAAE,4BAA4B;IACtD,mBAAmB,EAAE,qBAAqB;IAC1C,+BAA+B,EAAE,8BAA8B;IAC/D,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC;IACpD,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC;IACrD,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC;CACpD,CAAC,CAAA"}

package/dist/takomo-config-repository-fs/context/build-variables.d.ts

@@ -1,4 +1,4 @@
-import { Variables } from "../../common/model";
-import { FilePath } from "../../utils/files";
-import { VarFileOption } from "../../utils/variables";
+import { Variables } from "../../common/model.js";
+import { FilePath } from "../../utils/files.js";
+import { VarFileOption } from "../../utils/variables.js";
 export declare const buildVariables: (projectDir: FilePath, varFileOptions: ReadonlyArray<VarFileOption>, vars: Record<string, unknown>, envFilePaths: ReadonlyArray<FilePath>) => Promise<Variables>;

package/dist/takomo-config-repository-fs/context/build-variables.js

@@ -1,24 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildVariables = void 0;
-const dotenv_1 = __importDefault(require("dotenv"));
-const dotenv_expand_1 = __importDefault(require("dotenv-expand"));
-const errors_1 = require("../../utils/errors");
-const files_1 = require("../../utils/files");
-const objects_1 = require("../../utils/objects");
-const variables_1 = require("../../utils/variables");
+import * as dotenv from "dotenv";
+import * as dotenvExpand from "dotenv-expand";
+import { TakomoError } from "../../utils/errors.js";
+import { expandFilePath, fileExists, readFileContents, } from "../../utils/files.js";
+import { merge } from "../../utils/objects.js";
+import { loadVariablesFromFiles } from "../../utils/variables.js";
 const overrideEnvironmentVariablesFromEnvironmentVariablesFiles = async (projectDir, envArray) => {
     for (const envArg of envArray) {
-        const pathToEnvVarsFile = (0, files_1.expandFilePath)(projectDir, envArg);
-        if (!(await (0, files_1.fileExists)(pathToEnvVarsFile))) {
-            throw new errors_1.TakomoError(`Environment variables file ${pathToEnvVarsFile} not found`);
+        const pathToEnvVarsFile = expandFilePath(projectDir, envArg);
+        if (!(await fileExists(pathToEnvVarsFile))) {
+            throw new TakomoError(`Environment variables file ${pathToEnvVarsFile} not found`);
         }
-        const contents = await (0, files_1.readFileContents)(pathToEnvVarsFile);
-        const envConfig = dotenv_1.default.parse(contents);
-        (0, dotenv_expand_1.default)(envConfig);
+        const contents = await readFileContents(pathToEnvVarsFile);
+        const envConfig = dotenv.parse(contents);
+        dotenvExpand.expand(envConfig);
         for (const k in envConfig) {
             process.env[k] = envConfig[k];
         }
@@ -30,9 +24,9 @@ const loadEnvironmentVariables = () => Object.keys(process.env).reduce((collecte
 const loadContextVariables = (projectDir) => ({
     projectDir,
 });
-const buildVariables = async (projectDir, varFileOptions, vars, envFilePaths) => {
-    const fileVars = await (0, variables_1.loadVariablesFromFiles)(projectDir, varFileOptions);
-    const mergedVars = (0, objects_1.merge)(fileVars, vars);
+export const buildVariables = async (projectDir, varFileOptions, vars, envFilePaths) => {
+    const fileVars = await loadVariablesFromFiles(projectDir, varFileOptions);
+    const mergedVars = merge(fileVars, vars);
     await overrideEnvironmentVariablesFromEnvironmentVariablesFiles(projectDir, envFilePaths);
     const env = loadEnvironmentVariables();
     const context = loadContextVariables(projectDir);
@@ -42,5 +36,4 @@ const buildVariables = async (projectDir, varFileOptions, vars, envFilePaths) =>
         context,
     };
 };
-exports.buildVariables = buildVariables;
 //# sourceMappingURL=build-variables.js.map

package/dist/takomo-config-repository-fs/context/build-variables.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-variables.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/context/build-variables.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAC3B,kEAAwC;AAExC,+CAAgD;AAChD,6CAK0B;AAC1B,iDAA2C;AAC3C,qDAA6E;AAE7E,MAAM,yDAAyD,GAAG,KAAK,EACrE,UAAoB,EACpB,QAAiC,EAClB,EAAE;IACjB,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;QAC7B,MAAM,iBAAiB,GAAG,IAAA,sBAAc,EAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QAE5D,IAAI,CAAC,CAAC,MAAM,IAAA,kBAAU,EAAC,iBAAiB,CAAC,CAAC,EAAE;YAC1C,MAAM,IAAI,oBAAW,CACnB,8BAA8B,iBAAiB,YAAY,CAC5D,CAAA;SACF;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAgB,EAAC,iBAAiB,CAAC,CAAA;QAC1D,MAAM,SAAS,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACxC,IAAA,uBAAY,EAAC,SAAS,CAAC,CAAA;QAEvB,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;YACzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;SAC9B;KACF;AACH,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,GAAQ,EAAE,CACzC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE;IACjD,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAA;AAClD,CAAC,EAAE,EAAE,CAAC,CAAA;AAER,MAAM,oBAAoB,GAAG,CAAC,UAAoB,EAAe,EAAE,CAAC,CAAC;IACnE,UAAU;CACX,CAAC,CAAA;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,UAAoB,EACpB,cAA4C,EAC5C,IAA6B,EAC7B,YAAqC,EACjB,EAAE;IACtB,MAAM,QAAQ,GAAG,MAAM,IAAA,kCAAsB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,IAAA,eAAK,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAExC,MAAM,yDAAyD,CAC7D,UAAU,EACV,YAAY,CACb,CAAA;IAED,MAAM,GAAG,GAAG,wBAAwB,EAAE,CAAA;IACtC,MAAM,OAAO,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAA;IAChD,OAAO;QACL,GAAG;QACH,GAAG,EAAE,UAAU;QACf,OAAO;KACR,CAAA;AACH,CAAC,CAAA;AArBY,QAAA,cAAc,kBAqB1B"}
+{"version":3,"file":"build-variables.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/context/build-variables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAChC,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EACL,cAAc,EACd,UAAU,EAEV,gBAAgB,GACjB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAAiB,MAAM,0BAA0B,CAAA;AAEhF,MAAM,yDAAyD,GAAG,KAAK,EACrE,UAAoB,EACpB,QAAiC,EAClB,EAAE;IACjB,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;QAC7B,MAAM,iBAAiB,GAAG,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QAE5D,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,iBAAiB,CAAC,CAAC,EAAE;YAC1C,MAAM,IAAI,WAAW,CACnB,8BAA8B,iBAAiB,YAAY,CAC5D,CAAA;SACF;QAED,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,CAAA;QAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACxC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAE9B,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;YACzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;SAC9B;KACF;AACH,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,GAAQ,EAAE,CACzC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE;IACjD,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAA;AAClD,CAAC,EAAE,EAAE,CAAC,CAAA;AAER,MAAM,oBAAoB,GAAG,CAAC,UAAoB,EAAe,EAAE,CAAC,CAAC;IACnE,UAAU;CACX,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,UAAoB,EACpB,cAA4C,EAC5C,IAA6B,EAC7B,YAAqC,EACjB,EAAE;IACtB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAExC,MAAM,yDAAyD,CAC7D,UAAU,EACV,YAAY,CACb,CAAA;IAED,MAAM,GAAG,GAAG,wBAAwB,EAAE,CAAA;IACtC,MAAM,OAAO,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAA;IAChD,OAAO;QACL,GAAG;QACH,GAAG,EAAE,UAAU;QACf,OAAO;KACR,CAAA;AACH,CAAC,CAAA"}

package/dist/takomo-config-repository-fs/context/create-file-system-command-context.d.ts

@@ -1,12 +1,12 @@
-import { Credentials } from "@aws-sdk/types";
-import { InternalAwsClientProvider } from "../../aws/aws-client-provider";
-import { Features } from "../../config/project-config";
-import { InternalCommandContext, TakomoBuildInfo } from "../../context/command-context";
-import { OutputFormat } from "../../takomo-core/command";
-import { FilePath } from "../../utils/files";
-import { LogLevel, TkmLogger } from "../../utils/logging";
-import { VarFileOption } from "../../utils/variables";
-import { ProjectFilePaths } from "../constants";
+import { AwsCredentialIdentity } from "@aws-sdk/types";
+import { InternalAwsClientProvider } from "../../aws/aws-client-provider.js";
+import { Features } from "../../config/project-config.js";
+import { InternalCommandContext, TakomoBuildInfo } from "../../context/command-context.js";
+import { OutputFormat } from "../../takomo-core/command.js";
+import { FilePath } from "../../utils/files.js";
+import { LogLevel, TkmLogger } from "../../utils/logging.js";
+import { VarFileOption } from "../../utils/variables.js";
+import { ProjectFilePaths } from "../constants.js";
 export interface FileSystemCommandContext extends InternalCommandContext {
     readonly filePaths: ProjectFilePaths;
 }
@@ -23,7 +23,7 @@ export interface CreateFileSystemCommandContextProps {
     readonly projectDir: FilePath;
     readonly awsClientProvider: InternalAwsClientProvider;
     readonly overrideFeatures: Partial<Features>;
-    readonly credentials?: Credentials;
+    readonly credentials?: AwsCredentialIdentity;
     readonly vars: Record<string, any>;
     readonly varFilePaths: ReadonlyArray<VarFileOption>;
     readonly envFilePaths: ReadonlyArray<FilePath>;

package/dist/takomo-config-repository-fs/context/create-file-system-command-context.js

@@ -1,26 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFileSystemCommandContext = void 0;
-const esbuild_1 = require("esbuild");
-const project_config_parser_1 = require("../../parser/project-config-parser");
-const files_1 = require("../../utils/files");
-const constants_1 = require("../constants");
-const build_variables_1 = require("./build-variables");
-const createFileSystemCommandContext = async (props) => {
+import { build } from "esbuild";
+import { loadProjectConfig } from "../../parser/project-config-parser.js";
+import { fileExists } from "../../utils/files.js";
+import { createProjectFilePaths } from "../constants.js";
+import { buildVariables } from "./build-variables.js";
+export const createFileSystemCommandContext = async (props) => {
     const { quiet, outputFormat, logLevel, autoConfirmEnabled, statisticsEnabled, confidentialValuesLoggingEnabled, iamGeneratePoliciesInstructionsEnabled, credentials, buildInfo, projectDir, awsClientProvider, overrideFeatures, vars, varFilePaths, envFilePaths, resetCache, logger, } = props;
-    const filePaths = (0, constants_1.createProjectFilePaths)(projectDir);
-    const projectConfig = await (0, project_config_parser_1.loadProjectConfig)(projectDir, filePaths.projectConfigFile, overrideFeatures);
+    const filePaths = createProjectFilePaths(projectDir);
+    const projectConfig = await loadProjectConfig(projectDir, filePaths.projectConfigFile, overrideFeatures);
     logger.debugObject("Project config:", projectConfig);
     if (projectConfig.esbuild && projectConfig.esbuild.enabled) {
-        if (await (0, files_1.fileExists)(projectConfig.esbuild.entryPoint)) {
+        if (await fileExists(projectConfig.esbuild.entryPoint)) {
             logger.debug(`Compile typescript project config file: ${projectConfig.esbuild.entryPoint}`);
-            await (0, esbuild_1.build)({
+            await build({
                 write: true,
                 bundle: true,
                 sourcemap: true,
                 platform: "node",
                 logLevel: "error",
-                target: "node16.17.0",
+                target: "node18.14.2",
+                format: "esm",
                 outfile: projectConfig.esbuild.outFile,
                 entryPoints: [projectConfig.esbuild.entryPoint],
             });
@@ -34,7 +32,7 @@ const createFileSystemCommandContext = async (props) => {
         filePath,
     }));
     const allVarFilePaths = [...projectVarFilePaths, ...varFilePaths];
-    const variables = await (0, build_variables_1.buildVariables)(projectDir, allVarFilePaths, vars, envFilePaths);
+    const variables = await buildVariables(projectDir, allVarFilePaths, vars, envFilePaths);
     return {
         variables,
         projectDir,
@@ -54,5 +52,4 @@ const createFileSystemCommandContext = async (props) => {
         filePaths,
     };
 };
-exports.createFileSystemCommandContext = createFileSystemCommandContext;
 //# sourceMappingURL=create-file-system-command-context.js.map

package/dist/takomo-config-repository-fs/context/create-file-system-command-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-file-system-command-context.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/context/create-file-system-command-context.ts"],"names":[],"mappings":";;;AACA,qCAA+B;AAO/B,8EAAsE;AAEtE,6CAAwD;AAGxD,4CAAuE;AACvE,uDAAkD;AA0B3C,MAAM,8BAA8B,GAAG,KAAK,EACjD,KAA0C,EACP,EAAE;IACrC,MAAM,EACJ,KAAK,EACL,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,iBAAiB,EACjB,gCAAgC,EAChC,sCAAsC,EACtC,WAAW,EACX,SAAS,EACT,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,IAAI,EACJ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,MAAM,GACP,GAAG,KAAK,CAAA;IAET,MAAM,SAAS,GAAG,IAAA,kCAAsB,EAAC,UAAU,CAAC,CAAA;IAEpD,MAAM,aAAa,GAAG,MAAM,IAAA,yCAAiB,EAC3C,UAAU,EACV,SAAS,CAAC,iBAAiB,EAC3B,gBAAgB,CACjB,CAAA;IAED,MAAM,CAAC,WAAW,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;IAEpD,IAAI,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE;QAC1D,IAAI,MAAM,IAAA,kBAAU,EAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACtD,MAAM,CAAC,KAAK,CACV,2CAA2C,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,CAC9E,CAAA;YAED,MAAM,IAAA,eAAK,EAAC;gBACV,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE,MAAM;gBAChB,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,aAAa;gBACrB,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO;gBACtC,WAAW,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC;aAChD,CAAC,CAAA;SACH;aAAM;YACL,MAAM,CAAC,KAAK,CACV,oDAAoD,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,CACvF,CAAA;SACF;KACF;IAED,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IAE7C,MAAM,mBAAmB,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACpE,QAAQ;KACT,CAAC,CAAC,CAAA;IAEH,MAAM,eAAe,GAAG,CAAC,GAAG,mBAAmB,EAAE,GAAG,YAAY,CAAC,CAAA;IAEjE,MAAM,SAAS,GAAG,MAAM,IAAA,gCAAc,EACpC,UAAU,EACV,eAAe,EACf,IAAI,EACJ,YAAY,CACb,CAAA;IAED,OAAO;QACL,SAAS;QACT,UAAU;QACV,KAAK;QACL,UAAU;QACV,YAAY;QACZ,QAAQ;QACR,kBAAkB;QAClB,iBAAiB;QACjB,sCAAsC;QACtC,gCAAgC;QAChC,WAAW;QACX,SAAS;QACT,iBAAiB;QACjB,aAAa;QACb,OAAO;QACP,SAAS;KACV,CAAA;AACH,CAAC,CAAA;AAzFY,QAAA,8BAA8B,kCAyF1C"}
+{"version":3,"file":"create-file-system-command-context.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/context/create-file-system-command-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAO/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAEzE,OAAO,EAAE,UAAU,EAAY,MAAM,sBAAsB,CAAA;AAG3D,OAAO,EAAE,sBAAsB,EAAoB,MAAM,iBAAiB,CAAA;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AA0BrD,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EACjD,KAA0C,EACP,EAAE;IACrC,MAAM,EACJ,KAAK,EACL,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,iBAAiB,EACjB,gCAAgC,EAChC,sCAAsC,EACtC,WAAW,EACX,SAAS,EACT,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,IAAI,EACJ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,MAAM,GACP,GAAG,KAAK,CAAA;IAET,MAAM,SAAS,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAA;IAEpD,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAC3C,UAAU,EACV,SAAS,CAAC,iBAAiB,EAC3B,gBAAgB,CACjB,CAAA;IAED,MAAM,CAAC,WAAW,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;IAEpD,IAAI,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE;QAC1D,IAAI,MAAM,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACtD,MAAM,CAAC,KAAK,CACV,2CAA2C,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,CAC9E,CAAA;YAED,MAAM,KAAK,CAAC;gBACV,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE,MAAM;gBAChB,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,aAAa;gBACrB,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO;gBACtC,WAAW,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC;aAChD,CAAC,CAAA;SACH;aAAM;YACL,MAAM,CAAC,KAAK,CACV,oDAAoD,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,CACvF,CAAA;SACF;KACF;IAED,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IAE7C,MAAM,mBAAmB,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACpE,QAAQ;KACT,CAAC,CAAC,CAAA;IAEH,MAAM,eAAe,GAAG,CAAC,GAAG,mBAAmB,EAAE,GAAG,YAAY,CAAC,CAAA;IAEjE,MAAM,SAAS,GAAG,MAAM,cAAc,CACpC,UAAU,EACV,eAAe,EACf,IAAI,EACJ,YAAY,CACb,CAAA;IAED,OAAO;QACL,SAAS;QACT,UAAU;QACV,KAAK;QACL,UAAU;QACV,YAAY;QACZ,QAAQ;QACR,kBAAkB;QAClB,iBAAiB;QACjB,sCAAsC;QACtC,gCAAgC;QAChC,WAAW;QACX,SAAS;QACT,iBAAiB;QACjB,aAAa;QACb,OAAO;QACP,SAAS;KACV,CAAA;AACH,CAAC,CAAA"}

package/dist/takomo-config-repository-fs/deployment-targets/config-repository.d.ts

@@ -1,7 +1,7 @@
-import { CredentialManager } from "../../aws/common/credentials";
-import { DeploymentTargetsConfigRepository } from "../../context/targets-context";
-import { FilePath } from "../../utils/files";
-import { FileSystemStacksConfigRepositoryProps } from "../stacks/config-repository";
+import { CredentialManager } from "../../aws/common/credentials.js";
+import { DeploymentTargetsConfigRepository } from "../../context/targets-context.js";
+import { FilePath } from "../../utils/files.js";
+import { FileSystemStacksConfigRepositoryProps } from "../stacks/config-repository.js";
 interface FileSystemDeploymentTargetsConfigRepositoryProps extends FileSystemStacksConfigRepositoryProps {
     readonly pathToDeploymentConfigFile?: FilePath;
     readonly deploymentDir: FilePath;

package/dist/takomo-config-repository-fs/deployment-targets/config-repository.js

@@ -1,34 +1,28 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFileSystemDeploymentTargetsConfigRepository = void 0;
-const path_1 = require("path");
-const ramda_1 = __importDefault(require("ramda"));
-const hook_registry_1 = require("../../hooks/hook-registry");
-const resolver_registry_1 = require("../../resolvers/resolver-registry");
-const takomo_deployment_targets_repository_1 = require("../../takomo-deployment-targets-repository");
-const build_deployment_config_1 = require("../../parser/targets/build-deployment-config");
-const targets_model_1 = require("../../targets/targets-model");
-const errors_1 = require("../../utils/errors");
-const files_1 = require("../../utils/files");
-const cache_1 = require("../cache");
-const config_sets_loader_1 = require("../config-sets/config-sets-loader");
-const config_repository_1 = require("../stacks/config-repository");
-const merge_deployment_target_configs_1 = require("./merge-deployment-target-configs");
-const parser_1 = require("./parser");
+import { basename, join } from "path";
+import * as R from "ramda";
+import { createHookRegistry } from "../../hooks/hook-registry.js";
+import { ResolverRegistry } from "../../resolvers/resolver-registry.js";
+import { createDeploymentTargetConfigItemSchema, createDeploymentTargetRepositoryRegistry, createFileSystemDeploymentTargetRepositoryProvider, createOrganizationDeploymentTargetRepositoryProvider, } from "../../takomo-deployment-targets-repository/index.js";
+import { buildDeploymentConfig } from "../../parser/targets/build-deployment-config.js";
+import { createDeploymentTargetsSchemaRegistry, } from "../../targets/targets-model.js";
+import { TakomoError } from "../../utils/errors.js";
+import { dirExists } from "../../utils/files.js";
+import { createFileSystemCache } from "../cache.js";
+import { loadConfigSetsFromConfigSetsDir } from "../config-sets/config-sets-loader.js";
+import { createFileSystemStacksConfigRepository, } from "../stacks/config-repository.js";
+import { mergeDeploymentTargetConfigs } from "./merge-deployment-target-configs.js";
+import { parseConfigFile } from "./parser.js";
 const resolveConfigFilePath = (deploymentDir, pathToConfigFile) => pathToConfigFile.startsWith("/")
     ? pathToConfigFile
-    : (0, path_1.join)(deploymentDir, pathToConfigFile);
+    : join(deploymentDir, pathToConfigFile);
 const initDeploymentTargetsRepositories = async (ctx, logger, templateEngine, credentialManager, cache) => {
     const repositoryConfigs = ctx.projectConfig?.deploymentTargets?.repository ?? [];
     if (repositoryConfigs.length === 0) {
         return [];
     }
-    const registry = (0, takomo_deployment_targets_repository_1.createDeploymentTargetRepositoryRegistry)();
-    registry.registerDeploymentTargetRepositoryProvider("filesystem", (0, takomo_deployment_targets_repository_1.createFileSystemDeploymentTargetRepositoryProvider)());
-    registry.registerDeploymentTargetRepositoryProvider("organization", (0, takomo_deployment_targets_repository_1.createOrganizationDeploymentTargetRepositoryProvider)());
+    const registry = createDeploymentTargetRepositoryRegistry();
+    registry.registerDeploymentTargetRepositoryProvider("filesystem", createFileSystemDeploymentTargetRepositoryProvider());
+    registry.registerDeploymentTargetRepositoryProvider("organization", createOrganizationDeploymentTargetRepositoryProvider());
     return Promise.all(repositoryConfigs.map((config) => registry.initDeploymentTargetRepository({
         logger,
         ctx,
@@ -45,7 +39,7 @@ const loadExternallyPersistedDeploymentTargets = async (ctx, logger, templateEng
     }
     const deploymentTargetsList = await Promise.all(repositories.map((r) => r.listDeploymentTargets()));
     const deploymentTargets = deploymentTargetsList.flat();
-    const schema = (0, takomo_deployment_targets_repository_1.createDeploymentTargetConfigItemSchema)({
+    const schema = createDeploymentTargetConfigItemSchema({
         regions: ctx.regions,
     });
     deploymentTargets.forEach((wrapper) => {
@@ -55,57 +49,56 @@ const loadExternallyPersistedDeploymentTargets = async (ctx, logger, templateEng
         });
         if (error) {
             const details = error.details.map((m) => `  - ${m.message}`).join("\n");
-            throw new errors_1.TakomoError(`Validation errors in deployment target configuration '${wrapper.source}':\n\n${details}`);
+            throw new TakomoError(`Validation errors in deployment target configuration '${wrapper.source}':\n\n${details}`);
         }
     });
-    const mergedDeploymentTargets = (0, merge_deployment_target_configs_1.mergeDeploymentTargetConfigs)(deploymentTargets.map(ramda_1.default.prop("item")));
-    return new Map(Array.from(Object.entries(ramda_1.default.groupBy(ramda_1.default.prop("deploymentGroupPath"), mergedDeploymentTargets))));
+    const mergedDeploymentTargets = mergeDeploymentTargetConfigs(deploymentTargets.map(R.prop("item")));
+    return new Map(Array.from(Object.entries(R.groupBy(R.prop("deploymentGroupPath"), mergedDeploymentTargets))));
 };
-const createFileSystemDeploymentTargetsConfigRepository = async (props) => {
-    const stacksConfigRepository = await (0, config_repository_1.createFileSystemStacksConfigRepository)(props);
+export const createFileSystemDeploymentTargetsConfigRepository = async (props) => {
+    const stacksConfigRepository = await createFileSystemStacksConfigRepository(props);
     const { projectDir, defaultDeploymentConfigFileName, deploymentDir, configSetsDir, pathToDeploymentConfigFile, logger, ctx, stacksDir, credentialManager, cacheDir, } = props;
-    const cache = (0, cache_1.createFileSystemCache)(logger, cacheDir);
+    const cache = createFileSystemCache(logger, cacheDir);
     if (ctx.resetCache) {
         await cache.reset();
     }
-    const hookRegistry = (0, hook_registry_1.createHookRegistry)({ logger });
-    const resolverRegistry = new resolver_registry_1.ResolverRegistry(logger);
-    const schemaRegistry = (0, targets_model_1.createDeploymentTargetsSchemaRegistry)(logger);
+    const hookRegistry = createHookRegistry({ logger });
+    const resolverRegistry = new ResolverRegistry(logger);
+    const schemaRegistry = createDeploymentTargetsSchemaRegistry(logger);
     await stacksConfigRepository.loadExtensions(resolverRegistry, hookRegistry, schemaRegistry);
     return {
         ...stacksConfigRepository,
         createStacksConfigRepository: async (configSetName, legacy) => {
             const configSetStacksDir = legacy
                 ? stacksDir
-                : (0, path_1.join)(configSetsDir, configSetName);
-            if (!(await (0, files_1.dirExists)(configSetStacksDir))) {
+                : join(configSetsDir, configSetName);
+            if (!(await dirExists(configSetStacksDir))) {
                 throw new Error(`Config set directory not found: ${configSetStacksDir}`);
             }
-            return (0, config_repository_1.createFileSystemStacksConfigRepository)({
+            return createFileSystemStacksConfigRepository({
                 ...props,
                 stacksDir: configSetStacksDir,
             });
         },
         getDeploymentConfig: async () => {
-            if (!(await (0, files_1.dirExists)(deploymentDir))) {
-                throw new errors_1.TakomoError(`Takomo deployment dir '${(0, path_1.basename)(deploymentDir)}' not found from the project dir ${projectDir}`);
+            if (!(await dirExists(deploymentDir))) {
+                throw new TakomoError(`Takomo deployment dir '${basename(deploymentDir)}' not found from the project dir ${projectDir}`);
             }
             const configFile = pathToDeploymentConfigFile
                 ? resolveConfigFilePath(deploymentDir, pathToDeploymentConfigFile)
-                : (0, path_1.join)(deploymentDir, defaultDeploymentConfigFileName);
-            const parsedFile = await (0, parser_1.parseConfigFile)(ctx, logger, stacksConfigRepository.templateEngine, configFile);
+                : join(deploymentDir, defaultDeploymentConfigFileName);
+            const parsedFile = await parseConfigFile(ctx, logger, stacksConfigRepository.templateEngine, configFile);
             const externalDeploymentTargets = await loadExternallyPersistedDeploymentTargets(ctx, logger, stacksConfigRepository.templateEngine, credentialManager, cache);
-            const externalConfigSets = await (0, config_sets_loader_1.loadConfigSetsFromConfigSetsDir)(configSetsDir);
-            const result = await (0, build_deployment_config_1.buildDeploymentConfig)(ctx, logger, schemaRegistry, externalDeploymentTargets, externalConfigSets, parsedFile);
+            const externalConfigSets = await loadConfigSetsFromConfigSetsDir(configSetsDir);
+            const result = await buildDeploymentConfig(ctx, logger, schemaRegistry, externalDeploymentTargets, externalConfigSets, parsedFile);
             if (result.isOk()) {
                 return result.value;
             }
             const details = result.error.messages
                 .map((m) => `  - ${m}`)
                 .join("\n");
-            throw new errors_1.TakomoError(`Validation errors in deployment targets configuration file ${configFile}:\n\n${details}`);
+            throw new TakomoError(`Validation errors in deployment targets configuration file ${configFile}:\n\n${details}`);
         },
     };
 };
-exports.createFileSystemDeploymentTargetsConfigRepository = createFileSystemDeploymentTargetsConfigRepository;
 //# sourceMappingURL=config-repository.js.map

package/dist/takomo-config-repository-fs/deployment-targets/config-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/config-repository.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAqC;AACrC,kDAAqB;AACrB,6DAA8D;AAC9D,yEAAoE;AACpE,qGAMmD;AASnD,0FAAoF;AACpF,+DAGoC;AAEpC,+CAAgD;AAChD,6CAAuD;AAEvD,oCAAgD;AAChD,0EAAmF;AACnF,mEAGoC;AACpC,uFAAgF;AAChF,qCAA0C;AAW1C,MAAM,qBAAqB,GAAG,CAC5B,aAAuB,EACvB,gBAA0B,EAChB,EAAE,CACZ,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC;IAC9B,CAAC,CAAC,gBAAgB;IAClB,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;AAE3C,MAAM,iCAAiC,GAAG,KAAK,EAC7C,GAA2B,EAC3B,MAAiB,EACjB,cAA8B,EAC9B,iBAAoC,EACpC,KAAY,EACwC,EAAE;IACtD,MAAM,iBAAiB,GACrB,GAAG,CAAC,aAAa,EAAE,iBAAiB,EAAE,UAAU,IAAI,EAAE,CAAA;IAExD,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAA;KACV;IAED,MAAM,QAAQ,GAAG,IAAA,+EAAwC,GAAE,CAAA;IAC3D,QAAQ,CAAC,0CAA0C,CACjD,YAAY,EACZ,IAAA,yFAAkD,GAAE,CACrD,CAAA;IAED,QAAQ,CAAC,0CAA0C,CACjD,cAAc,EACd,IAAA,2FAAoD,GAAE,CACvD,CAAA;IAED,OAAO,OAAO,CAAC,GAAG,CAChB,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC/B,QAAQ,CAAC,8BAA8B,CAAC;QACtC,MAAM;QACN,GAAG;QACH,cAAc;QACd,MAAM;QACN,iBAAiB;QACjB,KAAK;KACN,CAAC,CACH,CACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,wCAAwC,GAAG,KAAK,EACpD,GAA2B,EAC3B,MAAiB,EACjB,cAA8B,EAC9B,iBAAoC,EACpC,KAAY,EAC+C,EAAE;IAC7D,MAAM,YAAY,GAAG,MAAM,iCAAiC,CAC1D,GAAG,EACH,MAAM,EACN,cAAc,EACd,iBAAiB,EACjB,KAAK,CACN,CAAA;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,IAAI,GAAG,EAAE,CAAA;KACjB;IAED,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7C,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,EAAE,CAAC,CACnD,CAAA;IAED,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,IAAI,EAAE,CAAA;IAEtD,MAAM,MAAM,GAAG,IAAA,6EAAsC,EAAC;QACpD,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC,CAAA;IAEF,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACpC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE;YAC9C,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE,KAAK;SACf,CAAC,CAAA;QACF,IAAI,KAAK,EAAE;YACT,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACvE,MAAM,IAAI,oBAAW,CACnB,yDAAyD,OAAO,CAAC,MAAM,SAAS,OAAO,EAAE,CAC1F,CAAA;SACF;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,uBAAuB,GAAG,IAAA,8DAA4B,EAC1D,iBAAiB,CAAC,GAAG,CAAC,eAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CACtC,CAAA;IAED,OAAO,IAAI,GAAG,CACZ,KAAK,CAAC,IAAI,CACR,MAAM,CAAC,OAAO,CACZ,eAAC,CAAC,OAAO,CAAC,eAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,uBAAuB,CAAC,CAClE,CACF,CACF,CAAA;AACH,CAAC,CAAA;AAEM,MAAM,iDAAiD,GAAG,KAAK,EACpE,KAAuD,EACX,EAAE;IAC9C,MAAM,sBAAsB,GAAG,MAAM,IAAA,0DAAsC,EACzE,KAAK,CACN,CAAA;IAED,MAAM,EACJ,UAAU,EACV,+BAA+B,EAC/B,aAAa,EACb,aAAa,EACb,0BAA0B,EAC1B,MAAM,EACN,GAAG,EACH,SAAS,EACT,iBAAiB,EACjB,QAAQ,GACT,GAAG,KAAK,CAAA;IAET,MAAM,KAAK,GAAG,IAAA,6BAAqB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACrD,IAAI,GAAG,CAAC,UAAU,EAAE;QAClB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;KACpB;IAED,MAAM,YAAY,GAAG,IAAA,kCAAkB,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IACnD,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,MAAM,CAAC,CAAA;IACrD,MAAM,cAAc,GAAG,IAAA,qDAAqC,EAAC,MAAM,CAAC,CAAA;IAEpE,MAAM,sBAAsB,CAAC,cAAc,CACzC,gBAAgB,EAChB,YAAY,EACZ,cAAc,CACf,CAAA;IAED,OAAO;QACL,GAAG,sBAAsB;QACzB,4BAA4B,EAAE,KAAK,EACjC,aAA4B,EAC5B,MAAe,EACkB,EAAE;YACnC,MAAM,kBAAkB,GAAG,MAAM;gBAC/B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,aAAa,CAAC,CAAA;YAEtC,IAAI,CAAC,CAAC,MAAM,IAAA,iBAAS,EAAC,kBAAkB,CAAC,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CAAC,mCAAmC,kBAAkB,EAAE,CAAC,CAAA;aACzE;YAED,OAAO,IAAA,0DAAsC,EAAC;gBAC5C,GAAG,KAAK;gBACR,SAAS,EAAE,kBAAkB;aAC9B,CAAC,CAAA;QACJ,CAAC;QACD,mBAAmB,EAAE,KAAK,IAA+B,EAAE;YACzD,IAAI,CAAC,CAAC,MAAM,IAAA,iBAAS,EAAC,aAAa,CAAC,CAAC,EAAE;gBACrC,MAAM,IAAI,oBAAW,CACnB,0BAA0B,IAAA,eAAQ,EAChC,aAAa,CACd,oCAAoC,UAAU,EAAE,CAClD,CAAA;aACF;YAED,MAAM,UAAU,GAAG,0BAA0B;gBAC3C,CAAC,CAAC,qBAAqB,CAAC,aAAa,EAAE,0BAA0B,CAAC;gBAClE,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,+BAA+B,CAAC,CAAA;YAExD,MAAM,UAAU,GAAG,MAAM,IAAA,wBAAe,EACtC,GAAG,EACH,MAAM,EACN,sBAAsB,CAAC,cAAc,EACrC,UAAU,CACX,CAAA;YAED,MAAM,yBAAyB,GAC7B,MAAM,wCAAwC,CAC5C,GAAG,EACH,MAAM,EACN,sBAAsB,CAAC,cAAc,EACrC,iBAAiB,EACjB,KAAK,CACN,CAAA;YAEH,MAAM,kBAAkB,GAAG,MAAM,IAAA,oDAA+B,EAC9D,aAAa,CACd,CAAA;YAED,MAAM,MAAM,GAAG,MAAM,IAAA,+CAAqB,EACxC,GAAG,EACH,MAAM,EACN,cAAc,EACd,yBAAyB,EACzB,kBAAkB,EAClB,UAAU,CACX,CAAA;YACD,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;gBACjB,OAAO,MAAM,CAAC,KAAK,CAAA;aACpB;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ;iBAClC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;iBAC/B,IAAI,CAAC,IAAI,CAAC,CAAA;YACb,MAAM,IAAI,oBAAW,CACnB,8DAA8D,UAAU,QAAQ,OAAO,EAAE,CAC1F,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AA3GY,QAAA,iDAAiD,qDA2G7D"}
+{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/config-repository.ts"],"names":[],"mappings":"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"}

package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.d.ts

@@ -1,2 +1,2 @@
-import { DeploymentTargetConfigItem } from "../../takomo-deployment-targets-repository";
+import { DeploymentTargetConfigItem } from "../../takomo-deployment-targets-repository/index.js";
 export declare const mergeDeploymentTargetConfigs: (items: ReadonlyArray<DeploymentTargetConfigItem>) => ReadonlyArray<DeploymentTargetConfigItem>;

package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js

@@ -1,12 +1,6 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeDeploymentTargetConfigs = void 0;
-const ramda_1 = __importDefault(require("ramda"));
-const collections_1 = require("../../utils/collections");
-const objects_1 = require("../../utils/objects");
+import * as R from "ramda";
+import { mergeArrays } from "../../utils/collections.js";
+import { merge } from "../../utils/objects.js";
 const mergeDeploymentTargetConfigsInternal = ([first, second, ...rest]) => {
     if (!second) {
         return first;
@@ -14,32 +8,25 @@ const mergeDeploymentTargetConfigsInternal = ([first, second, ...rest]) => {
     const merged = {
         name: second.name,
         accountId: second.accountId ?? first.accountId,
-        configSets: (0, collections_1.mergeArrays)({
+        configSets: mergeArrays({
             first: first.configSets ?? [],
             second: second.configSets ?? [],
         }),
-        vars: (0, objects_1.merge)(first.vars ?? {}, second.vars ?? {}),
+        vars: merge(first.vars ?? {}, second.vars ?? {}),
         deploymentGroupPath: second.deploymentGroupPath,
-        labels: (0, collections_1.mergeArrays)({
+        labels: mergeArrays({
             first: first.labels ?? [],
             second: second.labels ?? [],
         }),
-        bootstrapConfigSets: (0, collections_1.mergeArrays)({
-            first: first.bootstrapConfigSets ?? [],
-            second: second.bootstrapConfigSets ?? [],
-        }),
         status: second.status ?? first.status,
         deploymentRoleName: second.deploymentRoleName ?? first.deploymentRoleName,
         deploymentRole: second.deploymentRole ?? first.deploymentRole,
         description: second.description ?? first.description,
-        bootstrapRoleName: second.bootstrapRoleName ?? first.bootstrapRoleName,
-        bootstrapRole: second.bootstrapRole ?? first.bootstrapRole,
     };
     return mergeDeploymentTargetConfigsInternal([merged, ...rest]);
 };
-const mergeDeploymentTargetConfigs = (items) => {
-    const itemsByName = ramda_1.default.groupBy(ramda_1.default.prop("name"), items);
+export const mergeDeploymentTargetConfigs = (items) => {
+    const itemsByName = R.groupBy(R.prop("name"), items);
     return Array.from(Object.values(itemsByName)).map(mergeDeploymentTargetConfigsInternal);
 };
-exports.mergeDeploymentTargetConfigs = mergeDeploymentTargetConfigs;
 //# sourceMappingURL=merge-deployment-target-configs.js.map

package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-deployment-target-configs.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAErB,yDAAqD;AACrD,iDAA2C;AAE3C,MAAM,oCAAoC,GAAG,CAAC,CAC5C,KAAK,EACL,MAAM,EACN,GAAG,IAAI,CACmC,EAA8B,EAAE;IAC1E,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,CAAA;KACb;IAED,MAAM,MAAM,GAA+B;QACzC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS;QAC9C,UAAU,EAAE,IAAA,yBAAW,EAAC;YACtB,KAAK,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE;YAC7B,MAAM,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;SAChC,CAAC;QACF,IAAI,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QAChD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;QAC/C,MAAM,EAAE,IAAA,yBAAW,EAAC;YAClB,KAAK,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YACzB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;SAC5B,CAAC;QACF,mBAAmB,EAAE,IAAA,yBAAW,EAAC;YAC/B,KAAK,EAAE,KAAK,CAAC,mBAAmB,IAAI,EAAE;YACtC,MAAM,EAAE,MAAM,CAAC,mBAAmB,IAAI,EAAE;SACzC,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACrC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB;QACzE,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc;QAC7D,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW;QACpD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,IAAI,KAAK,CAAC,iBAAiB;QACtE,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa;KAC3D,CAAA;IAED,OAAO,oCAAoC,CAAC,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;AAChE,CAAC,CAAA;AAEM,MAAM,4BAA4B,GAAG,CAC1C,KAAgD,EACL,EAAE;IAC7C,MAAM,WAAW,GAAG,eAAC,CAAC,OAAO,CAAC,eAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAA;IACpD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAC/C,oCAAoC,CACrC,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,4BAA4B,gCAOxC"}
+{"version":3,"file":"merge-deployment-target-configs.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,MAAM,oCAAoC,GAAG,CAAC,CAC5C,KAAK,EACL,MAAM,EACN,GAAG,IAAI,CACmC,EAA8B,EAAE;IAC1E,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,CAAA;KACb;IAED,MAAM,MAAM,GAA+B;QACzC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS;QAC9C,UAAU,EAAE,WAAW,CAAC;YACtB,KAAK,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE;YAC7B,MAAM,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;SAChC,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QAChD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;QAC/C,MAAM,EAAE,WAAW,CAAC;YAClB,KAAK,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YACzB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;SAC5B,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACrC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB;QACzE,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc;QAC7D,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW;KACrD,CAAA;IAED,OAAO,oCAAoC,CAAC,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;AAChE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,KAAgD,EACL,EAAE;IAC7C,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAA;IACpD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAC/C,oCAAoC,CACrC,CAAA;AACH,CAAC,CAAA"}

package/dist/takomo-config-repository-fs/deployment-targets/parser.d.ts

@@ -1,5 +1,5 @@
-import { CommandContext } from "../../context/command-context";
-import { TemplateEngine } from "../../templating/template-engine";
-import { FilePath } from "../../utils/files";
-import { TkmLogger } from "../../utils/logging";
+import { CommandContext } from "../../context/command-context.js";
+import { TemplateEngine } from "../../templating/template-engine.js";
+import { FilePath } from "../../utils/files.js";
+import { TkmLogger } from "../../utils/logging.js";
 export declare const parseConfigFile: (ctx: CommandContext, logger: TkmLogger, templateEngine: TemplateEngine, pathToFile: FilePath) => Promise<Record<string, unknown>>;