@storm-software/k8s-tools 0.22.1 → 0.23.1

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.
Files changed (31) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/README.md +1 -1
  3. package/dist/{chunk-VGT53X45.mjs → chunk-65PPRXAW.mjs} +18 -16
  4. package/dist/{chunk-U44U5VL3.js → chunk-6BXA3PGH.js} +3 -3
  5. package/dist/{chunk-VLPEFUDC.mjs → chunk-6C5CWDYY.mjs} +1 -1
  6. package/dist/{chunk-7MCE2ZUS.js → chunk-6U6BC45C.js} +2 -2
  7. package/dist/{chunk-H62G7RPC.js → chunk-7SAHBYCR.js} +17 -13
  8. package/dist/{chunk-BIWZ2Q24.mjs → chunk-DQV7NKM7.mjs} +1 -1
  9. package/dist/{chunk-QCPSAHUZ.mjs → chunk-F26OPCDG.mjs} +16 -12
  10. package/dist/{chunk-ZC5XJYOI.mjs → chunk-IBVTMWHS.mjs} +1 -1
  11. package/dist/{chunk-ZUYEBE5G.js → chunk-O47HD2XS.js} +29 -27
  12. package/dist/{chunk-F3FMMEAT.js → chunk-OABQKZJH.js} +2 -2
  13. package/dist/{chunk-HIBDWCFD.js → chunk-SXNPLQHC.js} +58 -10
  14. package/dist/{chunk-HAPNODYU.mjs → chunk-WWDN4BEK.mjs} +52 -4
  15. package/dist/executors.js +4 -5
  16. package/dist/executors.mjs +3 -4
  17. package/dist/generators.js +5 -5
  18. package/dist/generators.mjs +4 -4
  19. package/dist/index.js +7 -8
  20. package/dist/index.mjs +6 -7
  21. package/dist/src/executors/container-publish/executor.js +3 -4
  22. package/dist/src/executors/container-publish/executor.mjs +2 -3
  23. package/dist/src/executors/helm-package/executor.js +3 -4
  24. package/dist/src/executors/helm-package/executor.mjs +2 -3
  25. package/dist/src/generators/helm-chart/generator.js +4 -4
  26. package/dist/src/generators/helm-chart/generator.mjs +3 -3
  27. package/dist/src/generators/helm-dependency/generator.js +4 -4
  28. package/dist/src/generators/helm-dependency/generator.mjs +3 -3
  29. package/package.json +1 -1
  30. package/dist/chunk-HOFAHND6.mjs +0 -59
  31. package/dist/chunk-PJ4LNF33.js +0 -59
