@storm-software/workspace-tools 1.60.23 → 1.62.0

package/src/generators/preset/generator.js

@@ -171997,7 +171997,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",
@@ -172005,6 +172005,7 @@ var init_find_workspace_root = __esm({
       ".storm.yml",
       ".storm.js",
       ".storm.ts",
+      "lerna.json",
       "nx.json",
       "turbo.json",
       "npm-workspace.json",
@@ -381843,25 +381844,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()}`;
@@ -386485,7 +386484,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;
@@ -386546,7 +386545,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,

package/src/generators/release-version/generator.js

@@ -171997,7 +171997,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",
@@ -172005,6 +172005,7 @@ var init_find_workspace_root = __esm({
       ".storm.yml",
       ".storm.js",
       ".storm.ts",
+      "lerna.json",
       "nx.json",
       "turbo.json",
       "npm-workspace.json",
@@ -381843,25 +381844,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()}`;
@@ -386452,9 +386451,9 @@ var init_src2 = __esm({
   }
 });
 
-// node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.3.106_@swc+wasm@1.4.2_@types+node@20.11.20_ofs2qcbkp26ipfo6i6vsjilnfm/node_modules/@nx/js/src/generators/release-version/utils/update-lock-file.js
+// node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.4.2_@swc+wasm@1.4.2_@types+node@20.11.20_n_rxzlxl4elx7wiiidhdla5wvhle/node_modules/@nx/js/src/generators/release-version/utils/update-lock-file.js
 var require_update_lock_file = __commonJS({
-  "node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.3.106_@swc+wasm@1.4.2_@types+node@20.11.20_ofs2qcbkp26ipfo6i6vsjilnfm/node_modules/@nx/js/src/generators/release-version/utils/update-lock-file.js"(exports2) {
+  "node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.4.2_@swc+wasm@1.4.2_@types+node@20.11.20_n_rxzlxl4elx7wiiidhdla5wvhle/node_modules/@nx/js/src/generators/release-version/utils/update-lock-file.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.updateLockFile = void 0;
@@ -386546,9 +386545,9 @@ var require_update_lock_file = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.3.106_@swc+wasm@1.4.2_@types+node@20.11.20_ofs2qcbkp26ipfo6i6vsjilnfm/node_modules/@nx/js/src/generators/release-version/utils/package.js
+// node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.4.2_@swc+wasm@1.4.2_@types+node@20.11.20_n_rxzlxl4elx7wiiidhdla5wvhle/node_modules/@nx/js/src/generators/release-version/utils/package.js
 var require_package4 = __commonJS({
-  "node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.3.106_@swc+wasm@1.4.2_@types+node@20.11.20_ofs2qcbkp26ipfo6i6vsjilnfm/node_modules/@nx/js/src/generators/release-version/utils/package.js"(exports2) {
+  "node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.4.2_@swc+wasm@1.4.2_@types+node@20.11.20_n_rxzlxl4elx7wiiidhdla5wvhle/node_modules/@nx/js/src/generators/release-version/utils/package.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Package = void 0;
@@ -388817,9 +388816,9 @@ var require_npa = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.3.106_@swc+wasm@1.4.2_@types+node@20.11.20_ofs2qcbkp26ipfo6i6vsjilnfm/node_modules/@nx/js/src/generators/release-version/utils/resolve-version-spec.js
+// node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.4.2_@swc+wasm@1.4.2_@types+node@20.11.20_n_rxzlxl4elx7wiiidhdla5wvhle/node_modules/@nx/js/src/generators/release-version/utils/resolve-version-spec.js
 var require_resolve_version_spec = __commonJS({
-  "node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.3.106_@swc+wasm@1.4.2_@types+node@20.11.20_ofs2qcbkp26ipfo6i6vsjilnfm/node_modules/@nx/js/src/generators/release-version/utils/resolve-version-spec.js"(exports2) {
+  "node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.4.2_@swc+wasm@1.4.2_@types+node@20.11.20_n_rxzlxl4elx7wiiidhdla5wvhle/node_modules/@nx/js/src/generators/release-version/utils/resolve-version-spec.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveVersionSpec = void 0;
@@ -388845,9 +388844,9 @@ var require_resolve_version_spec = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.3.106_@swc+wasm@1.4.2_@types+node@20.11.20_ofs2qcbkp26ipfo6i6vsjilnfm/node_modules/@nx/js/src/generators/release-version/utils/resolve-local-package-dependencies.js
+// node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.4.2_@swc+wasm@1.4.2_@types+node@20.11.20_n_rxzlxl4elx7wiiidhdla5wvhle/node_modules/@nx/js/src/generators/release-version/utils/resolve-local-package-dependencies.js
 var require_resolve_local_package_dependencies = __commonJS({
-  "node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.3.106_@swc+wasm@1.4.2_@types+node@20.11.20_ofs2qcbkp26ipfo6i6vsjilnfm/node_modules/@nx/js/src/generators/release-version/utils/resolve-local-package-dependencies.js"(exports2) {
+  "node_modules/.pnpm/@nx+js@18.0.4_@swc-node+register@1.8.0_@swc+core@1.4.2_@swc+wasm@1.4.2_@types+node@20.11.20_n_rxzlxl4elx7wiiidhdla5wvhle/node_modules/@nx/js/src/generators/release-version/utils/resolve-local-package-dependencies.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveLocalPackageDependencies = void 0;
@@ -388953,7 +388952,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;
@@ -389014,7 +389013,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,
@@ -389091,8 +389090,8 @@ Valid values are: ${import_version.validReleaseVersionPrefixes.map((s) => `"${s}
   }
   const projects = options8.projects;
   const createResolvePackageRoot = (customPackageRoot) => (projectNode) => {
-    if (projectNode?.data?.root === config.workspaceRoot || projectNode?.data?.root === ".") {
-      return config.workspaceRoot;
+    if (projectNode?.data?.root === config?.workspaceRoot || projectNode?.data?.root === ".") {
+      return config?.workspaceRoot ?? findWorkspaceRoot();
     }
     if (!customPackageRoot) {
       return projectNode.data.root;
@@ -389108,15 +389107,18 @@ Valid values are: ${import_version.validReleaseVersionPrefixes.map((s) => `"${s}
   for (const project of projects) {
     projectNameToPackageRootMap.set(project.name, resolvePackageRoot(project));
   }
-  let currentVersion;
+  let currentVersion = null;
   let currentVersionResolvedFromFallback = false;
-  let latestMatchingGitTag;
+  let latestMatchingGitTag = null;
   let specifier = options8.specifier ? options8.specifier : void 0;
   for (const project of projects) {
     const projectName = project.name;
     const packageRoot = projectNameToPackageRootMap.get(projectName);
-    const packageJsonPath = (0, import_devkit.joinPathFragments)(packageRoot, "package.json");
-    const workspaceRelativePackageJsonPath = (0, import_node_path4.relative)(config.workspaceRoot, packageJsonPath);
+    const packageJsonPath = (0, import_devkit.joinPathFragments)(packageRoot ?? "./", "package.json");
+    const workspaceRelativePackageJsonPath = (0, import_node_path4.relative)(
+      config?.workspaceRoot ?? findWorkspaceRoot(),
+      packageJsonPath
+    );
     const log = (msg) => {
       writeInfo(config, `${projectName}: ${msg}`);
     };
@@ -389138,7 +389140,7 @@ To fix this you will either need to add a package.json file at that location, or
         const metadata = options8.currentVersionResolverMetadata;
         const registry = metadata?.registry ?? await getNpmRegistry() ?? "https://registry.npmjs.org";
         const tag = metadata?.tag ?? "latest";
-        if (!currentVersion || options8.releaseGroup.projectsRelationship === "independent") {
+        if (options8.releaseGroup.projectsRelationship === "independent") {
           try {
             currentVersion = await new Promise((resolve3, reject) => {
               (0, import_node_child_process2.exec)(
@@ -389188,8 +389190,10 @@ To fix this you will either need to add a package.json file at that location, or
         log(`\u{1F4C4} Resolved the current version as ${currentVersion} from ${packageJsonPath}`);
         break;
       case "git-tag": {
-        if (!currentVersion || // We always need to independently resolve the current version from git tag per project if the projects are independent
-        options8.releaseGroup.projectsRelationship === "independent") {
+        if (
+          // We always need to independently resolve the current version from git tag per project if the projects are independent
+          options8.releaseGroup.projectsRelationship === "independent"
+        ) {
           const releaseTagPattern = options8.releaseGroup.releaseTagPattern;
           latestMatchingGitTag = await (0, import_git.getLatestGitTagForPattern)(releaseTagPattern, {
             projectName: project.name
@@ -389255,7 +389259,7 @@ To fix this you will either need to add a package.json file at that location, or
             previousVersionRef,
             options8.projectGraph,
             affectedProjects
-          );
+          ) ?? void 0;
           if (!specifier) {
             log(
               "\u{1F6AB} No changes were detected using git history and the conventional commits standard."
@@ -389310,7 +389314,7 @@ To fix this you will either need to add a package.json file at that location, or
       tree,
       options8.projectGraph,
       projects.filter(
-        (project2) => project2?.data?.root && project2?.data?.root !== config.workspaceRoot
+        (project2) => project2?.data?.root && project2?.data?.root !== config?.workspaceRoot
       ),
       projectNameToPackageRootMap,
       resolvePackageRoot,
@@ -389321,7 +389325,7 @@ To fix this you will either need to add a package.json file at that location, or
       return localPackageDependency.target === project.name;
     });
     versionData[projectName] = {
-      currentVersion,
+      currentVersion: currentVersion ? currentVersion : "0.0.1",
       dependentProjects,
       newVersion: null
       // will stay as null in the final result in the case that no changes are detected
@@ -389330,8 +389334,13 @@ To fix this you will either need to add a package.json file at that location, or
       log(`\u{1F6AB} Skipping versioning "${projectPackageJson.name}" as no changes were detected.`);
       continue;
     }
+    if (!currentVersion) {
+      throw new Error(`Unable to determine the current version for project "${projectName}"`);
+    }
     const newVersion = (0, import_version.deriveNewSemverVersion)(currentVersion, specifier, options8.preid);
-    versionData[projectName].newVersion = newVersion;
+    if (versionData[projectName]) {
+      versionData[projectName].newVersion = newVersion;
+    }
     (0, import_devkit.writeJson)(tree, packageJsonPath, {
       ...projectPackageJson,
       version: newVersion
@@ -389345,7 +389354,10 @@ To fix this you will either need to add a package.json file at that location, or
     for (const dependentProject of dependentProjects) {
       (0, import_devkit.updateJson)(
         tree,
-        (0, import_devkit.joinPathFragments)(projectNameToPackageRootMap.get(dependentProject.source), "package.json"),
+        (0, import_devkit.joinPathFragments)(
+          projectNameToPackageRootMap.get(dependentProject.source) ?? "./",
+          "package.json"
+        ),
         (json2) => {
           let versionPrefix = options8.versionPrefix ?? "auto";
           if (versionPrefix === "auto") {