takomo 6.2.1 → 6.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -20,7 +20,7 @@ export interface DeploymentTargetsOperationCommandArgs {
20
20
  readonly [CONFIG_FILE_OPT]: FilePath | undefined;
21
21
  readonly [RESET_CACHE_OPT]: boolean;
22
22
  }
23
- export declare const deploymentTargetsOperationBuilder: (yargs: Argv<DeploymentTargetsOperationCommandArgs>) => Argv<import("yargs").Omit<import("yargs").Omit<DeploymentTargetsOperationCommandArgs, "label" | "command-path" | "concurrent-targets" | "target" | "exclude-target" | "exclude-label" | "config-file" | "config-set" | "reset-cache"> & import("yargs").InferredOptionTypes<{
23
+ export declare const deploymentTargetsOperationBuilder: (yargs: Argv<DeploymentTargetsOperationCommandArgs>) => Argv<import("yargs").Omit<import("yargs").Omit<DeploymentTargetsOperationCommandArgs, "command-path" | "concurrent-targets" | "target" | "exclude-target" | "label" | "exclude-label" | "config-file" | "config-set" | "reset-cache"> & import("yargs").InferredOptionTypes<{
24
24
  "concurrent-targets": {
25
25
  description: string;
26
26
  number: true;
@@ -62,6 +62,7 @@ export const createFileSystemStacksConfigRepository = async ({ ctx, logger, stac
62
62
  return templateEngine.renderTemplate({
63
63
  templateString: content,
64
64
  variables,
65
+ sourceDescription: "inline template",
65
66
  });
66
67
  };
67
68
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/config-repository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/config-repository.ts"],"names":[],"mappings":"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"}
@@ -25,7 +25,11 @@ export class EjsTemplateEngine {
25
25
  }
26
26
  async renderTemplateFile({ pathToFile, variables, }) {
27
27
  const templateString = await readFileContents(pathToFile);
28
- return this.renderTemplate({ templateString, variables });
28
+ return this.renderTemplate({
29
+ templateString,
30
+ variables,
31
+ sourceDescription: `file ${pathToFile}`,
32
+ });
29
33
  }
30
34
  }
31
35
  //# sourceMappingURL=ejs-template-engine.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ejs-template-engine.js","sourceRoot":"","sources":["../../../src/templating/ejs/ejs-template-engine.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AACrB,OAAO,EAAY,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAajE,MAAM,OAAO,iBAAiB;IACnB,OAAO,CAAW;IAClB,WAAW,CAAU;IAE9B,YAAY,EAAE,UAAU,EAAE,MAAM,EAA0B;QACxD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,cAAc,EACd,SAAS,GACW;QACpB,IAAI,CAAC,OAAO,CAAC,SAAS,CACpB,iCAAiC,EACjC,GAAG,EAAE,CAAC,cAAc,CACrB,CAAA;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,iCAAiC,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAE5E,IAAI;YACF,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CACjC,cAAc,EACd,EAAE,EAAE,EAAE,SAAS,EAAE,EACjB;gBACE,YAAY,EAAE,KAAK;gBACnB,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;aAC1B,CACF,CAAA;YACD,IAAI,CAAC,OAAO,CAAC,SAAS,CACpB,gCAAgC,EAChC,GAAG,EAAE,CAAC,gBAAgB,CACvB,CAAA;YAED,OAAO,gBAAgB,CAAA;SACxB;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAA;YAChE,MAAM,CAAC,CAAA;SACR;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,EACvB,UAAU,EACV,SAAS,GACe;QACxB,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAA;QACzD,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAA;IAC3D,CAAC;CACF"}
1
+ {"version":3,"file":"ejs-template-engine.js","sourceRoot":"","sources":["../../../src/templating/ejs/ejs-template-engine.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AACrB,OAAO,EAAY,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAajE,MAAM,OAAO,iBAAiB;IACnB,OAAO,CAAW;IAClB,WAAW,CAAU;IAE9B,YAAY,EAAE,UAAU,EAAE,MAAM,EAA0B;QACxD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,cAAc,EACd,SAAS,GACW;QACpB,IAAI,CAAC,OAAO,CAAC,SAAS,CACpB,iCAAiC,EACjC,GAAG,EAAE,CAAC,cAAc,CACrB,CAAA;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,iCAAiC,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAE5E,IAAI;YACF,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CACjC,cAAc,EACd,EAAE,EAAE,EAAE,SAAS,EAAE,EACjB;gBACE,YAAY,EAAE,KAAK;gBACnB,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;aAC1B,CACF,CAAA;YACD,IAAI,CAAC,OAAO,CAAC,SAAS,CACpB,gCAAgC,EAChC,GAAG,EAAE,CAAC,gBAAgB,CACvB,CAAA;YAED,OAAO,gBAAgB,CAAA;SACxB;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAA;YAChE,MAAM,CAAC,CAAA;SACR;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,EACvB,UAAU,EACV,SAAS,GACe;QACxB,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAA;QACzD,OAAO,IAAI,CAAC,cAAc,CAAC;YACzB,cAAc;YACd,SAAS;YACT,iBAAiB,EAAE,QAAQ,UAAU,EAAE;SACxC,CAAC,CAAA;IACJ,CAAC;CACF"}
@@ -14,7 +14,7 @@ export declare class HandlebarsTemplateEngine implements TemplateEngine {
14
14
  constructor({ logger, projectDir }: HandlebarsTemplateEngineProps);
15
15
  registerHelper(name: string, fn: any): void;
16
16
  registerPartial(name: string, pathToFile: FilePath): Promise<void>;
17
- renderTemplate({ templateString, variables, }: RenderTemplateProps): Promise<string>;
17
+ renderTemplate({ templateString, variables, sourceDescription, }: RenderTemplateProps): Promise<string>;
18
18
  renderTemplateFile({ pathToFile, variables, }: RenderTemplateFileProps): Promise<string>;
19
19
  }
20
20
  export {};
@@ -35,8 +35,8 @@ export class HandlebarsTemplateEngine {
35
35
  const partial = this.#instance.compile(partialString);
36
36
  this.#instance.registerPartial(name, partial);
37
37
  }
38
- // TODO: Add error handling (like done in utils.js/renderTemplate)
39
- async renderTemplate({ templateString, variables, }) {
38
+ async renderTemplate({ templateString, variables, sourceDescription, }) {
39
+ this.#logger.trace(`Render template from ${sourceDescription}`);
40
40
  const template = this.#instance.compile(templateString, {
41
41
  noEscape: true,
42
42
  strict: true,
@@ -49,7 +49,8 @@ export class HandlebarsTemplateEngine {
49
49
  return renderedTemplate;
50
50
  }
51
51
  catch (e) {
52
- const errorMessage = buildErrorMessage(`An error occurred while rendering template`, templateString, e);
52
+ this.#logger.error(`An error occurred while rendering template from ${sourceDescription}`, e);
53
+ const errorMessage = buildErrorMessage(`An error occurred while rendering template from ${sourceDescription}`, templateString, e);
53
54
  throw new TakomoError(errorMessage);
54
55
  }
55
56
  }
@@ -60,16 +61,11 @@ export class HandlebarsTemplateEngine {
60
61
  throw new TakomoError(`Could not render template from file ${absolutePath} because the file doesn't exist`);
61
62
  }
62
63
  const templateString = await readFileContents(absolutePath);
63
- try {
64
- return this.renderTemplate({
65
- templateString,
66
- variables,
67
- });
68
- }
69
- catch (e) {
70
- this.#logger.error(`An error occurred while rendering template from file ${pathToFile}`);
71
- throw e;
72
- }
64
+ return this.renderTemplate({
65
+ templateString,
66
+ variables,
67
+ sourceDescription: `file ${pathToFile}`,
68
+ });
73
69
  }
74
70
  }
75
71
  //# sourceMappingURL=handlebars-template-engine.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"handlebars-template-engine.js","sourceRoot":"","sources":["../../../src/templating/handlebars/handlebars-template-engine.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"handlebars-template-engine.js","sourceRoot":"","sources":["../../../src/templating/handlebars/handlebars-template-engine.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,10 @@ export interface RenderTemplateProps {
8
8
  * Variables used to render the template string
9
9
  */
10
10
  readonly variables: unknown;
11
+ /**
12
+ * Description of template source
13
+ */
14
+ readonly sourceDescription: string;
11
15
  }
12
16
  export interface RenderTemplateFileProps {
13
17
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "takomo",
3
- "version": "6.2.1",
3
+ "version": "6.2.2",
4
4
  "description": "Organize, configure and deploy CloudFormation stacks.",
5
5
  "keywords": [
6
6
  "aws",
@@ -113,8 +113,8 @@
113
113
  "prettier-plugin-organize-imports": "3.2.2",
114
114
  "pretty-quick": "3.1.3",
115
115
  "ts-node": "10.9.1",
116
- "typedoc": "0.23.28",
117
- "typescript": "4.9.5",
116
+ "typedoc": "0.24.8",
117
+ "typescript": "5.1.6",
118
118
  "semantic-release": "21.0.1",
119
119
  "npm-check-updates": "16.10.0"
120
120
  },
@@ -1,3 +0,0 @@
1
- import { FilePath } from "../../utils/files.js";
2
- import { TemplateEngine } from "../template-engine.js";
3
- export declare const renderTemplate: (te: TemplateEngine, filePath: FilePath, templateString: string, variables: unknown) => Promise<string>;
@@ -1,12 +0,0 @@
1
- import { TakomoError } from "../../utils/errors.js";
2
- import { buildErrorMessage } from "../../utils/templating.js";
3
- export const renderTemplate = async (te, filePath, templateString, variables) => {
4
- try {
5
- return te.renderTemplate({ templateString, variables });
6
- }
7
- catch (e) {
8
- const errorMessage = buildErrorMessage(`An error occurred while rendering file: ${filePath}`, templateString, e);
9
- throw new TakomoError(errorMessage);
10
- }
11
- };
12
- //# sourceMappingURL=utils.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/templating/handlebars/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAG7D,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,EAAkB,EAClB,QAAkB,EAClB,cAAsB,EACtB,SAAkB,EACD,EAAE;IACnB,IAAI;QACF,OAAO,EAAE,CAAC,cAAc,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAA;KACxD;IAAC,OAAO,CAAM,EAAE;QACf,MAAM,YAAY,GAAG,iBAAiB,CACpC,2CAA2C,QAAQ,EAAE,EACrD,cAAc,EACd,CAAC,CACF,CAAA;QACD,MAAM,IAAI,WAAW,CAAC,YAAY,CAAC,CAAA;KACpC;AACH,CAAC,CAAA"}