package/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ ## 0.23.1 (2025-01-22)
2
+
3
+ ### Bug Fixes
4
+
5
+ - **config-tools:** Resolved issue applying entire token parameters object ([5ccf3881](https://github.com/storm-software/storm-ops/commit/5ccf3881))
6
+
7
+ ## 0.23.0 (2025-01-22)
8
+
9
+ ### Features
10
+
11
+ - **workspace-tools:** Enhanced option tokenization logic for executors ([14ed93d7](https://github.com/storm-software/storm-ops/commit/14ed93d7))
12
+
1
13
  ## 0.22.1 (2025-01-21)
2
14
 
3
15
  ### Bug Fixes
package/README.md CHANGED
@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
21
21
 
22
22
  <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
23
23
 
24
- [![Version](https://img.shields.io/badge/version-0.22.0-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
24
+ [![Version](https://img.shields.io/badge/version-0.23.0-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
25
25
 
26
26
  <!-- prettier-ignore-start -->
27
27
  <!-- markdownlint-disable -->
@@ -1,9 +1,7 @@
1
1
  import {
2
- applyWorkspaceExecutorTokens
3
- } from "./chunk-HOFAHND6.mjs";
4
- import {
2
+ applyWorkspaceProjectTokens,
5
3
  applyWorkspaceTokens
6
- } from "./chunk-QCPSAHUZ.mjs";
4
+ } from "./chunk-F26OPCDG.mjs";
7
5
  import {
8
6
  findWorkspaceRoot,
9
7
  formatLogMessage,
@@ -25,21 +23,23 @@ import {
25
23
  } from "./chunk-XUV4U54K.mjs";
26
24
 
27
25
  // ../workspace-tools/src/base/base-executor.ts
26
+ import { defu } from "defu";
28
27
  var withRunExecutor = /* @__PURE__ */ __name((name, executorFn, executorOptions = {}) => async (_options, context) => {
29
28
  const stopwatch = getStopwatch(name);
30
29
  let options = _options;
31
30
  let config = {};
32
31
  try {
33
- writeInfo(`\u26A1 Running the ${name} executor...
34
- `, config);
35
32
  if (!context.projectsConfigurations?.projects || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
36
33
  throw new Error("The Build process failed because the context is not valid. Please run this command from a workspace.");
37
34
  }
38
35
  const workspaceRoot = findWorkspaceRoot();
39
- const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
40
- const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
41
- const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
36
+ const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot;
37
+ const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot;
38
+ const projectName = context.projectName;
42
39
  config.workspaceRoot = workspaceRoot;
40
+ writeInfo(`
41
+ \u26A1 Running the ${name} executor for ${projectName}
42
+ `, config);
43
43
  if (!executorOptions.skipReadingConfig) {
44
44
  writeTrace(`Loading the Storm Config from environment variables and storm.config.js file...
45
45
  - workspaceRoot: ${workspaceRoot}
@@ -54,17 +54,19 @@ var withRunExecutor = /* @__PURE__ */ __name((name, executorFn, executorOptions
54
54
  options = await Promise.resolve(executorOptions.hooks.applyDefaultOptions(options, config));
55
55
  writeDebug("Completed the applyDefaultOptions hook", config);
56
56
  }
57
- writeTrace(`Executor schema options \u2699\uFE0F
58
- ${Object.keys(options).map((key) => ` - ${key}=${_isFunction(options[key]) ? "<function>" : JSON.stringify(options[key])}`).join("\n")}`, config);
59
- const tokenized = await applyWorkspaceTokens(options, {
60
- config,
57
+ writeTrace(`Executor schema options \u2699\uFE0F
58
+ ${formatLogMessage(options)}
59
+ `, config);
60
+ const tokenized = await applyWorkspaceTokens(options, defu({
61
61
  workspaceRoot,
62
62
  projectRoot,
63
63
  sourceRoot,
64
64
  projectName,
65
- ...context.projectsConfigurations.projects[context.projectName],
66
- ...executorOptions
67
- }, applyWorkspaceExecutorTokens);
65
+ config
66
+ }, config, context.projectsConfigurations.projects[context.projectName]), applyWorkspaceProjectTokens);
67
+ writeTrace(`Executor schema tokenized options \u2699\uFE0F
68
+ ${formatLogMessage(tokenized)}
69
+ `, config);
68
70
  if (executorOptions?.hooks?.preProcess) {
69
71
  writeDebug("Running the preProcess hook...", config);
70
72
  await Promise.resolve(executorOptions.hooks.preProcess(tokenized, config));
@@ -1,7 +1,7 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
2
2
 
3
3
 
4
- var _chunkH62G7RPCjs = require('./chunk-H62G7RPC.js');
4
+ var _chunk7SAHBYCRjs = require('./chunk-7SAHBYCR.js');
5
5
 
6
6
 
7
7
 
@@ -41,10 +41,10 @@ var withRunGenerator = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (nam
41
41
  }
42
42
  _chunk4QH2MTXKjs.writeTrace.call(void 0, `Generator schema options \u2699\uFE0F
43
43
  ${Object.keys(_nullishCoalesce(options, () => ( {}))).map((key) => ` - ${key}=${JSON.stringify(options[key])}`).join("\n")}`, config);
44
- const tokenized = await _chunkH62G7RPCjs.applyWorkspaceTokens.call(void 0, options, {
44
+ const tokenized = await _chunk7SAHBYCRjs.applyWorkspaceTokens.call(void 0, options, {
45
45
  workspaceRoot: tree.root,
46
46
  config
47
- }, _chunkH62G7RPCjs.applyWorkspaceBaseTokens);
47
+ }, _chunk7SAHBYCRjs.applyWorkspaceBaseTokens);
48
48
  if (_optionalChain([generatorOptions, 'optionalAccess', _3 => _3.hooks, 'optionalAccess', _4 => _4.preProcess])) {
49
49
  _chunk4QH2MTXKjs.writeDebug.call(void 0, "Running the preProcess hook...", config);
50
50
  await Promise.resolve(generatorOptions.hooks.preProcess(tokenized, config));
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  withRunGenerator
3
- } from "./chunk-ZC5XJYOI.mjs";
3
+ } from "./chunk-IBVTMWHS.mjs";
4
4
  import {
5
5
  writeDebug
6
6
  } from "./chunk-EW7TITVO.mjs";
@@ -1,6 +1,6 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
2
2
 
3
- var _chunkU44U5VL3js = require('./chunk-U44U5VL3.js');
3
+ var _chunk6BXA3PGHjs = require('./chunk-6BXA3PGH.js');
4
4
 
5
5
 
6
6
  var _chunk4QH2MTXKjs = require('./chunk-4QH2MTXK.js');
@@ -49,7 +49,7 @@ async function helmChartGeneratorFn(tree, options, config) {
49
49
  };
50
50
  }
51
51
  _chunk3GQAWCBQjs.__name.call(void 0, helmChartGeneratorFn, "helmChartGeneratorFn");
52
- var generator_default = _chunkU44U5VL3js.withRunGenerator.call(void 0, "Helm Chart", helmChartGeneratorFn);
52
+ var generator_default = _chunk6BXA3PGHjs.withRunGenerator.call(void 0, "Helm Chart", helmChartGeneratorFn);
53
53
 
54
54
 
55
55
 
@@ -6,48 +6,51 @@ var _chunk4QH2MTXKjs = require('./chunk-4QH2MTXK.js');
6
6
  var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
7
7
 
8
8
  // ../config-tools/src/utilities/apply-workspace-tokens.ts
9
- var applyWorkspaceBaseTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (option, tokenizerOptions) => {
9
+ var applyWorkspaceBaseTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (option, tokenParams) => {
10
10
  let result = option;
11
11
  if (!result) {
12
12
  return result;
13
13
  }
14
- if (tokenizerOptions) {
15
- const optionKeys = Object.keys(tokenizerOptions);
14
+ if (tokenParams) {
15
+ const optionKeys = Object.keys(tokenParams);
16
16
  if (optionKeys.some((optionKey) => result.includes(`{${optionKey}}`))) {
17
17
  for (const optionKey of optionKeys) {
18
18
  if (result.includes(`{${optionKey}}`)) {
19
- result = result.replaceAll(`{${optionKey}}`, _nullishCoalesce(_optionalChain([tokenizerOptions, 'access', _ => _.config, 'optionalAccess', _2 => _2[optionKey]]), () => ( "")));
19
+ result = result.replaceAll(`{${optionKey}}`, _optionalChain([tokenParams, 'optionalAccess', _ => _[optionKey]]) || "");
20
20
  }
21
21
  }
22
22
  }
23
23
  }
24
- if (tokenizerOptions.config) {
25
- const configKeys = Object.keys(tokenizerOptions.config);
24
+ if (tokenParams.config) {
25
+ const configKeys = Object.keys(tokenParams.config);
26
26
  if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
27
27
  for (const configKey of configKeys) {
28
28
  if (result.includes(`{${configKey}}`)) {
29
- result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
29
+ result = result.replaceAll(`{${configKey}}`, tokenParams.config[configKey] || "");
30
30
  }
31
31
  }
32
32
  }
33
33
  }
34
34
  if (result.includes("{workspaceRoot}")) {
35
- result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(_nullishCoalesce(tokenizerOptions.workspaceRoot, () => ( _optionalChain([tokenizerOptions, 'access', _3 => _3.config, 'optionalAccess', _4 => _4.workspaceRoot]))), () => ( _chunk4QH2MTXKjs.findWorkspaceRoot.call(void 0, ))));
35
+ result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _2 => _2.config, 'optionalAccess', _3 => _3.workspaceRoot]))), () => ( _chunk4QH2MTXKjs.findWorkspaceRoot.call(void 0, ))));
36
36
  }
37
37
  return result;
38
38
  }, "applyWorkspaceBaseTokens");
39
- var applyWorkspaceTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (options, config, tokenizerFn) => {
39
+ var applyWorkspaceProjectTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (option, tokenParams) => {
40
+ return applyWorkspaceBaseTokens(option, tokenParams);
41
+ }, "applyWorkspaceProjectTokens");
42
+ var applyWorkspaceTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (options, tokenParams, tokenizerFn) => {
40
43
  if (!options) {
41
44
  return {};
42
45
  }
43
46
  const result = {};
44
47
  for (const option of Object.keys(options)) {
45
48
  if (typeof options[option] === "string") {
46
- result[option] = await Promise.resolve(tokenizerFn(options[option], config));
49
+ result[option] = await Promise.resolve(tokenizerFn(options[option], tokenParams));
47
50
  } else if (Array.isArray(options[option])) {
48
- result[option] = await Promise.all(options[option].map(async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item));
51
+ result[option] = await Promise.all(options[option].map(async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, tokenParams)) : item));
49
52
  } else if (typeof options[option] === "object") {
50
- result[option] = await applyWorkspaceTokens(options[option], config, tokenizerFn);
53
+ result[option] = await applyWorkspaceTokens(options[option], tokenParams, tokenizerFn);
51
54
  } else {
52
55
  result[option] = options[option];
53
56
  }
@@ -58,4 +61,5 @@ var applyWorkspaceTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0,
58
61
 
59
62
 
60
63
 
61
- exports.applyWorkspaceBaseTokens = applyWorkspaceBaseTokens; exports.applyWorkspaceTokens = applyWorkspaceTokens;
64
+
65
+ exports.applyWorkspaceBaseTokens = applyWorkspaceBaseTokens; exports.applyWorkspaceProjectTokens = applyWorkspaceProjectTokens; exports.applyWorkspaceTokens = applyWorkspaceTokens;
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  withRunGenerator
3
- } from "./chunk-ZC5XJYOI.mjs";
3
+ } from "./chunk-IBVTMWHS.mjs";
4
4
  import {
5
5
  writeDebug
6
6
  } from "./chunk-EW7TITVO.mjs";
@@ -6,48 +6,51 @@ import {
6
6
  } from "./chunk-XUV4U54K.mjs";
7
7
 
8
8
  // ../config-tools/src/utilities/apply-workspace-tokens.ts
9
- var applyWorkspaceBaseTokens = /* @__PURE__ */ __name(async (option, tokenizerOptions) => {
9
+ var applyWorkspaceBaseTokens = /* @__PURE__ */ __name(async (option, tokenParams) => {
10
10
  let result = option;
11
11
  if (!result) {
12
12
  return result;
13
13
  }
14
- if (tokenizerOptions) {
15
- const optionKeys = Object.keys(tokenizerOptions);
14
+ if (tokenParams) {
15
+ const optionKeys = Object.keys(tokenParams);
16
16
  if (optionKeys.some((optionKey) => result.includes(`{${optionKey}}`))) {
17
17
  for (const optionKey of optionKeys) {
18
18
  if (result.includes(`{${optionKey}}`)) {
19
- result = result.replaceAll(`{${optionKey}}`, tokenizerOptions.config?.[optionKey] ?? "");
19
+ result = result.replaceAll(`{${optionKey}}`, tokenParams?.[optionKey] || "");
20
20
  }
21
21
  }
22
22
  }
23
23
  }
24
- if (tokenizerOptions.config) {
25
- const configKeys = Object.keys(tokenizerOptions.config);
24
+ if (tokenParams.config) {
25
+ const configKeys = Object.keys(tokenParams.config);
26
26
  if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
27
27
  for (const configKey of configKeys) {
28
28
  if (result.includes(`{${configKey}}`)) {
29
- result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
29
+ result = result.replaceAll(`{${configKey}}`, tokenParams.config[configKey] || "");
30
30
  }
31
31
  }
32
32
  }
33
33
  }
34
34
  if (result.includes("{workspaceRoot}")) {
35
- result = result.replaceAll("{workspaceRoot}", tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot());
35
+ result = result.replaceAll("{workspaceRoot}", tokenParams.workspaceRoot ?? tokenParams.config?.workspaceRoot ?? findWorkspaceRoot());
36
36
  }
37
37
  return result;
38
38
  }, "applyWorkspaceBaseTokens");
39
- var applyWorkspaceTokens = /* @__PURE__ */ __name(async (options, config, tokenizerFn) => {
39
+ var applyWorkspaceProjectTokens = /* @__PURE__ */ __name((option, tokenParams) => {
40
+ return applyWorkspaceBaseTokens(option, tokenParams);
41
+ }, "applyWorkspaceProjectTokens");
42
+ var applyWorkspaceTokens = /* @__PURE__ */ __name(async (options, tokenParams, tokenizerFn) => {
40
43
  if (!options) {
41
44
  return {};
42
45
  }
43
46
  const result = {};
44
47
  for (const option of Object.keys(options)) {
45
48
  if (typeof options[option] === "string") {
46
- result[option] = await Promise.resolve(tokenizerFn(options[option], config));
49
+ result[option] = await Promise.resolve(tokenizerFn(options[option], tokenParams));
47
50
  } else if (Array.isArray(options[option])) {
48
- result[option] = await Promise.all(options[option].map(async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item));
51
+ result[option] = await Promise.all(options[option].map(async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, tokenParams)) : item));
49
52
  } else if (typeof options[option] === "object") {
50
- result[option] = await applyWorkspaceTokens(options[option], config, tokenizerFn);
53
+ result[option] = await applyWorkspaceTokens(options[option], tokenParams, tokenizerFn);
51
54
  } else {
52
55
  result[option] = options[option];
53
56
  }
@@ -57,5 +60,6 @@ var applyWorkspaceTokens = /* @__PURE__ */ __name(async (options, config, tokeni
57
60
 
58
61
  export {
59
62
  applyWorkspaceBaseTokens,
63
+ applyWorkspaceProjectTokens,
60
64
  applyWorkspaceTokens
61
65
  };
@@ -1,7 +1,7 @@
1
1
  import {
2
2
  applyWorkspaceBaseTokens,
3
3
  applyWorkspaceTokens
4
- } from "./chunk-QCPSAHUZ.mjs";
4
+ } from "./chunk-F26OPCDG.mjs";
5
5
  import {
6
6
  findWorkspaceRoot,
7
7
  getStopwatch,
@@ -1,9 +1,7 @@
1
- "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
1
+ "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
2
2
 
3
- var _chunkPJ4LNF33js = require('./chunk-PJ4LNF33.js');
4
3
 
5
-
6
- var _chunkH62G7RPCjs = require('./chunk-H62G7RPC.js');
4
+ var _chunk7SAHBYCRjs = require('./chunk-7SAHBYCR.js');
7
5
 
8
6
 
9
7
 
@@ -25,21 +23,23 @@ var _chunk2GAU2GHGjs = require('./chunk-2GAU2GHG.js');
25
23
  var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
26
24
 
27
25
  // ../workspace-tools/src/base/base-executor.ts
26
+ var _defu = require('defu');
28
27
  var withRunExecutor = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (name, executorFn, executorOptions = {}) => async (_options, context) => {
29
28
  const stopwatch = _chunk4QH2MTXKjs.getStopwatch.call(void 0, name);
30
29
  let options = _options;
31
30
  let config = {};
32
31
  try {
33
- _chunk4QH2MTXKjs.writeInfo.call(void 0, `\u26A1 Running the ${name} executor...
34
- `, config);
35
32
  if (!_optionalChain([context, 'access', _ => _.projectsConfigurations, 'optionalAccess', _2 => _2.projects]) || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
36
33
  throw new Error("The Build process failed because the context is not valid. Please run this command from a workspace.");
37
34
  }
38
35
  const workspaceRoot = _chunk4QH2MTXKjs.findWorkspaceRoot.call(void 0, );
39
- const projectRoot = _nullishCoalesce(_optionalChain([context, 'access', _3 => _3.projectsConfigurations, 'access', _4 => _4.projects, 'access', _5 => _5[context.projectName], 'optionalAccess', _6 => _6.root]), () => ( workspaceRoot));
40
- const sourceRoot = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.sourceRoot]), () => ( workspaceRoot));
41
- const projectName = _nullishCoalesce(_optionalChain([context, 'access', _11 => _11.projectsConfigurations, 'access', _12 => _12.projects, 'access', _13 => _13[context.projectName], 'optionalAccess', _14 => _14.name]), () => ( context.projectName));
36
+ const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot;
37
+ const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot;
38
+ const projectName = context.projectName;
42
39
  config.workspaceRoot = workspaceRoot;
40
+ _chunk4QH2MTXKjs.writeInfo.call(void 0, `
41
+ \u26A1 Running the ${name} executor for ${projectName}
42
+ `, config);
43
43
  if (!executorOptions.skipReadingConfig) {
44
44
  _chunk4QH2MTXKjs.writeTrace.call(void 0, `Loading the Storm Config from environment variables and storm.config.js file...
45
45
  - workspaceRoot: ${workspaceRoot}
@@ -49,43 +49,45 @@ var withRunExecutor = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (name
49
49
  `, config);
50
50
  config = await _chunk4QH2MTXKjs.loadStormConfig.call(void 0, workspaceRoot);
51
51
  }
52
- if (_optionalChain([executorOptions, 'optionalAccess', _15 => _15.hooks, 'optionalAccess', _16 => _16.applyDefaultOptions])) {
52
+ if (_optionalChain([executorOptions, 'optionalAccess', _3 => _3.hooks, 'optionalAccess', _4 => _4.applyDefaultOptions])) {
53
53
  _chunk4QH2MTXKjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
54
54
  options = await Promise.resolve(executorOptions.hooks.applyDefaultOptions(options, config));
55
55
  _chunk4QH2MTXKjs.writeDebug.call(void 0, "Completed the applyDefaultOptions hook", config);
56
56
  }
57
- _chunk4QH2MTXKjs.writeTrace.call(void 0, `Executor schema options \u2699\uFE0F
58
- ${Object.keys(options).map((key) => ` - ${key}=${_isFunction(options[key]) ? "<function>" : JSON.stringify(options[key])}`).join("\n")}`, config);
59
- const tokenized = await _chunkH62G7RPCjs.applyWorkspaceTokens.call(void 0, options, {
60
- config,
57
+ _chunk4QH2MTXKjs.writeTrace.call(void 0, `Executor schema options \u2699\uFE0F
58
+ ${_chunk4QH2MTXKjs.formatLogMessage.call(void 0, options)}
59
+ `, config);
60
+ const tokenized = await _chunk7SAHBYCRjs.applyWorkspaceTokens.call(void 0, options, _defu.defu.call(void 0, {
61
61
  workspaceRoot,
62
62
  projectRoot,
63
63
  sourceRoot,
64
64
  projectName,
65
- ...context.projectsConfigurations.projects[context.projectName],
66
- ...executorOptions
67
- }, _chunkPJ4LNF33js.applyWorkspaceExecutorTokens);
68
- if (_optionalChain([executorOptions, 'optionalAccess', _17 => _17.hooks, 'optionalAccess', _18 => _18.preProcess])) {
65
+ config
66
+ }, config, context.projectsConfigurations.projects[context.projectName]), _chunk7SAHBYCRjs.applyWorkspaceProjectTokens);
67
+ _chunk4QH2MTXKjs.writeTrace.call(void 0, `Executor schema tokenized options \u2699\uFE0F
68
+ ${_chunk4QH2MTXKjs.formatLogMessage.call(void 0, tokenized)}
69
+ `, config);
70
+ if (_optionalChain([executorOptions, 'optionalAccess', _5 => _5.hooks, 'optionalAccess', _6 => _6.preProcess])) {
69
71
  _chunk4QH2MTXKjs.writeDebug.call(void 0, "Running the preProcess hook...", config);
70
72
  await Promise.resolve(executorOptions.hooks.preProcess(tokenized, config));
71
73
  _chunk4QH2MTXKjs.writeDebug.call(void 0, "Completed the preProcess hook", config);
72
74
  }
73
75
  const ret = executorFn(tokenized, context, config);
74
- if (_isFunction(_optionalChain([ret, 'optionalAccess', _19 => _19.next]))) {
76
+ if (_isFunction(_optionalChain([ret, 'optionalAccess', _7 => _7.next]))) {
75
77
  const asyncGen = ret;
76
78
  for await (const iter of asyncGen) {
77
79
  }
78
80
  }
79
81
  const result = await Promise.resolve(ret);
80
- if (result && (!result.success || result.error && _optionalChain([result, 'optionalAccess', _20 => _20.error, 'optionalAccess', _21 => _21.message]) && typeof _optionalChain([result, 'optionalAccess', _22 => _22.error, 'optionalAccess', _23 => _23.message]) === "string" && _optionalChain([result, 'optionalAccess', _24 => _24.error, 'optionalAccess', _25 => _25.name]) && typeof _optionalChain([result, 'optionalAccess', _26 => _26.error, 'optionalAccess', _27 => _27.name]) === "string")) {
82
+ if (result && (!result.success || result.error && _optionalChain([result, 'optionalAccess', _8 => _8.error, 'optionalAccess', _9 => _9.message]) && typeof _optionalChain([result, 'optionalAccess', _10 => _10.error, 'optionalAccess', _11 => _11.message]) === "string" && _optionalChain([result, 'optionalAccess', _12 => _12.error, 'optionalAccess', _13 => _13.name]) && typeof _optionalChain([result, 'optionalAccess', _14 => _14.error, 'optionalAccess', _15 => _15.name]) === "string")) {
81
83
  _chunk4QH2MTXKjs.writeTrace.call(void 0, `Failure determined by the ${name} executor
82
84
  ${_chunk4QH2MTXKjs.formatLogMessage.call(void 0, result)}`, config);
83
85
  console.error(result);
84
86
  throw new Error(`The ${name} executor failed to run`, {
85
- cause: _optionalChain([result, 'optionalAccess', _28 => _28.error])
87
+ cause: _optionalChain([result, 'optionalAccess', _16 => _16.error])
86
88
  });
87
89
  }
88
- if (_optionalChain([executorOptions, 'optionalAccess', _29 => _29.hooks, 'optionalAccess', _30 => _30.postProcess])) {
90
+ if (_optionalChain([executorOptions, 'optionalAccess', _17 => _17.hooks, 'optionalAccess', _18 => _18.postProcess])) {
89
91
  _chunk4QH2MTXKjs.writeDebug.call(void 0, "Running the postProcess hook...", config);
90
92
  await Promise.resolve(executorOptions.hooks.postProcess(config));
91
93
  _chunk4QH2MTXKjs.writeDebug.call(void 0, "Completed the postProcess hook", config);
@@ -109,7 +111,7 @@ ${_chunk4QH2MTXKjs.formatLogMessage.call(void 0, result)}`, config);
109
111
  }, "withRunExecutor");
110
112
  var _isFunction = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (value) => {
111
113
  try {
112
- return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess', _31 => _31.constructor]) && _optionalChain([value, 'optionalAccess', _32 => _32.call]) && _optionalChain([value, 'optionalAccess', _33 => _33.apply]));
114
+ return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess', _19 => _19.constructor]) && _optionalChain([value, 'optionalAccess', _20 => _20.call]) && _optionalChain([value, 'optionalAccess', _21 => _21.apply]));
113
115
  } catch (e) {
114
116
  return false;
115
117
  }
@@ -117,11 +119,11 @@ var _isFunction = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (value) =
117
119
 
118
120
  // src/executors/helm-package/executor.ts
119
121
  async function serveExecutor(options, context, config) {
120
- if (!_optionalChain([context, 'optionalAccess', _34 => _34.projectName]) || !_optionalChain([context, 'optionalAccess', _35 => _35.projectsConfigurations, 'optionalAccess', _36 => _36.projects, 'optionalAccess', _37 => _37[context.projectName], 'optionalAccess', _38 => _38.root])) {
122
+ if (!_optionalChain([context, 'optionalAccess', _22 => _22.projectName]) || !_optionalChain([context, 'optionalAccess', _23 => _23.projectsConfigurations, 'optionalAccess', _24 => _24.projects, 'optionalAccess', _25 => _25[context.projectName], 'optionalAccess', _26 => _26.root])) {
121
123
  throw new Error("Nx executor context was invalid");
122
124
  }
123
125
  const helm = _chunk2GAU2GHGjs.createHelmClient.call(void 0, );
124
- if (_optionalChain([options, 'access', _39 => _39.dependencies, 'optionalAccess', _40 => _40.repositories])) {
126
+ if (_optionalChain([options, 'access', _27 => _27.dependencies, 'optionalAccess', _28 => _28.repositories])) {
125
127
  for (const repository of options.dependencies.repositories) {
126
128
  if (repository.name && repository.url) {
127
129
  helm.addRepository(repository.name, repository.url);
@@ -130,10 +132,10 @@ async function serveExecutor(options, context, config) {
130
132
  }
131
133
  }
132
134
  }
133
- if (_optionalChain([options, 'access', _41 => _41.dependencies, 'optionalAccess', _42 => _42.update])) {
135
+ if (_optionalChain([options, 'access', _29 => _29.dependencies, 'optionalAccess', _30 => _30.update])) {
134
136
  helm.dependencyUpdate(options.chartFolder);
135
137
  }
136
- if (_optionalChain([options, 'access', _43 => _43.dependencies, 'optionalAccess', _44 => _44.build])) {
138
+ if (_optionalChain([options, 'access', _31 => _31.dependencies, 'optionalAccess', _32 => _32.build])) {
137
139
  helm.dependencyBuild(options.chartFolder);
138
140
  }
139
141
  const chartPath = await helm.package({
@@ -1,6 +1,6 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
2
2
 
3
- var _chunkU44U5VL3js = require('./chunk-U44U5VL3.js');
3
+ var _chunk6BXA3PGHjs = require('./chunk-6BXA3PGH.js');
4
4
 
5
5
 
6
6
  var _chunk4QH2MTXKjs = require('./chunk-4QH2MTXK.js');
@@ -27,7 +27,7 @@ async function helmDependencyGeneratorFn(tree, options, config) {
27
27
  };
28
28
  }
29
29
  _chunk3GQAWCBQjs.__name.call(void 0, helmDependencyGeneratorFn, "helmDependencyGeneratorFn");
30
- var generator_default = _chunkU44U5VL3js.withRunGenerator.call(void 0, "Helm Dependency", helmDependencyGeneratorFn);
30
+ var generator_default = _chunk6BXA3PGHjs.withRunGenerator.call(void 0, "Helm Dependency", helmDependencyGeneratorFn);
31
31
  function addDependencyToConfig(project, name, url) {
32
32
  return {
33
33
  ...project,
@@ -1,12 +1,9 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
2
2
 
3
- var _chunkPJ4LNF33js = require('./chunk-PJ4LNF33.js');
4
-
5
-
6
3
  var _chunkIOT45LXVjs = require('./chunk-IOT45LXV.js');
7
4
 
8
5
 
9
- var _chunkH62G7RPCjs = require('./chunk-H62G7RPC.js');
6
+ var _chunk7SAHBYCRjs = require('./chunk-7SAHBYCR.js');
10
7
 
11
8
 
12
9
 
@@ -17,6 +14,57 @@ var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
17
14
 
18
15
  // src/executors/container-publish/executor.ts
19
16
  var _devkit = require('@nx/devkit');
17
+
18
+ // ../workspace-tools/src/utils/apply-workspace-tokens.ts
19
+ var applyWorkspaceExecutorTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (option, tokenizerOptions) => {
20
+ let result = option;
21
+ if (!result) {
22
+ return result;
23
+ }
24
+ let projectName;
25
+ let projectRoot;
26
+ let sourceRoot;
27
+ if (_optionalChain([tokenizerOptions, 'optionalAccess', _ => _.projectName])) {
28
+ const context = tokenizerOptions;
29
+ projectName = context.projectName;
30
+ projectRoot = context.root;
31
+ sourceRoot = context.sourceRoot;
32
+ } else {
33
+ const projectConfig = tokenizerOptions;
34
+ projectRoot = projectConfig.root;
35
+ if (projectConfig.name) {
36
+ projectName = projectConfig.name;
37
+ }
38
+ if (projectConfig.sourceRoot) {
39
+ sourceRoot = projectConfig.sourceRoot;
40
+ }
41
+ }
42
+ if (tokenizerOptions.config) {
43
+ const configKeys = Object.keys(tokenizerOptions.config);
44
+ if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
45
+ for (const configKey of configKeys) {
46
+ if (result.includes(`{${configKey}}`)) {
47
+ result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
48
+ }
49
+ }
50
+ }
51
+ }
52
+ if (result.includes("{projectName}")) {
53
+ result = result.replaceAll("{projectName}", projectName);
54
+ }
55
+ if (result.includes("{projectRoot}")) {
56
+ result = result.replaceAll("{projectRoot}", projectRoot);
57
+ }
58
+ if (result.includes("{sourceRoot}")) {
59
+ result = result.replaceAll("{sourceRoot}", sourceRoot);
60
+ }
61
+ if (result.includes("{workspaceRoot}")) {
62
+ result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(tokenizerOptions.workspaceRoot, () => ( _chunk4QH2MTXKjs.findWorkspaceRoot.call(void 0, ))));
63
+ }
64
+ return result;
65
+ }, "applyWorkspaceExecutorTokens");
66
+
67
+ // src/executors/container-publish/executor.ts
20
68
  var _https = require('https'); var _https2 = _interopRequireDefault(_https);
21
69
  async function* publishExecutor(options, context) {
22
70
  const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
@@ -26,22 +74,22 @@ async function* publishExecutor(options, context) {
26
74
  console.info(`\u{1F680} Running Storm Container Registry Publish executor on the ${context.projectName} crate`);
27
75
  const workspaceRoot = _chunk4QH2MTXKjs.findWorkspaceRoot.call(void 0, );
28
76
  const config = await _chunk4QH2MTXKjs.loadStormConfig.call(void 0, workspaceRoot);
29
- const projectConfig = _optionalChain([context, 'access', _ => _.projectsConfigurations, 'optionalAccess', _2 => _2.projects, 'access', _3 => _3[context.projectName]]);
77
+ const projectConfig = _optionalChain([context, 'access', _2 => _2.projectsConfigurations, 'optionalAccess', _3 => _3.projects, 'access', _4 => _4[context.projectName]]);
30
78
  if (!projectConfig) {
31
79
  throw new Error(`The executor requires a valid projectsConfiguration - No configuration found for project ${context.projectName}`);
32
80
  }
33
- const projectRoot = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _4 => _4.root]), () => ( workspaceRoot));
34
- const sourceRoot = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _5 => _5.sourceRoot]), () => ( workspaceRoot));
35
- const projectName = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _6 => _6.name]), () => ( context.projectName));
81
+ const projectRoot = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _5 => _5.root]), () => ( workspaceRoot));
82
+ const sourceRoot = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _6 => _6.sourceRoot]), () => ( workspaceRoot));
83
+ const projectName = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _7 => _7.name]), () => ( context.projectName));
36
84
  config.workspaceRoot = workspaceRoot;
37
- const tokenized = await _chunkH62G7RPCjs.applyWorkspaceTokens.call(void 0, options, {
85
+ const tokenized = await _chunk7SAHBYCRjs.applyWorkspaceTokens.call(void 0, options, {
38
86
  config,
39
87
  workspaceRoot,
40
88
  projectRoot,
41
89
  sourceRoot,
42
90
  projectName,
43
91
  ...projectConfig
44
- }, _chunkPJ4LNF33js.applyWorkspaceExecutorTokens);
92
+ }, applyWorkspaceExecutorTokens);
45
93
  tokenized.engine ??= "docker";
46
94
  tokenized.registry ??= config.registry.container;
47
95
  try {
@@ -1,12 +1,9 @@
1
- import {
2
- applyWorkspaceExecutorTokens
3
- } from "./chunk-HOFAHND6.mjs";
4
1
  import {
5
2
  getPackageInfo
6
3
  } from "./chunk-RVFKH45R.mjs";
7
4
  import {
8
5
  applyWorkspaceTokens
9
- } from "./chunk-QCPSAHUZ.mjs";
6
+ } from "./chunk-F26OPCDG.mjs";
10
7
  import {
11
8
  findWorkspaceRoot,
12
9
  loadStormConfig
@@ -17,6 +14,57 @@ import {
17
14
 
18
15
  // src/executors/container-publish/executor.ts
19
16
  import { parseTargetString, runExecutor } from "@nx/devkit";
17
+
18
+ // ../workspace-tools/src/utils/apply-workspace-tokens.ts
19
+ var applyWorkspaceExecutorTokens = /* @__PURE__ */ __name(async (option, tokenizerOptions) => {
20
+ let result = option;
21
+ if (!result) {
22
+ return result;
23
+ }
24
+ let projectName;
25
+ let projectRoot;
26
+ let sourceRoot;
27
+ if (tokenizerOptions?.projectName) {
28
+ const context = tokenizerOptions;
29
+ projectName = context.projectName;
30
+ projectRoot = context.root;
31
+ sourceRoot = context.sourceRoot;
32
+ } else {
33
+ const projectConfig = tokenizerOptions;
34
+ projectRoot = projectConfig.root;
35
+ if (projectConfig.name) {
36
+ projectName = projectConfig.name;
37
+ }
38
+ if (projectConfig.sourceRoot) {
39
+ sourceRoot = projectConfig.sourceRoot;
40
+ }
41
+ }
42
+ if (tokenizerOptions.config) {
43
+ const configKeys = Object.keys(tokenizerOptions.config);
44
+ if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
45
+ for (const configKey of configKeys) {
46
+ if (result.includes(`{${configKey}}`)) {
47
+ result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
48
+ }
49
+ }
50
+ }
51
+ }
52
+ if (result.includes("{projectName}")) {
53
+ result = result.replaceAll("{projectName}", projectName);
54
+ }
55
+ if (result.includes("{projectRoot}")) {
56
+ result = result.replaceAll("{projectRoot}", projectRoot);
57
+ }
58
+ if (result.includes("{sourceRoot}")) {
59
+ result = result.replaceAll("{sourceRoot}", sourceRoot);
60
+ }
61
+ if (result.includes("{workspaceRoot}")) {
62
+ result = result.replaceAll("{workspaceRoot}", tokenizerOptions.workspaceRoot ?? findWorkspaceRoot());
63
+ }
64
+ return result;
65
+ }, "applyWorkspaceExecutorTokens");
66
+
67
+ // src/executors/container-publish/executor.ts
20
68
  import https from "node:https";
21
69
  async function* publishExecutor(options, context) {
22
70
  const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
package/dist/executors.js CHANGED
@@ -1,13 +1,12 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});require('./chunk-XO66D74Z.js');
2
2
 
3
3
 
4
- var _chunkHIBDWCFDjs = require('./chunk-HIBDWCFD.js');
4
+ var _chunkSXNPLQHCjs = require('./chunk-SXNPLQHC.js');
5
5
 
6
6
 
7
- var _chunkZUYEBE5Gjs = require('./chunk-ZUYEBE5G.js');
8
- require('./chunk-PJ4LNF33.js');
7
+ var _chunkO47HD2XSjs = require('./chunk-O47HD2XS.js');
9
8
  require('./chunk-IOT45LXV.js');
10
- require('./chunk-H62G7RPC.js');
9
+ require('./chunk-7SAHBYCR.js');
11
10
  require('./chunk-4QH2MTXK.js');
12
11
  require('./chunk-2GAU2GHG.js');
13
12
  require('./chunk-LFNGKV6F.js');
@@ -16,4 +15,4 @@ require('./chunk-3GQAWCBQ.js');
16
15
 
17
16
 
18
17
 
19
- exports.getRegistryVersion = _chunkHIBDWCFDjs.getRegistryVersion; exports.serveExecutor = _chunkZUYEBE5Gjs.serveExecutor;
18
+ exports.getRegistryVersion = _chunkSXNPLQHCjs.getRegistryVersion; exports.serveExecutor = _chunkO47HD2XSjs.serveExecutor;
@@ -1,13 +1,12 @@
1
1
  import "./chunk-YSCEY447.mjs";
2
2
  import {
3
3
  getRegistryVersion
4
- } from "./chunk-HAPNODYU.mjs";
4
+ } from "./chunk-WWDN4BEK.mjs";
5
5
  import {
6
6
  serveExecutor
7
- } from "./chunk-VGT53X45.mjs";
8
- import "./chunk-HOFAHND6.mjs";
7
+ } from "./chunk-65PPRXAW.mjs";
9
8
  import "./chunk-RVFKH45R.mjs";
10
- import "./chunk-QCPSAHUZ.mjs";
9
+ import "./chunk-F26OPCDG.mjs";
11
10
  import "./chunk-EW7TITVO.mjs";
12
11
  import "./chunk-6V45YKVB.mjs";
13
12
  import "./chunk-UDLI3L7V.mjs";
@@ -1,15 +1,15 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});require('./chunk-DHBG5ASJ.js');
2
2
 
3
3
 
4
- var _chunk7MCE2ZUSjs = require('./chunk-7MCE2ZUS.js');
4
+ var _chunk6U6BC45Cjs = require('./chunk-6U6BC45C.js');
5
5
 
6
6
 
7
- var _chunkF3FMMEATjs = require('./chunk-F3FMMEAT.js');
8
- require('./chunk-U44U5VL3.js');
9
- require('./chunk-H62G7RPC.js');
7
+ var _chunkOABQKZJHjs = require('./chunk-OABQKZJH.js');
8
+ require('./chunk-6BXA3PGH.js');
9
+ require('./chunk-7SAHBYCR.js');
10
10
  require('./chunk-4QH2MTXK.js');
11
11
  require('./chunk-3GQAWCBQ.js');
12
12
 
13
13
 
14
14
 
15
- exports.helmChartGeneratorFn = _chunk7MCE2ZUSjs.helmChartGeneratorFn; exports.helmDependencyGeneratorFn = _chunkF3FMMEATjs.helmDependencyGeneratorFn;
15
+ exports.helmChartGeneratorFn = _chunk6U6BC45Cjs.helmChartGeneratorFn; exports.helmDependencyGeneratorFn = _chunkOABQKZJHjs.helmDependencyGeneratorFn;
@@ -1,12 +1,12 @@
1
1
  import "./chunk-3J7KBHMJ.mjs";
