@storm-software/workspace-tools 1.60.23 → 1.62.0

package/src/generators/config-schema/generator.js

@@ -175812,7 +175812,7 @@ var init_find_workspace_root = __esm({
   "packages/config-tools/src/utilities/find-workspace-root.ts"() {
     init_find_up();
     rootFiles = [
-      "lerna.json",
+      "storm.json",
       "storm.config.js",
       "storm.config.ts",
       ".storm.json",
@@ -175820,6 +175820,7 @@ var init_find_workspace_root = __esm({
       ".storm.yml",
       ".storm.js",
       ".storm.ts",
+      "lerna.json",
       "nx.json",
       "turbo.json",
       "npm-workspace.json",
@@ -385658,25 +385659,23 @@ var init_get_config_file = __esm({
       } : { config: {}, filepath: jsonPath, isEmpty };
     };
     getConfigFile = async (filePath, additionalFileNames = []) => {
-      const workspacePath = filePath ? filePath : findWorkspaceRootSafe(filePath);
-      let cosmiconfigResult = await getJsonConfigFile("storm", workspacePath);
-      if (!cosmiconfigResult || cosmiconfigResult.isEmpty) {
-        if (!defaultExplorer) {
-          defaultExplorer = await getConfigFileExplorer("storm");
-        }
-        if (defaultExplorer) {
-          cosmiconfigResult = await defaultExplorer.search(workspacePath);
-        }
-        if ((!cosmiconfigResult || cosmiconfigResult.isEmpty) && additionalFileNames.length > 0) {
-          for (const additionalFileName of additionalFileNames) {
-            cosmiconfigResult = await getJsonConfigFile(additionalFileName, workspacePath);
-            if (cosmiconfigResult && !cosmiconfigResult.isEmpty) {
-              break;
-            }
-            cosmiconfigResult = await getConfigFileByName(additionalFileName, workspacePath);
-            if (cosmiconfigResult && !cosmiconfigResult.isEmpty) {
-              break;
-            }
+      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
+      if (!defaultExplorer) {
+        defaultExplorer = await getConfigFileExplorer("storm");
+      }
+      let cosmiconfigResult = null;
+      if (defaultExplorer) {
+        cosmiconfigResult = await defaultExplorer.search(workspacePath);
+      }
+      if ((!cosmiconfigResult || cosmiconfigResult.isEmpty) && additionalFileNames.length > 0) {
+        for (const additionalFileName of additionalFileNames) {
+          cosmiconfigResult = await getJsonConfigFile(additionalFileName, workspacePath);
+          if (cosmiconfigResult && !cosmiconfigResult.isEmpty) {
+            break;
+          }
+          cosmiconfigResult = await getConfigFileByName(additionalFileName, workspacePath);
+          if (cosmiconfigResult && !cosmiconfigResult.isEmpty) {
+            break;
           }
         }
       }
@@ -385842,7 +385841,7 @@ var init_get_log_level = __esm({
           return LogLevel.INFO;
       }
     };
-    getLogLevelLabel = (logLevel) => {
+    getLogLevelLabel = (logLevel = LogLevel.INFO) => {
       if (logLevel >= LogLevel.ALL) {
         return LogLevelLabel.ALL;
       }
@@ -386168,14 +386167,14 @@ var init_set_env = __esm({
         if (extension[key2]) {
           const result = key2?.replace(
             /([A-Z])+/g,
-            (input) => input ? input[0].toUpperCase() + input.slice(1) : ""
+            (input) => input ? input[0]?.toUpperCase() + input.slice(1) : ""
           ).split(/(?=[A-Z])|[\.\-\s_]/).map((x5) => x5.toLowerCase()) ?? [];
           let extensionKey;
           if (result.length === 0) {
             return;
           }
           if (result.length === 1) {
-            extensionKey = result[0].toUpperCase();
+            extensionKey = result[0]?.toUpperCase() ?? "";
           } else {
             extensionKey = result.reduce((ret, part) => {
               return `${ret}_${part.toLowerCase()}`;
@@ -387499,7 +387498,7 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? findWorkspaceRootSafe()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot()
     );
   }
   return result;
@@ -387560,7 +387559,7 @@ ${Object.keys(process.env).map((key2) => ` - ${key2}=${JSON.stringify(process.en
     writeTrace(
       config,
       `Generator schema options \u2699\uFE0F 
-${Object.keys(options8).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2])}`).join("\n")}`
+${Object.keys(options8 ?? {}).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2])}`).join("\n")}`
     );
     const tokenized = applyWorkspaceTokens(
       options8,
@@ -387611,15 +387610,17 @@ ${Object.keys(options8).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2
 // packages/workspace-tools/src/utils/get-project-configurations.ts
 var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
 init_src2();
-var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(findWorkspaceRootSafe());
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(findWorkspaceRoot());
 
 // packages/workspace-tools/src/generators/config-schema/generator.ts
+init_src2();
 async function configSchemaGeneratorFn(tree, options8, config) {
   const projectConfigurations = getProjectConfigurations();
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const modules = await Promise.all(
     Object.keys(projectConfigurations).map(async (key2) => {
       if (projectConfigurations[key2]?.config) {
-        const configPath = (0, import_node_path4.join)(config?.workspaceRoot, projectConfigurations[key2].config);
+        const configPath = (0, import_node_path4.join)(workspaceRoot, projectConfigurations[key2].config);
         if ((0, import_node_fs3.existsSync)(configPath)) {
           const mod = await import(configPath);
           if (mod.default) {
@@ -387645,7 +387646,7 @@ async function configSchemaGeneratorFn(tree, options8, config) {
   );
   (0, import_devkit.writeJson)(
     tree,
-    options8.outputFile ? (0, import_node_path4.join)(config?.workspaceRoot, options8.outputFile) : (0, import_node_path4.join)(config?.workspaceRoot, "storm.schema.json"),
+    options8.outputFile ? (0, import_node_path4.join)(workspaceRoot, options8.outputFile) : (0, import_node_path4.join)(workspaceRoot, "storm.schema.json"),
     zodToJsonSchema(ModulesSchema, "StormConfig")
   );
   await (0, import_devkit.formatFiles)(tree);