@storm-software/workspace-tools 1.180.10 → 1.181.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.181.1 (2024-09-11)
+
+### Bug Fixes
+
+- **workspace-tools:** Resolve issue with names in input files
+  ([2f181c56](https://github.com/storm-software/storm-ops/commit/2f181c56))
+
+## 1.181.0 (2024-09-11)
+
+### Features
+
+- **workspace-tools:** Added TypeScript as a peerDependency
+  ([74da29f1](https://github.com/storm-software/storm-ops/commit/74da29f1))
+
 ## 1.180.10 (2024-09-11)
 
 ### 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-1.180.9-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-1.181.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/index.js

@@ -67229,9 +67229,9 @@ var init_get_default_config = __esm({
       let repository = "https://github.com/storm-software/storm-ops";
       let license = DEFAULT_STORM_CONFIG.license;
       let homepage = DEFAULT_STORM_CONFIG.homepage;
-      const workspaceRoot5 = findWorkspaceRoot(root);
-      if ((0, import_node_fs10.existsSync)((0, import_node_path7.join)(workspaceRoot5, "package.json"))) {
-        const file = (0, import_node_fs10.readFileSync)((0, import_node_path7.join)(workspaceRoot5, "package.json"), {
+      const workspaceRoot4 = findWorkspaceRoot(root);
+      if ((0, import_node_fs10.existsSync)((0, import_node_path7.join)(workspaceRoot4, "package.json"))) {
+        const file = (0, import_node_fs10.readFileSync)((0, import_node_path7.join)(workspaceRoot4, "package.json"), {
           encoding: "utf-8"
         });
         if (file) {
@@ -67264,7 +67264,7 @@ var init_get_default_config = __esm({
           return ret;
         }, {}),
         colors: { ...DEFAULT_COLOR_CONFIG, ...config.colors },
-        workspaceRoot: workspaceRoot5,
+        workspaceRoot: workspaceRoot4,
         name,
         namespace,
         repository,
@@ -68110,14 +68110,14 @@ var init_create_storm_config = __esm({
     init_get_default_config();
     _extension_cache = /* @__PURE__ */ new WeakMap();
     _static_cache = void 0;
-    createConfig = (workspaceRoot5) => {
-      return createStormConfig(void 0, void 0, workspaceRoot5);
+    createConfig = (workspaceRoot4) => {
+      return createStormConfig(void 0, void 0, workspaceRoot4);
     };
-    createStormConfig = (extensionName, schema, workspaceRoot5) => {
+    createStormConfig = (extensionName, schema, workspaceRoot4) => {
       let result;
       if (!_static_cache?.data || !_static_cache?.timestamp || _static_cache.timestamp < Date.now() - 3e4) {
         const config = getConfigEnv();
-        const defaultConfig = getDefaultConfig(config, workspaceRoot5);
+        const defaultConfig = getDefaultConfig(config, workspaceRoot4);
         result = StormConfigSchema.parse({
           ...defaultConfig,
           ...config,
@@ -68126,7 +68126,7 @@ var init_create_storm_config = __esm({
             ...config.colors
           }
         });
-        result.workspaceRoot ??= defaultConfig.workspaceRoot ? defaultConfig.workspaceRoot : findWorkspaceRoot(workspaceRoot5);
+        result.workspaceRoot ??= defaultConfig.workspaceRoot ? defaultConfig.workspaceRoot : findWorkspaceRoot(workspaceRoot4);
       } else {
         result = _static_cache.data;
       }
@@ -68154,7 +68154,7 @@ var init_create_storm_config = __esm({
       _extension_cache.set(extension_cache_key, extension);
       return extension;
     };
-    loadStormConfig = async (workspaceRoot5) => {
+    loadStormConfig = async (workspaceRoot4) => {
       let config = {};
       if (_static_cache?.data && _static_cache?.timestamp && _static_cache.timestamp >= Date.now() + 3e4) {
         writeInfo(
@@ -68163,7 +68163,7 @@ var init_create_storm_config = __esm({
         );
         return _static_cache.data;
       }
-      let _workspaceRoot = workspaceRoot5;
+      let _workspaceRoot = workspaceRoot4;
       if (!_workspaceRoot) {
         _workspaceRoot = findWorkspaceRoot();
       }
@@ -218272,22 +218272,22 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
         "The Build process failed because the context is not valid. Please run this command from a workspace."
       );
     }
-    const workspaceRoot5 = findWorkspaceRoot2();
-    const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot5;
-    const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot5;
+    const workspaceRoot4 = findWorkspaceRoot2();
+    const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot4;
+    const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot4;
     const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
-    config.workspaceRoot = workspaceRoot5;
+    config.workspaceRoot = workspaceRoot4;
     if (!executorOptions.skipReadingConfig) {
       writeDebug2(
         `Loading the Storm Config from environment variables and storm.config.js file...
- - workspaceRoot: ${workspaceRoot5}
+ - workspaceRoot: ${workspaceRoot4}
  - projectRoot: ${projectRoot}
  - sourceRoot: ${sourceRoot}
  - projectName: ${projectName}
 `,
         config
       );
-      config = await loadStormConfig2(workspaceRoot5);
+      config = await loadStormConfig2(workspaceRoot4);
     }
     if (executorOptions?.hooks?.applyDefaultOptions) {
       writeDebug2("Running the applyDefaultOptions hook...", config);
@@ -218307,7 +218307,7 @@ ${Object.keys(options).map(
       options,
       {
         config,
-        workspaceRoot: workspaceRoot5,
+        workspaceRoot: workspaceRoot4,
         projectRoot,
         sourceRoot,
         projectName,
@@ -218403,14 +218403,14 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
     writeInfo2(`\u26A1 Running the ${name} generator...
 
 `, config);
-    const workspaceRoot5 = findWorkspaceRoot2();
+    const workspaceRoot4 = findWorkspaceRoot2();
     if (!generatorOptions.skipReadingConfig) {
       writeDebug2(
         `Loading the Storm Config from environment variables and storm.config.js file...
- - workspaceRoot: ${workspaceRoot5}`,
+ - workspaceRoot: ${workspaceRoot4}`,
         config
       );
-      config = await loadStormConfig2(workspaceRoot5);
+      config = await loadStormConfig2(workspaceRoot4);
     }
     if (generatorOptions?.hooks?.applyDefaultOptions) {
       writeDebug2("Running the applyDefaultOptions hook...", config);
@@ -229902,7 +229902,7 @@ var import_devkit6 = require("@nx/devkit");
 var import_js2 = require("@nx/js");
 var import_node_fs11 = require("node:fs");
 var import_node_path13 = require("node:path");
-function normalizeOptions2(projectRoot, sourceRoot, options) {
+function normalizeOptions2(projectRoot, sourceRoot, options, config) {
   if (global.NX_GRAPH_CREATION)
     return options;
   normalizeRelativePaths(projectRoot, options);
@@ -229922,7 +229922,10 @@ function normalizeOptions2(projectRoot, sourceRoot, options) {
     generateExportsField: options.generateExportsField ?? false,
     javascriptEnabled: options.javascriptEnabled ?? false,
     skipTypeCheck: options.skipTypeCheck ?? false,
-    skipTypeField: options.skipTypeField ?? false
+    skipTypeField: options.skipTypeField ?? false,
+    projectRoot,
+    sourceRoot,
+    config
   };
 }
 function normalizeAssets(assets, root, sourceRoot) {
@@ -230013,12 +230016,14 @@ function analyze() {
     }
   };
 }
-async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
+async function withRollupConfig(rawOptions, rollupConfig = {}, config, dependencies) {
   const { writeWarning: writeWarning2, correctPaths: correctPaths2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
   const ts = (0, import_ensure_typescript.ensureTypescript)();
   const finalConfig = { ...rollupConfig };
   const projectNode = getProjectNode();
-  const projectRoot = correctPaths2((0, import_node_path14.join)(import_devkit7.workspaceRoot, projectNode.data.root));
+  const projectRoot = correctPaths2(
+    (0, import_node_path14.join)(config.workspaceRoot, projectNode.data.root)
+  );
   const projectGraph = global.NX_GRAPH_CREATION ? null : (0, import_devkit7.readCachedProjectGraph)();
   if (!projectGraph) {
     throw new Error(`Cannot find project graph.`);
@@ -230037,7 +230042,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
     const result = (0, import_buildable_libs_utils.calculateProjectBuildableDependencies)(
       void 0,
       projectGraph,
-      import_devkit7.workspaceRoot,
+      config.workspaceRoot,
       projectNode.name,
       process.env.NX_TASK_TARGET_TARGET,
       process.env.NX_TASK_TARGET_CONFIGURATION,
@@ -230051,13 +230056,16 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
   const options = normalizeOptions2(
     projectNode.data.root,
     projectNode.data.sourceRoot,
-    rawOptions
+    rawOptions,
+    config
+  );
+  const tsConfigPath = correctPaths2(
+    (0, import_node_path14.join)(config.workspaceRoot, options.tsConfig)
   );
-  const tsConfigPath = correctPaths2((0, import_node_path14.join)(import_devkit7.workspaceRoot, options.tsConfig));
   const tsConfigFile = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
   const tsConfigInclude = [
     ...tsConfigFile.config?.include && Array.isArray(tsConfigFile.config.include) ? tsConfigFile.config.include : [],
-    (0, import_node_path14.join)(import_devkit7.workspaceRoot, "node_modules/typescript/lib/*.d.ts")
+    (0, import_node_path14.join)(config.workspaceRoot, "node_modules/typescript/lib/*.d.ts")
   ];
   const tsConfig = ts.parseJsonConfigFileContent(
     {
@@ -230076,7 +230084,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
       config
     );
   }
-  finalConfig.input = rollupConfig.input || createInput(options);
+  finalConfig.input = rollupConfig.input || await createInput(options);
   if (options.format) {
     if (Array.isArray(rollupConfig.output)) {
       throw new Error(
@@ -230100,13 +230108,13 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
         // Options are not normalized with project root during graph creation due to the lack of project and project root.
         // Cannot be joined with workspace root now, but will be handled by @nx/rollup/plugin.
         options.outputPath
-      ) : correctPaths2((0, import_node_path14.join)(import_devkit7.workspaceRoot, options.outputPath)),
+      ) : correctPaths2((0, import_node_path14.join)(config.workspaceRoot, options.outputPath)),
       sourcemap: options.sourceMap
     }));
   }
   let packageJson = {};
   if (!global.NX_GRAPH_CREATION) {
-    const packageJsonPath = options.project ? (0, import_node_path14.join)(import_devkit7.workspaceRoot, options.project) : (0, import_node_path14.join)(projectRoot, "package.json");
+    const packageJsonPath = options.project ? (0, import_node_path14.join)(config.workspaceRoot, options.project) : (0, import_node_path14.join)(projectRoot, "package.json");
     if (!(0, import_node_fs12.existsSync)(packageJsonPath)) {
       throw new Error(`Cannot find ${packageJsonPath}.`);
     }
@@ -230152,7 +230160,8 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
       copy2({
         targets: convertCopyAssetsToRollupOptions(
           options.outputPath,
-          options.assets
+          options.assets,
+          config.workspaceRoot
         )
       }),
       image(),
@@ -230162,7 +230171,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
         extensions: fileExtensions
       }),
       require_rollup_plugin_typescript2_cjs()({
-        cwd: correctPaths2(import_devkit7.workspaceRoot),
+        cwd: correctPaths2(config.workspaceRoot),
         check: !options.skipTypeCheck,
         typescript: ts,
         tsconfig: options.tsConfig,
@@ -230200,7 +230209,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
         },
         cwd: correctPaths2(
           (0, import_node_path14.join)(
-            import_devkit7.workspaceRoot,
+            config.workspaceRoot,
             projectNode.data.sourceRoot ?? projectNode.data.root
           )
         ),
@@ -230236,15 +230245,34 @@ function convertRpts2LogLevel(logLevel) {
       return 0;
   }
 }
-function createInput(options) {
+async function createInput(options) {
+  const { correctPaths: correctPaths2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
   if (global.NX_GRAPH_CREATION) return {};
   const mainEntryFileName = options.outputFileName || options.main;
   const input = {};
-  input[(0, import_node_path14.parse)(mainEntryFileName).name] = (0, import_node_path14.join)(import_devkit7.workspaceRoot, options.main);
+  input[(0, import_node_path14.parse)(mainEntryFileName).name] = (0, import_node_path14.join)(
+    options.config.workspaceRoot,
+    options.main
+  );
   options.additionalEntryPoints?.forEach((entry) => {
-    input[(0, import_node_path14.parse)(entry).name] = (0, import_node_path14.join)(import_devkit7.workspaceRoot, entry);
+    const entryPoint = correctPaths2((0, import_node_path14.join)(options.config.workspaceRoot, entry));
+    let entryName = entryPoint.includes(
+      options.sourceRoot.replaceAll("\\", "/")
+    ) ? entryPoint.replace(options.sourceRoot.replaceAll("\\", "/"), "") : entryPoint.replace(
+      options.config.workspaceRoot.replaceAll("\\", "/"),
+      ""
+    );
+    if (entryName.startsWith("/")) {
+      entryName = entryName.slice(1);
+    }
+    input[entryName] = entryPoint;
   });
-  return input;
+  return Object.keys(input).reduce((ret, key) => {
+    if (key.endsWith("/index.ts") && input[key]) {
+      ret[key.replace("/index.ts", "")] = input[key];
+    }
+    return ret;
+  }, input);
 }
 async function createTsCompilerOptions(parsedCommandLine, options, dependencies, config) {
   const { correctPaths: correctPaths2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
@@ -230272,10 +230300,10 @@ async function createTsCompilerOptions(parsedCommandLine, options, dependencies,
   }
   return compilerOptions;
 }
-function convertCopyAssetsToRollupOptions(outputPath, assets) {
+function convertCopyAssetsToRollupOptions(outputPath, assets, workspaceRoot4) {
   return assets ? assets.map((a2) => ({
     src: (0, import_node_path14.join)(a2.input, a2.glob).replace(/\\/g, "/"),
-    dest: (0, import_node_path14.join)(import_devkit7.workspaceRoot, outputPath, a2.output).replace(/\\/g, "/")
+    dest: (0, import_node_path14.join)(workspaceRoot4, outputPath, a2.output).replace(/\\/g, "/")
   })) : [];
 }
 function readCompatibleFormats(config) {
@@ -230304,7 +230332,7 @@ async function* rollupExecutorFn(options, context, config) {
   if (!context?.projectName || !context?.projectsConfigurations?.projects?.[context.projectName]?.root) {
     throw new Error("Nx executor context was invalid");
   }
-  const workspaceRoot5 = findWorkspaceRoot2();
+  const workspaceRoot4 = findWorkspaceRoot2();
   const projectRoot = context?.projectsConfigurations?.projects[context.projectName]?.root;
   const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? projectRoot;
   if (options.clean !== false) {
@@ -230334,7 +230362,7 @@ async function* rollupExecutorFn(options, context, config) {
     const files = await new Glob("**/*.{ts,mts,cts,tsx}", {
       absolute: true,
       cwd: sourceRoot,
-      root: workspaceRoot5
+      root: workspaceRoot4
     }).walk();
     options.additionalEntryPoints = files.reduce(
       (ret, file) => {
@@ -230345,10 +230373,10 @@ async function* rollupExecutorFn(options, context, config) {
         return ret;
       },
       options.additionalEntryPoints?.map(
-        (entry) => correctPaths2((0, import_path5.join)(workspaceRoot5, entry))
+        (entry) => correctPaths2((0, import_path5.join)(workspaceRoot4, entry))
       ) ?? []
     ).map((entry) => {
-      const formatted = entry.replace(workspaceRoot5, "");
+      const formatted = entry.replace(workspaceRoot4, "");
       return formatted.startsWith("/") ? formatted.slice(1) : formatted;
     });
   }
@@ -230460,8 +230488,8 @@ async function createRollupOptions(options, context, config) {
   const rollupConfig = await withRollupConfig(
     options,
     {},
-    dependencies,
-    config
+    config,
+    dependencies
   );
   const generatePackageJsonPlugin = Array.isArray(rollupConfig.plugins) ? rollupConfig.plugins.find(
     (p2) => p2?.["name"] === import_generate_package_json2.pluginName
@@ -233234,13 +233262,13 @@ async function releaseVersionGeneratorFn(tree, options, config) {
 `, config);
   const stopwatch = getStopwatch2("Storm Release Version generator");
   try {
-    const workspaceRoot5 = findWorkspaceRoot2();
+    const workspaceRoot4 = findWorkspaceRoot2();
     writeDebug2(
       `Loading the Storm Config from environment variables and storm.config.js file...
- - workspaceRoot: ${workspaceRoot5}`,
+ - workspaceRoot: ${workspaceRoot4}`,
       config
     );
-    config = await loadStormConfig2(workspaceRoot5);
+    config = await loadStormConfig2(workspaceRoot4);
     writeTrace2(
       `Generator schema options \u2699\uFE0F 
 ${Object.keys(options ?? {}).map((key) => ` - ${key}=${JSON.stringify(options[key])}`).join("\n")}`,
@@ -234079,10 +234107,10 @@ function cargoMetadata() {
   }
   return JSON.parse(output3.output);
 }
-function isExternal(packageOrDep, workspaceRoot5) {
+function isExternal(packageOrDep, workspaceRoot4) {
   const isRegistry = packageOrDep.source?.startsWith("registry+") ?? false;
   const isGit = packageOrDep.source?.startsWith("git+") ?? false;
-  const isOutsideWorkspace = "path" in packageOrDep && (0, import_node_path20.relative)(workspaceRoot5, packageOrDep.path).startsWith("..");
+  const isOutsideWorkspace = "path" in packageOrDep && (0, import_node_path20.relative)(workspaceRoot4, packageOrDep.path).startsWith("..");
   return isRegistry || isGit || isOutsideWorkspace;
 }
 function runProcess(processCmd, ...args) {