2
2
  import {
3
3
  helmChartGeneratorFn
4
- } from "./chunk-VLPEFUDC.mjs";
4
+ } from "./chunk-6C5CWDYY.mjs";
5
5
  import {
6
6
  helmDependencyGeneratorFn
7
- } from "./chunk-BIWZ2Q24.mjs";
8
- import "./chunk-ZC5XJYOI.mjs";
9
- import "./chunk-QCPSAHUZ.mjs";
7
+ } from "./chunk-DQV7NKM7.mjs";
8
+ import "./chunk-IBVTMWHS.mjs";
9
+ import "./chunk-F26OPCDG.mjs";
10
10
  import "./chunk-EW7TITVO.mjs";
11
11
  import "./chunk-XUV4U54K.mjs";
12
12
  export {
package/dist/index.js CHANGED
@@ -7,21 +7,20 @@ var _chunkILJQ7PUYjs = require('./chunk-ILJQ7PUY.js');
7
7
  require('./chunk-XO66D74Z.js');
8
8
 
9
9
 
10
- var _chunkHIBDWCFDjs = require('./chunk-HIBDWCFD.js');
10
+ var _chunkSXNPLQHCjs = require('./chunk-SXNPLQHC.js');
11
11
 
12
12
 
13
- var _chunkZUYEBE5Gjs = require('./chunk-ZUYEBE5G.js');
14
- require('./chunk-PJ4LNF33.js');
13
+ var _chunkO47HD2XSjs = require('./chunk-O47HD2XS.js');
15
14
  require('./chunk-IOT45LXV.js');
16
15
  require('./chunk-DHBG5ASJ.js');
17
16
 
18
17
 
19
- var _chunk7MCE2ZUSjs = require('./chunk-7MCE2ZUS.js');
18
+ var _chunk6U6BC45Cjs = require('./chunk-6U6BC45C.js');
20
19
 
21
20
 
22
- var _chunkF3FMMEATjs = require('./chunk-F3FMMEAT.js');
23
- require('./chunk-U44U5VL3.js');
24
- require('./chunk-H62G7RPC.js');
21
+ var _chunkOABQKZJHjs = require('./chunk-OABQKZJH.js');
22
+ require('./chunk-6BXA3PGH.js');
23
+ require('./chunk-7SAHBYCR.js');
25
24
  require('./chunk-4QH2MTXK.js');
26
25
  require('./chunk-U76ID4TS.js');
27
26
 
@@ -54,4 +53,4 @@ require('./chunk-3GQAWCBQ.js');
54
53
 
55
54
 
56
55
 
57
- exports.AbstractHelmClient = _chunkLFNGKV6Fjs.AbstractHelmClient; exports.HelmClient = _chunk2GAU2GHGjs.HelmClient; exports.addToPrettierIgnore = _chunkT5WNZJODjs.addToPrettierIgnore; exports.createDependencies = _chunkILJQ7PUYjs.createDependencies; exports.createHelmClient = _chunk2GAU2GHGjs.createHelmClient; exports.createNodes = _chunkILJQ7PUYjs.createNodes; exports.description = _chunkILJQ7PUYjs.description; exports.ensureInitialized = _chunkEAQFLLRBjs.ensureInitialized; exports.getRegistryVersion = _chunkHIBDWCFDjs.getRegistryVersion; exports.helmChartGeneratorFn = _chunk7MCE2ZUSjs.helmChartGeneratorFn; exports.helmDependencyGeneratorFn = _chunkF3FMMEATjs.helmDependencyGeneratorFn; exports.name = _chunkILJQ7PUYjs.name; exports.resolveUserExistingPrettierConfig = _chunkT5WNZJODjs.resolveUserExistingPrettierConfig; exports.serveExecutor = _chunkZUYEBE5Gjs.serveExecutor;
56
+ exports.AbstractHelmClient = _chunkLFNGKV6Fjs.AbstractHelmClient; exports.HelmClient = _chunk2GAU2GHGjs.HelmClient; exports.addToPrettierIgnore = _chunkT5WNZJODjs.addToPrettierIgnore; exports.createDependencies = _chunkILJQ7PUYjs.createDependencies; exports.createHelmClient = _chunk2GAU2GHGjs.createHelmClient; exports.createNodes = _chunkILJQ7PUYjs.createNodes; exports.description = _chunkILJQ7PUYjs.description; exports.ensureInitialized = _chunkEAQFLLRBjs.ensureInitialized; exports.getRegistryVersion = _chunkSXNPLQHCjs.getRegistryVersion; exports.helmChartGeneratorFn = _chunk6U6BC45Cjs.helmChartGeneratorFn; exports.helmDependencyGeneratorFn = _chunkOABQKZJHjs.helmDependencyGeneratorFn; exports.name = _chunkILJQ7PUYjs.name; exports.resolveUserExistingPrettierConfig = _chunkT5WNZJODjs.resolveUserExistingPrettierConfig; exports.serveExecutor = _chunkO47HD2XSjs.serveExecutor;
package/dist/index.mjs CHANGED
@@ -7,21 +7,20 @@ import {
7
7
  import "./chunk-YSCEY447.mjs";
8
8
  import {
9
9
  getRegistryVersion
10
- } from "./chunk-HAPNODYU.mjs";
10
+ } from "./chunk-WWDN4BEK.mjs";
11
11
  import {
12
12
  serveExecutor
13
- } from "./chunk-VGT53X45.mjs";
14
- import "./chunk-HOFAHND6.mjs";
13
+ } from "./chunk-65PPRXAW.mjs";
15
14
  import "./chunk-RVFKH45R.mjs";
