@storm-software/workspace-tools 1.43.5 → 1.43.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.43.5",
+  "version": "1.43.7",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [

package/src/base/index.js

@@ -43485,7 +43485,7 @@ module.exports = __toCommonJS(base_exports);
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_cosmiconfig = __toESM(require_dist(), 1);
 var _static_cache = void 0;
-var getConfigFileName = (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
+var getConfigFileName = async (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
 var getConfigFile = async (filePath) => {
   if (_static_cache) {
     return _static_cache;
@@ -43545,17 +43545,17 @@ var LogLevelLabel = {
 };
 
 // packages/config-tools/src/utilities/find-up.ts
-var import_fs = require("fs");
-var import_path = require("path");
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
 var MAX_PATH_SEARCH_DEPTH = 30;
 var depth = 0;
 function findFolderUp(startPath, endFileNames) {
   const _startPath = startPath ?? process.cwd();
-  if (endFileNames.some((endFileName) => (0, import_fs.existsSync)((0, import_path.join)(_startPath, endFileName)))) {
+  if (endFileNames.some((endFileName) => (0, import_node_fs.existsSync)((0, import_node_path.join)(_startPath, endFileName)))) {
     return _startPath;
   }
   if (_startPath !== "/" && depth++ < MAX_PATH_SEARCH_DEPTH) {
-    const parent = (0, import_path.join)(_startPath, "..");
+    const parent = (0, import_node_path.join)(_startPath, "..");
     return findFolderUp(parent, endFileNames);
   }
   return void 0;
@@ -43614,8 +43614,8 @@ Path: ${pathInsideMonorepo ? pathInsideMonorepo : process.cwd()}`
 }
 
 // packages/config-tools/src/utilities/get-default-config.ts
-var import_fs2 = require("fs");
-var import_path2 = require("path");
+var import_node_fs2 = require("node:fs");
+var import_node_path2 = require("node:path");
 
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
@@ -47284,8 +47284,8 @@ var getDefaultConfig = (config = {}, root) => {
   let license = DefaultStormConfig.license;
   let homepage = DefaultStormConfig.homepage;
   const workspaceRoot = findWorkspaceRoot(root);
-  if ((0, import_fs2.existsSync)((0, import_path2.join)(workspaceRoot, "package.json"))) {
-    const file = (0, import_fs2.readFileSync)((0, import_path2.join)(workspaceRoot, "package.json"), {
+  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(workspaceRoot, "package.json"))) {
+    const file = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(workspaceRoot, "package.json"), {
       encoding: "utf-8"
     });
     if (file) {
@@ -47308,9 +47308,9 @@ var getDefaultConfig = (config = {}, root) => {
     }
   }
   return StormConfigSchema.parse({
-    ...config,
     ...DefaultStormConfig,
-    colors: { ...config.colors, ...DefaultColorConfig },
+    ...config,
+    colors: { ...DefaultColorConfig, ...config.colors },
     workspaceRoot,
     name,
     namespace,
@@ -47501,6 +47501,7 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
 };
 var writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
 var writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
+var writeWarning = (config, message) => getLogFn(config, LogLevel.WARN)(message);
 var writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
 var writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
 var writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
@@ -47653,16 +47654,6 @@ var setConfigEnv = (config) => {
   }
 };
 
-// packages/config-tools/src/utilities/prepare-workspace.ts
-var prepareWorkspace = async () => {
-  const _STORM_CONFIG = getDefaultConfig({
-    ...await getConfigFile(),
-    ...getConfigEnv()
-  });
-  setConfigEnv(_STORM_CONFIG);
-  return _STORM_CONFIG;
-};
-
 // packages/config-tools/src/env/get-env.ts
 var getExtensionEnv = (extensionName) => {
   const prefix = `STORM_EXTENSION_${extensionName.toUpperCase()}_`;
@@ -47730,6 +47721,32 @@ var getConfigEnv = () => {
   }, config);
 };
 
+// packages/config-tools/src/create-storm-config.ts
+var loadStormConfig = async (workspaceRoot) => {
+  let config = {};
+  let _workspaceRoot = workspaceRoot;
+  if (!_workspaceRoot) {
+    _workspaceRoot = findWorkspaceRoot();
+  }
+  const configFile = await getDefaultConfig(
+    {
+      ...await getConfigFile(_workspaceRoot),
+      ...getConfigEnv()
+    },
+    _workspaceRoot
+  );
+  if (configFile) {
+    config = StormConfigSchema.parse(configFile);
+  } else {
+    writeWarning(
+      config,
+      "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not."
+    );
+  }
+  setConfigEnv(config);
+  return config;
+};
+
 // packages/workspace-tools/src/utils/get-workspace-root.ts
 var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
 var getWorkspaceRoot = () => {
@@ -47868,7 +47885,7 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
  - projectName: ${projectName}
 `
       );
-      config = await prepareWorkspace();
+      config = await loadStormConfig(workspaceRoot);
       writeTrace(
         config,
         `Loaded Storm config into env: 
@@ -47956,7 +47973,7 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
         `Loading the Storm Config from environment variables and storm.config.js file...
  - workspaceRoot: ${workspaceRoot}`
       );
-      config = await prepareWorkspace();
+      config = await loadStormConfig(workspaceRoot);
       writeTrace(
         config,
         `Loaded Storm config into env: 

package/src/executors/design-tokens/executor.js

@@ -61401,7 +61401,7 @@ var createTailwindConfig = ({ inputPath }) => {
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_cosmiconfig = __toESM(require_dist17(), 1);
 var _static_cache = void 0;
-var getConfigFileName = (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
+var getConfigFileName = async (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
 var getConfigFile = async (filePath) => {
   if (_static_cache) {
     return _static_cache;
@@ -61461,17 +61461,17 @@ var LogLevelLabel = {
 };
 
 // packages/config-tools/src/utilities/find-up.ts
-var import_fs = require("fs");
-var import_path = require("path");
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
 var MAX_PATH_SEARCH_DEPTH = 30;
 var depth = 0;
 function findFolderUp(startPath, endFileNames) {
   const _startPath = startPath ?? process.cwd();
-  if (endFileNames.some((endFileName) => (0, import_fs.existsSync)((0, import_path.join)(_startPath, endFileName)))) {
+  if (endFileNames.some((endFileName) => (0, import_node_fs.existsSync)((0, import_node_path.join)(_startPath, endFileName)))) {
     return _startPath;
   }
   if (_startPath !== "/" && depth++ < MAX_PATH_SEARCH_DEPTH) {
-    const parent = (0, import_path.join)(_startPath, "..");
+    const parent = (0, import_node_path.join)(_startPath, "..");
     return findFolderUp(parent, endFileNames);
   }
   return void 0;
@@ -61530,8 +61530,8 @@ Path: ${pathInsideMonorepo ? pathInsideMonorepo : process.cwd()}`
 }
 
 // packages/config-tools/src/utilities/get-default-config.ts
-var import_fs2 = require("fs");
-var import_path2 = require("path");
+var import_node_fs2 = require("node:fs");
+var import_node_path2 = require("node:path");
 
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
@@ -65200,8 +65200,8 @@ var getDefaultConfig = (config = {}, root) => {
   let license = DefaultStormConfig.license;
   let homepage = DefaultStormConfig.homepage;
   const workspaceRoot = findWorkspaceRoot(root);
-  if ((0, import_fs2.existsSync)((0, import_path2.join)(workspaceRoot, "package.json"))) {
-    const file = (0, import_fs2.readFileSync)((0, import_path2.join)(workspaceRoot, "package.json"), {
+  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(workspaceRoot, "package.json"))) {
+    const file = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(workspaceRoot, "package.json"), {
       encoding: "utf-8"
     });
     if (file) {
@@ -65224,9 +65224,9 @@ var getDefaultConfig = (config = {}, root) => {
     }
   }
   return StormConfigSchema.parse({
-    ...config,
     ...DefaultStormConfig,
-    colors: { ...config.colors, ...DefaultColorConfig },
+    ...config,
+    colors: { ...DefaultColorConfig, ...config.colors },
     workspaceRoot,
     name,
     namespace,
@@ -65417,6 +65417,7 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
 };
 var writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
 var writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
+var writeWarning = (config, message) => getLogFn(config, LogLevel.WARN)(message);
 var writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
 var writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
 var writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
@@ -65569,16 +65570,6 @@ var setConfigEnv = (config) => {
   }
 };
 
-// packages/config-tools/src/utilities/prepare-workspace.ts
-var prepareWorkspace = async () => {
-  const _STORM_CONFIG = getDefaultConfig({
-    ...await getConfigFile(),
-    ...getConfigEnv()
-  });
-  setConfigEnv(_STORM_CONFIG);
-  return _STORM_CONFIG;
-};
-
 // packages/config-tools/src/env/get-env.ts
 var getExtensionEnv = (extensionName) => {
   const prefix = `STORM_EXTENSION_${extensionName.toUpperCase()}_`;
@@ -65646,6 +65637,32 @@ var getConfigEnv = () => {
   }, config);
 };
 
+// packages/config-tools/src/create-storm-config.ts
+var loadStormConfig = async (workspaceRoot) => {
+  let config = {};
+  let _workspaceRoot = workspaceRoot;
+  if (!_workspaceRoot) {
+    _workspaceRoot = findWorkspaceRoot();
+  }
+  const configFile = await getDefaultConfig(
+    {
+      ...await getConfigFile(_workspaceRoot),
+      ...getConfigEnv()
+    },
+    _workspaceRoot
+  );
+  if (configFile) {
+    config = StormConfigSchema.parse(configFile);
+  } else {
+    writeWarning(
+      config,
+      "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not."
+    );
+  }
+  setConfigEnv(config);
+  return config;
+};
+
 // packages/workspace-tools/src/utils/get-workspace-root.ts
 var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
 var getWorkspaceRoot = () => {
@@ -65758,7 +65775,7 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
  - projectName: ${projectName}
 `
       );
-      config = await prepareWorkspace();
+      config = await loadStormConfig(workspaceRoot);
       writeTrace(
         config,
         `Loaded Storm config into env: