@storm-software/terraform-tools 0.52.1 → 0.53.1

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.53.1 (2025-01-22)
+
+### Bug Fixes
+
+- **config-tools:** Resolved issue applying entire token parameters object ([5ccf3881](https://github.com/storm-software/storm-ops/commit/5ccf3881))
+
+### 🧱 Updated Dependencies
+
+- Updated workspace-tools to 1.239.2
+- Updated workspace-tools to 1.239.2
+
+## 0.53.0 (2025-01-22)
+
+### Features
+
+- **workspace-tools:** Enhanced option tokenization logic for executors ([14ed93d7](https://github.com/storm-software/storm-ops/commit/14ed93d7))
+
+### 🧱 Updated Dependencies
+
+- Updated workspace-tools to 1.239.0
+- Updated workspace-tools to 1.239.0
+
 ## 0.52.1 (2025-01-21)
 
 ### Bug Fixes

package/README.md

@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-0.52.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)
+[![Version](https://img.shields.io/badge/version-0.53.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)
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

package/dist/{chunk-TFP2FPZB.mjs → chunk-42WVFPO6.mjs}

@@ -607,48 +607,51 @@ var _isFunction = /* @__PURE__ */ __name((value) => {
 }, "_isFunction");
 
 // ../config-tools/src/utilities/apply-workspace-tokens.ts
-var applyWorkspaceBaseTokens = /* @__PURE__ */ __name(async (option, tokenizerOptions) => {
+var applyWorkspaceBaseTokens = /* @__PURE__ */ __name(async (option, tokenParams) => {
   let result = option;
   if (!result) {
     return result;
   }
-  if (tokenizerOptions) {
-    const optionKeys = Object.keys(tokenizerOptions);
+  if (tokenParams) {
+    const optionKeys = Object.keys(tokenParams);
     if (optionKeys.some((optionKey) => result.includes(`{${optionKey}}`))) {
       for (const optionKey of optionKeys) {
         if (result.includes(`{${optionKey}}`)) {
-          result = result.replaceAll(`{${optionKey}}`, tokenizerOptions.config?.[optionKey] ?? "");
+          result = result.replaceAll(`{${optionKey}}`, tokenParams?.[optionKey] || "");
         }
       }
     }
   }
-  if (tokenizerOptions.config) {
-    const configKeys = Object.keys(tokenizerOptions.config);
+  if (tokenParams.config) {
+    const configKeys = Object.keys(tokenParams.config);
     if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
       for (const configKey of configKeys) {
         if (result.includes(`{${configKey}}`)) {
-          result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
+          result = result.replaceAll(`{${configKey}}`, tokenParams.config[configKey] || "");
         }
       }
     }
   }
   if (result.includes("{workspaceRoot}")) {
-    result = result.replaceAll("{workspaceRoot}", tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot());
+    result = result.replaceAll("{workspaceRoot}", tokenParams.workspaceRoot ?? tokenParams.config?.workspaceRoot ?? findWorkspaceRoot());
   }
   return result;
 }, "applyWorkspaceBaseTokens");
-var applyWorkspaceTokens = /* @__PURE__ */ __name(async (options, config, tokenizerFn) => {
+var applyWorkspaceProjectTokens = /* @__PURE__ */ __name((option, tokenParams) => {
+  return applyWorkspaceBaseTokens(option, tokenParams);
+}, "applyWorkspaceProjectTokens");
+var applyWorkspaceTokens = /* @__PURE__ */ __name(async (options, tokenParams, tokenizerFn) => {
   if (!options) {
     return {};
   }
   const result = {};
   for (const option of Object.keys(options)) {
     if (typeof options[option] === "string") {
-      result[option] = await Promise.resolve(tokenizerFn(options[option], config));
+      result[option] = await Promise.resolve(tokenizerFn(options[option], tokenParams));
     } else if (Array.isArray(options[option])) {
-      result[option] = await Promise.all(options[option].map(async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item));
+      result[option] = await Promise.all(options[option].map(async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, tokenParams)) : item));
     } else if (typeof options[option] === "object") {
-      result[option] = await applyWorkspaceTokens(options[option], config, tokenizerFn);
+      result[option] = await applyWorkspaceTokens(options[option], tokenParams, tokenizerFn);
     } else {
       result[option] = options[option];
     }
@@ -1131,71 +1134,24 @@ ${formatLogMessage(config)}`, config);
   return config;
 }, "loadStormConfig");
 
-// ../workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceExecutorTokens = /* @__PURE__ */ __name(async (option, tokenizerOptions) => {
-  let result = option;
-  if (!result) {
-    return result;
-  }
-  let projectName;
-  let projectRoot;
-  let sourceRoot;
-  if (tokenizerOptions?.projectName) {
-    const context = tokenizerOptions;
-    projectName = context.projectName;
-    projectRoot = context.root;
-    sourceRoot = context.sourceRoot;
-  } else {
-    const projectConfig = tokenizerOptions;
-    projectRoot = projectConfig.root;
-    if (projectConfig.name) {
-      projectName = projectConfig.name;
-    }
-    if (projectConfig.sourceRoot) {
-      sourceRoot = projectConfig.sourceRoot;
-    }
-  }
-  if (tokenizerOptions.config) {
-    const configKeys = Object.keys(tokenizerOptions.config);
-    if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
-      for (const configKey of configKeys) {
-        if (result.includes(`{${configKey}}`)) {
-          result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
-        }
-      }
-    }
-  }
-  if (result.includes("{projectName}")) {
-    result = result.replaceAll("{projectName}", projectName);
-  }
-  if (result.includes("{projectRoot}")) {
-    result = result.replaceAll("{projectRoot}", projectRoot);
-  }
-  if (result.includes("{sourceRoot}")) {
-    result = result.replaceAll("{sourceRoot}", sourceRoot);
-  }
-  if (result.includes("{workspaceRoot}")) {
-    result = result.replaceAll("{workspaceRoot}", tokenizerOptions.workspaceRoot ?? findWorkspaceRoot());
-  }
-  return result;
-}, "applyWorkspaceExecutorTokens");
-
 // ../workspace-tools/src/base/base-executor.ts
+import { defu as defu3 } from "defu";
 var withRunExecutor = /* @__PURE__ */ __name((name, executorFn, executorOptions = {}) => async (_options, context) => {
   const stopwatch = getStopwatch(name);
   let options = _options;
   let config = {};
   try {
-    writeInfo(`\u26A1 Running the ${name} executor...
-`, config);
     if (!context.projectsConfigurations?.projects || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
       throw new Error("The Build process failed because the context is not valid. Please run this command from a workspace.");
     }
     const workspaceRoot = findWorkspaceRoot();
-    const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
-    const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
-    const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot;
+    const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot;
+    const projectName = context.projectName;
     config.workspaceRoot = workspaceRoot;
+    writeInfo(`
+\u26A1 Running the ${name} executor for ${projectName}
+`, config);
     if (!executorOptions.skipReadingConfig) {
       writeTrace(`Loading the Storm Config from environment variables and storm.config.js file...
  - workspaceRoot: ${workspaceRoot}
@@ -1210,17 +1166,19 @@ var withRunExecutor = /* @__PURE__ */ __name((name, executorFn, executorOptions
       options = await Promise.resolve(executorOptions.hooks.applyDefaultOptions(options, config));
       writeDebug("Completed the applyDefaultOptions hook", config);
     }
-    writeTrace(`Executor schema options \u2699\uFE0F 
-${Object.keys(options).map((key) => ` - ${key}=${_isFunction2(options[key]) ? "<function>" : JSON.stringify(options[key])}`).join("\n")}`, config);
-    const tokenized = await applyWorkspaceTokens(options, {
-      config,
+    writeTrace(`Executor schema options \u2699\uFE0F
+${formatLogMessage(options)}
+`, config);
+    const tokenized = await applyWorkspaceTokens(options, defu3({
       workspaceRoot,
       projectRoot,
       sourceRoot,
       projectName,
-      ...context.projectsConfigurations.projects[context.projectName],
-      ...executorOptions
-    }, applyWorkspaceExecutorTokens);
+      config
+    }, config, context.projectsConfigurations.projects[context.projectName]), applyWorkspaceProjectTokens);
+    writeTrace(`Executor schema tokenized options \u2699\uFE0F
+${formatLogMessage(tokenized)}
+`, config);
     if (executorOptions?.hooks?.preProcess) {
       writeDebug("Running the preProcess hook...", config);
       await Promise.resolve(executorOptions.hooks.preProcess(tokenized, config));

package/dist/{chunk-GK3245WN.js → chunk-6D4LV6X2.js}

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkS3PQ6E47js = require('./chunk-S3PQ6E47.js');
+var _chunkTQAFH5OJjs = require('./chunk-TQAFH5OJ.js');
 
 
 var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
@@ -9,7 +9,7 @@ var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
 // src/base/terraform-executor.ts
 var _shelljs = require('shelljs');
 var withTerraformExecutor = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (command, executorOptions = {}) => async (_options, context) => {
-  return _chunkS3PQ6E47js.withRunExecutor.call(void 0, `Terraform \`${command}\` Command Executor`, async (options, context2, config) => {
+  return _chunkTQAFH5OJjs.withRunExecutor.call(void 0, `Terraform \`${command}\` Command Executor`, async (options, context2, config) => {
     if (!_shelljs.which.call(void 0, "tofu") || !_shelljs.which.call(void 0, "terraform")) {
       throw new Error("Both OpenTofu and Terraform are not installed. Please install one of the two before running this executor.");
     }
@@ -21,7 +21,7 @@ var withTerraformExecutor = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0,
     if (typeof jsonBackendConfig === "string") {
       jsonBackendConfig = JSON.parse(jsonBackendConfig);
     }
-    _chunkS3PQ6E47js.run.call(void 0, config, [
+    _chunkTQAFH5OJjs.run.call(void 0, config, [
       "terragrunt",
       command,
       ...jsonBackendConfig.map((config2) => `-backend-config="${config2.key}=${config2.name}"`),

package/dist/{chunk-PNST6H5V.mjs → chunk-D6CRGFE3.mjs}

@@ -1,6 +1,6 @@
 import {
   withTerraformExecutor
-} from "./chunk-KJYJUNDY.mjs";
+} from "./chunk-EMIZUK4F.mjs";
 
 // src/executors/output/executor.ts
 var executor_default = withTerraformExecutor("output");

package/dist/{chunk-KJYJUNDY.mjs → chunk-EMIZUK4F.mjs}

@@ -1,7 +1,7 @@
 import {
   run,
   withRunExecutor
-} from "./chunk-TFP2FPZB.mjs";
+} from "./chunk-42WVFPO6.mjs";
 import {
   __name
 } from "./chunk-XUV4U54K.mjs";

package/dist/{chunk-DFJELNNO.js → chunk-FLEOXRFA.js}

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkGK3245WNjs = require('./chunk-GK3245WN.js');
+var _chunk6D4LV6X2js = require('./chunk-6D4LV6X2.js');
 
 // src/executors/apply/executor.ts
-var executor_default = _chunkGK3245WNjs.withTerraformExecutor.call(void 0, "apply");
+var executor_default = _chunk6D4LV6X2js.withTerraformExecutor.call(void 0, "apply");
 
 
 

package/dist/{chunk-CJ4NNPZP.js → chunk-GEMICIUF.js}

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkGK3245WNjs = require('./chunk-GK3245WN.js');
+var _chunk6D4LV6X2js = require('./chunk-6D4LV6X2.js');
 
 // src/executors/destroy/executor.ts
-var executor_default = _chunkGK3245WNjs.withTerraformExecutor.call(void 0, "destroy");
+var executor_default = _chunk6D4LV6X2js.withTerraformExecutor.call(void 0, "destroy");
 
 
 

package/dist/{chunk-7URDMDS7.mjs → chunk-IMGISWCA.mjs}

@@ -1,6 +1,6 @@
 import {
   withTerraformExecutor
-} from "./chunk-KJYJUNDY.mjs";
+} from "./chunk-EMIZUK4F.mjs";
 
 // src/executors/apply/executor.ts
 var executor_default = withTerraformExecutor("apply");

package/dist/{chunk-SUZ23ERM.js → chunk-JEBWKJI3.js}

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkGK3245WNjs = require('./chunk-GK3245WN.js');
+var _chunk6D4LV6X2js = require('./chunk-6D4LV6X2.js');
 
 // src/executors/output/executor.ts
-var executor_default = _chunkGK3245WNjs.withTerraformExecutor.call(void 0, "output");
+var executor_default = _chunk6D4LV6X2js.withTerraformExecutor.call(void 0, "output");
 
 
 

package/dist/{chunk-PCBBHDHD.mjs → chunk-KBT4UFBN.mjs}

@@ -1,6 +1,6 @@
 import {
   withTerraformExecutor
-} from "./chunk-KJYJUNDY.mjs";
+} from "./chunk-EMIZUK4F.mjs";
 
 // src/executors/destroy/executor.ts
 var executor_default = withTerraformExecutor("destroy");

package/dist/{chunk-JIPJCCPH.js → chunk-MJMNVCOX.js}

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkGK3245WNjs = require('./chunk-GK3245WN.js');
+var _chunk6D4LV6X2js = require('./chunk-6D4LV6X2.js');
 
 // src/executors/plan/executor.ts
-var executor_default = _chunkGK3245WNjs.withTerraformExecutor.call(void 0, "plan");
+var executor_default = _chunk6D4LV6X2js.withTerraformExecutor.call(void 0, "plan");
 
 
 

package/dist/{chunk-S3PQ6E47.js → chunk-TQAFH5OJ.js}

@@ -607,48 +607,51 @@ var _isFunction = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (value) =
 }, "_isFunction");
 
 // ../config-tools/src/utilities/apply-workspace-tokens.ts
-var applyWorkspaceBaseTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (option, tokenizerOptions) => {
+var applyWorkspaceBaseTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (option, tokenParams) => {
   let result = option;
   if (!result) {
     return result;
   }
-  if (tokenizerOptions) {
-    const optionKeys = Object.keys(tokenizerOptions);
+  if (tokenParams) {
+    const optionKeys = Object.keys(tokenParams);
     if (optionKeys.some((optionKey) => result.includes(`{${optionKey}}`))) {
       for (const optionKey of optionKeys) {
         if (result.includes(`{${optionKey}}`)) {
-          result = result.replaceAll(`{${optionKey}}`, _nullishCoalesce(_optionalChain([tokenizerOptions, 'access', _30 => _30.config, 'optionalAccess', _31 => _31[optionKey]]), () => ( "")));
+          result = result.replaceAll(`{${optionKey}}`, _optionalChain([tokenParams, 'optionalAccess', _30 => _30[optionKey]]) || "");
         }
       }
     }
   }
-  if (tokenizerOptions.config) {
-    const configKeys = Object.keys(tokenizerOptions.config);
+  if (tokenParams.config) {
+    const configKeys = Object.keys(tokenParams.config);
     if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
       for (const configKey of configKeys) {
         if (result.includes(`{${configKey}}`)) {
-          result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
+          result = result.replaceAll(`{${configKey}}`, tokenParams.config[configKey] || "");
         }
       }
     }
   }
   if (result.includes("{workspaceRoot}")) {
-    result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(_nullishCoalesce(tokenizerOptions.workspaceRoot, () => ( _optionalChain([tokenizerOptions, 'access', _32 => _32.config, 'optionalAccess', _33 => _33.workspaceRoot]))), () => ( findWorkspaceRoot())));
+    result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _31 => _31.config, 'optionalAccess', _32 => _32.workspaceRoot]))), () => ( findWorkspaceRoot())));
   }
   return result;
 }, "applyWorkspaceBaseTokens");
-var applyWorkspaceTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (options, config, tokenizerFn) => {
+var applyWorkspaceProjectTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (option, tokenParams) => {
+  return applyWorkspaceBaseTokens(option, tokenParams);
+}, "applyWorkspaceProjectTokens");
+var applyWorkspaceTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (options, tokenParams, tokenizerFn) => {
   if (!options) {
     return {};
   }
   const result = {};
   for (const option of Object.keys(options)) {
     if (typeof options[option] === "string") {
-      result[option] = await Promise.resolve(tokenizerFn(options[option], config));
+      result[option] = await Promise.resolve(tokenizerFn(options[option], tokenParams));
     } else if (Array.isArray(options[option])) {
-      result[option] = await Promise.all(options[option].map(async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item));
+      result[option] = await Promise.all(options[option].map(async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, tokenParams)) : item));
     } else if (typeof options[option] === "object") {
-      result[option] = await applyWorkspaceTokens(options[option], config, tokenizerFn);
+      result[option] = await applyWorkspaceTokens(options[option], tokenParams, tokenizerFn);
     } else {
       result[option] = options[option];
     }
@@ -663,7 +666,7 @@ var getConfigFileByName = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, a
     cwd: workspacePath,
     packageJson: true,
     name: fileName,
-    envName: _optionalChain([fileName, 'optionalAccess', _34 => _34.toUpperCase, 'call', _35 => _35()]),
+    envName: _optionalChain([fileName, 'optionalAccess', _33 => _33.toUpperCase, 'call', _34 => _34()]),
     jitiOptions: {
       debug: false,
       fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : joinPaths(process.env.STORM_CACHE_DIR || "node_modules/.cache/storm", "jiti")
@@ -675,7 +678,7 @@ var getConfigFileByName = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, a
       cwd: workspacePath,
       packageJson: true,
       name: fileName,
-      envName: _optionalChain([fileName, 'optionalAccess', _36 => _36.toUpperCase, 'call', _37 => _37()]),
+      envName: _optionalChain([fileName, 'optionalAccess', _35 => _35.toUpperCase, 'call', _36 => _36()]),
       jitiOptions: {
         debug: false,
         fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : joinPaths(process.env.STORM_CACHE_DIR || "node_modules/.cache/storm", "jiti")
@@ -699,7 +702,7 @@ var getConfigFile = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (
   if (additionalFileNames && additionalFileNames.length > 0) {
     const results = await Promise.all(additionalFileNames.map((fileName) => getConfigFileByName(fileName, workspacePath)));
     for (const result2 of results) {
-      if (_optionalChain([result2, 'optionalAccess', _38 => _38.config]) && _optionalChain([result2, 'optionalAccess', _39 => _39.configFile]) && Object.keys(result2.config).length > 0) {
+      if (_optionalChain([result2, 'optionalAccess', _37 => _37.config]) && _optionalChain([result2, 'optionalAccess', _38 => _38.configFile]) && Object.keys(result2.config).length > 0) {
         writeSystem(`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`, {
           logLevel: "all"
         });
@@ -858,13 +861,13 @@ var getBaseThemeColorConfigEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(vo
 var setExtensionEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (extensionName, extension) => {
   for (const key of Object.keys(_nullishCoalesce(extension, () => ( {})))) {
     if (extension[key]) {
-      const result = _nullishCoalesce(_optionalChain([key, 'optionalAccess', _40 => _40.replace, 'call', _41 => _41(/([A-Z])+/g, (input) => input ? _optionalChain([input, 'access', _42 => _42[0], 'optionalAccess', _43 => _43.toUpperCase, 'call', _44 => _44()]) + input.slice(1) : ""), 'access', _45 => _45.split, 'call', _46 => _46(/(?=[A-Z])|[.\-\s_]/), 'access', _47 => _47.map, 'call', _48 => _48((x) => x.toLowerCase())]), () => ( []));
+      const result = _nullishCoalesce(_optionalChain([key, 'optionalAccess', _39 => _39.replace, 'call', _40 => _40(/([A-Z])+/g, (input) => input ? _optionalChain([input, 'access', _41 => _41[0], 'optionalAccess', _42 => _42.toUpperCase, 'call', _43 => _43()]) + input.slice(1) : ""), 'access', _44 => _44.split, 'call', _45 => _45(/(?=[A-Z])|[.\-\s_]/), 'access', _46 => _46.map, 'call', _47 => _47((x) => x.toLowerCase())]), () => ( []));
       let extensionKey;
       if (result.length === 0) {
         return;
       }
       if (result.length === 1) {
-        extensionKey = _nullishCoalesce(_optionalChain([result, 'access', _49 => _49[0], 'optionalAccess', _50 => _50.toUpperCase, 'call', _51 => _51()]), () => ( ""));
+        extensionKey = _nullishCoalesce(_optionalChain([result, 'access', _48 => _48[0], 'optionalAccess', _49 => _49.toUpperCase, 'call', _50 => _50()]), () => ( ""));
       } else {
         extensionKey = result.reduce((ret, part) => {
           return `${ret}_${part.toLowerCase()}`;
@@ -961,7 +964,7 @@ var setConfigEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (config)
     process.env.NODE_ENV = config.env;
     process.env.ENVIRONMENT = config.env;
   }
-  if (_optionalChain([config, 'access', _52 => _52.colors, 'optionalAccess', _53 => _53.base, 'optionalAccess', _54 => _54.light]) || _optionalChain([config, 'access', _55 => _55.colors, 'optionalAccess', _56 => _56.base, 'optionalAccess', _57 => _57.dark])) {
+  if (_optionalChain([config, 'access', _51 => _51.colors, 'optionalAccess', _52 => _52.base, 'optionalAccess', _53 => _53.light]) || _optionalChain([config, 'access', _54 => _54.colors, 'optionalAccess', _55 => _55.base, 'optionalAccess', _56 => _56.dark])) {
     for (const key of Object.keys(config.colors)) {
       setThemeColorConfigEnv(`${prefix}COLOR_${key}_`, config.colors[key]);
     }
@@ -1009,7 +1012,7 @@ var setConfigEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (config)
   }
 }, "setConfigEnv");
 var setThemeColorConfigEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (prefix, config) => {
-  return _optionalChain([config, 'optionalAccess', _58 => _58.light, 'optionalAccess', _59 => _59.brand]) || _optionalChain([config, 'optionalAccess', _60 => _60.dark, 'optionalAccess', _61 => _61.brand]) ? setMultiThemeColorConfigEnv(prefix, config) : setSingleThemeColorConfigEnv(prefix, config);
+  return _optionalChain([config, 'optionalAccess', _57 => _57.light, 'optionalAccess', _58 => _58.brand]) || _optionalChain([config, 'optionalAccess', _59 => _59.dark, 'optionalAccess', _60 => _60.brand]) ? setMultiThemeColorConfigEnv(prefix, config) : setSingleThemeColorConfigEnv(prefix, config);
 }, "setThemeColorConfigEnv");
 var setSingleThemeColorConfigEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (prefix, config) => {
   if (config.dark) {
@@ -1110,7 +1113,7 @@ var setBaseThemeColorConfigEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(vo
 var _static_cache = void 0;
 var loadStormConfig = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (workspaceRoot) => {
   let config = {};
-  if (_optionalChain([_static_cache, 'optionalAccess', _62 => _62.data]) && _optionalChain([_static_cache, 'optionalAccess', _63 => _63.timestamp]) && _static_cache.timestamp >= Date.now() + 3e4) {
+  if (_optionalChain([_static_cache, 'optionalAccess', _61 => _61.data]) && _optionalChain([_static_cache, 'optionalAccess', _62 => _62.timestamp]) && _static_cache.timestamp >= Date.now() + 3e4) {
     writeTrace(`Configuration cache hit - ${_static_cache.timestamp}`, _static_cache.data);
     return _static_cache.data;
   }
@@ -1131,71 +1134,24 @@ ${formatLogMessage(config)}`, config);
   return config;
 }, "loadStormConfig");
 
-// ../workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceExecutorTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (option, tokenizerOptions) => {
-  let result = option;
-  if (!result) {
-    return result;
-  }
-  let projectName;
-  let projectRoot;
-  let sourceRoot;
-  if (_optionalChain([tokenizerOptions, 'optionalAccess', _64 => _64.projectName])) {
-    const context = tokenizerOptions;
-    projectName = context.projectName;
-    projectRoot = context.root;
-    sourceRoot = context.sourceRoot;
-  } else {
-    const projectConfig = tokenizerOptions;
-    projectRoot = projectConfig.root;
-    if (projectConfig.name) {
-      projectName = projectConfig.name;
-    }
-    if (projectConfig.sourceRoot) {
-      sourceRoot = projectConfig.sourceRoot;
-    }
-  }
-  if (tokenizerOptions.config) {
-    const configKeys = Object.keys(tokenizerOptions.config);
-    if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
-      for (const configKey of configKeys) {
-        if (result.includes(`{${configKey}}`)) {
-          result = result.replaceAll(`{${configKey}}`, tokenizerOptions.config[configKey]);
-        }
-      }
-    }
-  }
-  if (result.includes("{projectName}")) {
-    result = result.replaceAll("{projectName}", projectName);
-  }
-  if (result.includes("{projectRoot}")) {
-    result = result.replaceAll("{projectRoot}", projectRoot);
-  }
-  if (result.includes("{sourceRoot}")) {
-    result = result.replaceAll("{sourceRoot}", sourceRoot);
-  }
-  if (result.includes("{workspaceRoot}")) {
-    result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(tokenizerOptions.workspaceRoot, () => ( findWorkspaceRoot())));
-  }
-  return result;
-}, "applyWorkspaceExecutorTokens");
-
 // ../workspace-tools/src/base/base-executor.ts
+
 var withRunExecutor = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (name, executorFn, executorOptions = {}) => async (_options, context) => {
   const stopwatch = getStopwatch(name);
   let options = _options;
   let config = {};
   try {
-    writeInfo(`\u26A1 Running the ${name} executor...
-`, config);
-    if (!_optionalChain([context, 'access', _65 => _65.projectsConfigurations, 'optionalAccess', _66 => _66.projects]) || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
+    if (!_optionalChain([context, 'access', _63 => _63.projectsConfigurations, 'optionalAccess', _64 => _64.projects]) || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
       throw new Error("The Build process failed because the context is not valid. Please run this command from a workspace.");
     }
     const workspaceRoot = findWorkspaceRoot();
-    const projectRoot = _nullishCoalesce(_optionalChain([context, 'access', _67 => _67.projectsConfigurations, 'access', _68 => _68.projects, 'access', _69 => _69[context.projectName], 'optionalAccess', _70 => _70.root]), () => ( workspaceRoot));
-    const sourceRoot = _nullishCoalesce(_optionalChain([context, 'access', _71 => _71.projectsConfigurations, 'access', _72 => _72.projects, 'access', _73 => _73[context.projectName], 'optionalAccess', _74 => _74.sourceRoot]), () => ( workspaceRoot));
-    const projectName = _nullishCoalesce(_optionalChain([context, 'access', _75 => _75.projectsConfigurations, 'access', _76 => _76.projects, 'access', _77 => _77[context.projectName], 'optionalAccess', _78 => _78.name]), () => ( context.projectName));
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot;
+    const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot;
+    const projectName = context.projectName;
     config.workspaceRoot = workspaceRoot;
+    writeInfo(`
+\u26A1 Running the ${name} executor for ${projectName}
+`, config);
     if (!executorOptions.skipReadingConfig) {
       writeTrace(`Loading the Storm Config from environment variables and storm.config.js file...
  - workspaceRoot: ${workspaceRoot}
@@ -1205,43 +1161,45 @@ var withRunExecutor = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (name
 `, config);
       config = await loadStormConfig(workspaceRoot);
     }
-    if (_optionalChain([executorOptions, 'optionalAccess', _79 => _79.hooks, 'optionalAccess', _80 => _80.applyDefaultOptions])) {
+    if (_optionalChain([executorOptions, 'optionalAccess', _65 => _65.hooks, 'optionalAccess', _66 => _66.applyDefaultOptions])) {
       writeDebug("Running the applyDefaultOptions hook...", config);
       options = await Promise.resolve(executorOptions.hooks.applyDefaultOptions(options, config));
       writeDebug("Completed the applyDefaultOptions hook", config);
     }
-    writeTrace(`Executor schema options \u2699\uFE0F 
-${Object.keys(options).map((key) => ` - ${key}=${_isFunction2(options[key]) ? "<function>" : JSON.stringify(options[key])}`).join("\n")}`, config);
-    const tokenized = await applyWorkspaceTokens(options, {
-      config,
+    writeTrace(`Executor schema options \u2699\uFE0F
+${formatLogMessage(options)}
+`, config);
+    const tokenized = await applyWorkspaceTokens(options, _defu.defu.call(void 0, {
       workspaceRoot,
       projectRoot,
       sourceRoot,
       projectName,
-      ...context.projectsConfigurations.projects[context.projectName],
-      ...executorOptions
-    }, applyWorkspaceExecutorTokens);
-    if (_optionalChain([executorOptions, 'optionalAccess', _81 => _81.hooks, 'optionalAccess', _82 => _82.preProcess])) {
+      config
+    }, config, context.projectsConfigurations.projects[context.projectName]), applyWorkspaceProjectTokens);
+    writeTrace(`Executor schema tokenized options \u2699\uFE0F
+${formatLogMessage(tokenized)}
+`, config);
+    if (_optionalChain([executorOptions, 'optionalAccess', _67 => _67.hooks, 'optionalAccess', _68 => _68.preProcess])) {
       writeDebug("Running the preProcess hook...", config);
       await Promise.resolve(executorOptions.hooks.preProcess(tokenized, config));
       writeDebug("Completed the preProcess hook", config);
     }
     const ret = executorFn(tokenized, context, config);
-    if (_isFunction2(_optionalChain([ret, 'optionalAccess', _83 => _83.next]))) {
+    if (_isFunction2(_optionalChain([ret, 'optionalAccess', _69 => _69.next]))) {
       const asyncGen = ret;
       for await (const iter of asyncGen) {
       }
     }
     const result = await Promise.resolve(ret);
-    if (result && (!result.success || result.error && _optionalChain([result, 'optionalAccess', _84 => _84.error, 'optionalAccess', _85 => _85.message]) && typeof _optionalChain([result, 'optionalAccess', _86 => _86.error, 'optionalAccess', _87 => _87.message]) === "string" && _optionalChain([result, 'optionalAccess', _88 => _88.error, 'optionalAccess', _89 => _89.name]) && typeof _optionalChain([result, 'optionalAccess', _90 => _90.error, 'optionalAccess', _91 => _91.name]) === "string")) {
+    if (result && (!result.success || result.error && _optionalChain([result, 'optionalAccess', _70 => _70.error, 'optionalAccess', _71 => _71.message]) && typeof _optionalChain([result, 'optionalAccess', _72 => _72.error, 'optionalAccess', _73 => _73.message]) === "string" && _optionalChain([result, 'optionalAccess', _74 => _74.error, 'optionalAccess', _75 => _75.name]) && typeof _optionalChain([result, 'optionalAccess', _76 => _76.error, 'optionalAccess', _77 => _77.name]) === "string")) {
       writeTrace(`Failure determined by the ${name} executor 
 ${formatLogMessage(result)}`, config);
       console.error(result);
       throw new Error(`The ${name} executor failed to run`, {
-        cause: _optionalChain([result, 'optionalAccess', _92 => _92.error])
+        cause: _optionalChain([result, 'optionalAccess', _78 => _78.error])
       });
     }
-    if (_optionalChain([executorOptions, 'optionalAccess', _93 => _93.hooks, 'optionalAccess', _94 => _94.postProcess])) {
+    if (_optionalChain([executorOptions, 'optionalAccess', _79 => _79.hooks, 'optionalAccess', _80 => _80.postProcess])) {
       writeDebug("Running the postProcess hook...", config);
       await Promise.resolve(executorOptions.hooks.postProcess(config));
       writeDebug("Completed the postProcess hook", config);
@@ -1265,7 +1223,7 @@ ${formatLogMessage(result)}`, config);
 }, "withRunExecutor");
 var _isFunction2 = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (value) => {
   try {
-    return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess', _95 => _95.constructor]) && _optionalChain([value, 'optionalAccess', _96 => _96.call]) && _optionalChain([value, 'optionalAccess', _97 => _97.apply]));
+    return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess', _81 => _81.constructor]) && _optionalChain([value, 'optionalAccess', _82 => _82.call]) && _optionalChain([value, 'optionalAccess', _83 => _83.apply]));
   } catch (e) {
     return false;
   }