16
15
  import "./chunk-3J7KBHMJ.mjs";
17
16
  import {
18
17
  helmChartGeneratorFn
19
- } from "./chunk-VLPEFUDC.mjs";
18
+ } from "./chunk-6C5CWDYY.mjs";
20
19
  import {
21
20
  helmDependencyGeneratorFn
22
- } from "./chunk-BIWZ2Q24.mjs";
23
- import "./chunk-ZC5XJYOI.mjs";
24
- import "./chunk-QCPSAHUZ.mjs";
21
+ } from "./chunk-DQV7NKM7.mjs";
22
+ import "./chunk-IBVTMWHS.mjs";
23
+ import "./chunk-F26OPCDG.mjs";
25
24
  import "./chunk-EW7TITVO.mjs";
26
25
  import "./chunk-WWU25UQ4.mjs";
27
26
  import {
@@ -1,13 +1,12 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});
2
2
 
3
3
 
4
- var _chunkHIBDWCFDjs = require('../../../chunk-HIBDWCFD.js');
5
- require('../../../chunk-PJ4LNF33.js');
4
+ var _chunkSXNPLQHCjs = require('../../../chunk-SXNPLQHC.js');
6
5
  require('../../../chunk-IOT45LXV.js');
7
- require('../../../chunk-H62G7RPC.js');
6
+ require('../../../chunk-7SAHBYCR.js');
8
7
  require('../../../chunk-4QH2MTXK.js');
9
8
  require('../../../chunk-3GQAWCBQ.js');
10
9
 
11
10
 
12
11
 
13
- exports.default = _chunkHIBDWCFDjs.publishExecutor; exports.getRegistryVersion = _chunkHIBDWCFDjs.getRegistryVersion;
12
+ exports.default = _chunkSXNPLQHCjs.publishExecutor; exports.getRegistryVersion = _chunkSXNPLQHCjs.getRegistryVersion;
@@ -1,10 +1,9 @@
1
1
  import {
2
2
  getRegistryVersion,
3
3
  publishExecutor
4
- } from "../../../chunk-HAPNODYU.mjs";
5
- import "../../../chunk-HOFAHND6.mjs";
4
+ } from "../../../chunk-WWDN4BEK.mjs";
6
5
  import "../../../chunk-RVFKH45R.mjs";
7
- import "../../../chunk-QCPSAHUZ.mjs";
6
+ import "../../../chunk-F26OPCDG.mjs";
8
7
  import "../../../chunk-EW7TITVO.mjs";
9
8
  import "../../../chunk-XUV4U54K.mjs";
10
9
  export {
@@ -1,9 +1,8 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});
2
2
 
3
3
 
4
- var _chunkZUYEBE5Gjs = require('../../../chunk-ZUYEBE5G.js');
5
- require('../../../chunk-PJ4LNF33.js');
6
- require('../../../chunk-H62G7RPC.js');
4
+ var _chunkO47HD2XSjs = require('../../../chunk-O47HD2XS.js');
5
+ require('../../../chunk-7SAHBYCR.js');
7
6
  require('../../../chunk-4QH2MTXK.js');
8
7
  require('../../../chunk-2GAU2GHG.js');
9
8
  require('../../../chunk-LFNGKV6F.js');
@@ -12,4 +11,4 @@ require('../../../chunk-3GQAWCBQ.js');
12
11
 
13
12
 
14
13
 
15
- exports.default = _chunkZUYEBE5Gjs.executor_default; exports.serveExecutor = _chunkZUYEBE5Gjs.serveExecutor;
14
+ exports.default = _chunkO47HD2XSjs.executor_default; exports.serveExecutor = _chunkO47HD2XSjs.serveExecutor;
@@ -1,9 +1,8 @@
1
1
  import {
2
2
  executor_default,
3
3
  serveExecutor
4
- } from "../../../chunk-VGT53X45.mjs";
5
- import "../../../chunk-HOFAHND6.mjs";
6
- import "../../../chunk-QCPSAHUZ.mjs";
4
+ } from "../../../chunk-65PPRXAW.mjs";
5
+ import "../../../chunk-F26OPCDG.mjs";
7
6
  import "../../../chunk-EW7TITVO.mjs";
8
7
  import "../../../chunk-6V45YKVB.mjs";
9
8
  import "../../../chunk-UDLI3L7V.mjs";
@@ -1,12 +1,12 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});
2
2
 
3
3
 
4
- var _chunk7MCE2ZUSjs = require('../../../chunk-7MCE2ZUS.js');
5
- require('../../../chunk-U44U5VL3.js');
6
- require('../../../chunk-H62G7RPC.js');
4
+ var _chunk6U6BC45Cjs = require('../../../chunk-6U6BC45C.js');
5
+ require('../../../chunk-6BXA3PGH.js');
6
+ require('../../../chunk-7SAHBYCR.js');
7
7
  require('../../../chunk-4QH2MTXK.js');
8
8
  require('../../../chunk-3GQAWCBQ.js');
9
9
 
10
10
 
11
11
 
12
- exports.default = _chunk7MCE2ZUSjs.generator_default; exports.helmChartGeneratorFn = _chunk7MCE2ZUSjs.helmChartGeneratorFn;
12
+ exports.default = _chunk6U6BC45Cjs.generator_default; exports.helmChartGeneratorFn = _chunk6U6BC45Cjs.helmChartGeneratorFn;
@@ -1,9 +1,9 @@
1
1
  import {
2
2
  generator_default,
3
3
  helmChartGeneratorFn
4
- } from "../../../chunk-VLPEFUDC.mjs";
5
- import "../../../chunk-ZC5XJYOI.mjs";
6
- import "../../../chunk-QCPSAHUZ.mjs";
4
+ } from "../../../chunk-6C5CWDYY.mjs";
5
+ import "../../../chunk-IBVTMWHS.mjs";
6
+ import "../../../chunk-F26OPCDG.mjs";
7
7
  import "../../../chunk-EW7TITVO.mjs";
8
8
  import "../../../chunk-XUV4U54K.mjs";
9
9
  export {
@@ -1,12 +1,12 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});
2
2
 
3
3
 
4
- var _chunkF3FMMEATjs = require('../../../chunk-F3FMMEAT.js');
5
- require('../../../chunk-U44U5VL3.js');
6
- require('../../../chunk-H62G7RPC.js');
4
+ var _chunkOABQKZJHjs = require('../../../chunk-OABQKZJH.js');
5
+ require('../../../chunk-6BXA3PGH.js');
6
+ require('../../../chunk-7SAHBYCR.js');
7
7
  require('../../../chunk-4QH2MTXK.js');
8
8
  require('../../../chunk-3GQAWCBQ.js');
9
9
 
10
10
 
11
11
 
12
- exports.default = _chunkF3FMMEATjs.generator_default; exports.helmDependencyGeneratorFn = _chunkF3FMMEATjs.helmDependencyGeneratorFn;
12
+ exports.default = _chunkOABQKZJHjs.generator_default; exports.helmDependencyGeneratorFn = _chunkOABQKZJHjs.helmDependencyGeneratorFn;
@@ -1,9 +1,9 @@
1
1
  import {
2
2
  generator_default,
3
3
  helmDependencyGeneratorFn
4
- } from "../../../chunk-BIWZ2Q24.mjs";
5
- import "../../../chunk-ZC5XJYOI.mjs";
6
- import "../../../chunk-QCPSAHUZ.mjs";
4
+ } from "../../../chunk-DQV7NKM7.mjs";
5
+ import "../../../chunk-IBVTMWHS.mjs";
6
+ import "../../../chunk-F26OPCDG.mjs";
7
7
  import "../../../chunk-EW7TITVO.mjs";
8
8
  import "../../../chunk-XUV4U54K.mjs";
9
9
  export {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/k8s-tools",
3
- "version": "0.22.1",
3
+ "version": "0.23.1",
4
4
  "description": "Tools for managing Kubernetes (k8s) infrastructure within a Nx workspace.",
5
5
  "repository": {
6
6
  "type": "github",
@@ -1,59 +0,0 @@
1
- import {
2
- findWorkspaceRoot
3
- } from "./chunk-EW7TITVO.mjs";
4
- import {
5
- __name
6
- } from "./chunk-XUV4U54K.mjs";
7
-
8
- // ../workspace-tools/src/utils/apply-workspace-tokens.ts
9
- var applyWorkspaceExecutorTokens = /* @__PURE__ */ __name(async (option, tokenizerOptions) => {
10
- let result = option;
11
- if (!result) {
12
- return result;
13
- }
14
- let projectName;
15
- let projectRoot;
16
- let sourceRoot;
17
- if (tokenizerOptions?.projectName) {
18
- const context = tokenizerOptions;
19
- projectName = context.projectName;
20
- projectRoot = context.root;
21
- sourceRoot = context.sourceRoot;
22
- } else {
23
- const projectConfig = tokenizerOptions;
24
- projectRoot = projectConfig.root;
25
- if (projectConfig.name) {
26
- projectName = projectConfig.name;
27
- }
28
- if (projectConfig.sourceRoot) {
29
- sourceRoot = projectConfig.sourceRoot;
30
- }
31
- }
32
- if (tokenizerOptions.config) {
33
- const configKeys = Object.keys(tokenizerOptions.config);
34
- if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
35
- for (const configKey of configKeys) {
36
- if (result.includes(`{${configKey}}`)) {
37
- result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
38
- }
39
- }
40
- }
41
- }
42
- if (result.includes("{projectName}")) {
43
- result = result.replaceAll("{projectName}", projectName);
44
- }
45
- if (result.includes("{projectRoot}")) {
46
- result = result.replaceAll("{projectRoot}", projectRoot);
47
- }
48
- if (result.includes("{sourceRoot}")) {
49
- result = result.replaceAll("{sourceRoot}", sourceRoot);
50
- }
51
- if (result.includes("{workspaceRoot}")) {
52
- result = result.replaceAll("{workspaceRoot}", tokenizerOptions.workspaceRoot ?? findWorkspaceRoot());
53
- }
54
- return result;
55
- }, "applyWorkspaceExecutorTokens");
56
-
57
- export {
58
- applyWorkspaceExecutorTokens
59
- };
@@ -1,59 +0,0 @@
1
- "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
2
-
3
- var _chunk4QH2MTXKjs = require('./chunk-4QH2MTXK.js');
4
-
5
-
6
- var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
7
-
8
- // ../workspace-tools/src/utils/apply-workspace-tokens.ts
9
- var applyWorkspaceExecutorTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (option, tokenizerOptions) => {
10
- let result = option;
11
- if (!result) {
12
- return result;
13
- }
14
- let projectName;
15
- let projectRoot;
16
- let sourceRoot;
17
- if (_optionalChain([tokenizerOptions, 'optionalAccess', _ => _.projectName])) {
18
- const context = tokenizerOptions;
19
- projectName = context.projectName;
20
- projectRoot = context.root;
21
- sourceRoot = context.sourceRoot;
22
- } else {
23
- const projectConfig = tokenizerOptions;
24
- projectRoot = projectConfig.root;
25
- if (projectConfig.name) {
26
- projectName = projectConfig.name;
27
- }
28
- if (projectConfig.sourceRoot) {
29
- sourceRoot = projectConfig.sourceRoot;
30
- }
31
- }
32
- if (tokenizerOptions.config) {
33
- const configKeys = Object.keys(tokenizerOptions.config);
34
- if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
35
- for (const configKey of configKeys) {
36
- if (result.includes(`{${configKey}}`)) {
37
- result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
38
- }
39
- }
40
- }
41
- }
42
- if (result.includes("{projectName}")) {
43
- result = result.replaceAll("{projectName}", projectName);
44
- }
45
- if (result.includes("{projectRoot}")) {
46
- result = result.replaceAll("{projectRoot}", projectRoot);
47
- }
48
- if (result.includes("{sourceRoot}")) {
49
- result = result.replaceAll("{sourceRoot}", sourceRoot);
50
- }
51
- if (result.includes("{workspaceRoot}")) {
52
- result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(tokenizerOptions.workspaceRoot, () => ( _chunk4QH2MTXKjs.findWorkspaceRoot.call(void 0, ))));
53
- }
54
- return result;
55
- }, "applyWorkspaceExecutorTokens");
56
-
57
-
58
-
59
- exports.applyWorkspaceExecutorTokens = applyWorkspaceExecutorTokens;