@storm-software/workspace-tools 1.279.3 → 1.280.1

package/dist/src/plugins/typescript/index.mjs

@@ -1,10 +1,440 @@
 import {
-  createNodesV2,
-  name
-} from "../../../chunk-D7XLAFS5.mjs";
-import "../../../chunk-FHBOYSRN.mjs";
-import "../../../chunk-F66XEAID.mjs";
-import "../../../chunk-5EK4H7VB.mjs";
+  getProjectPlatform,
+  getRoot
+} from "../../../chunk-FHBOYSRN.mjs";
+import {
+  ProjectTagConstants,
+  addProjectTag,
+  isEqualProjectTag,
+  setDefaultProjectTags
+} from "../../../chunk-F66XEAID.mjs";
+import "../../../chunk-IPJSQ4JM.mjs";
+
+// src/plugins/typescript/index.ts
+import {
+  createNodesFromFiles
+} from "@nx/devkit";
+import defu from "defu";
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { readNxJson } from "nx/src/config/nx-json.js";
+import { readJsonFile } from "nx/src/utils/fileutils";
+import { readTargetsFromPackageJson } from "nx/src/utils/package-json";
+import { readTSConfig } from "pkg-types";
+var name = "storm-software/typescript";
+var createNodesV2 = [
+  "{project.json,**/project.json}",
+  async (configFiles, options = { includeApps: true }, context) => {
+    const nxJson = readNxJson(context.workspaceRoot);
+    return createNodesFromFiles(
+      async (file, options2 = { includeApps: true }, context2) => {
+        try {
+          const packageJson = createPackageJson(file, context2.workspaceRoot);
+          if (!packageJson) {
+            return {};
+          }
+          const tsconfig = await createTsconfig(file, context2.workspaceRoot);
+          if (!tsconfig) {
+            return {};
+          }
+          const projectConfig = createProjectFromPackageJsonNextToProjectJson(
+            file,
+            packageJson
+          );
+          if (options2?.includeApps === false && projectConfig.projectType === "application") {
+            return {};
+          }
+          const root = getRoot(projectConfig.root, context2);
+          const enableMarkdownlint = options2?.enableMarkdownlint !== false;
+          const enableEslint = options2?.enableEslint !== false;
+          const enableTypeCheck = options2?.enableTypeCheck !== false;
+          const targets = readTargetsFromPackageJson(
+            packageJson,
+            nxJson,
+            projectConfig.root,
+            context2.workspaceRoot
+          );
+          if (join(context2.workspaceRoot, projectConfig.root).startsWith(
+            join(context2.workspaceRoot, "tools")
+          ) && options2?.lintInternalTools !== true) {
+            targets.lint ??= {
+              dependsOn: ["^lint"],
+              executor: "nx:run-commands",
+              options: {
+                command: "echo 'Skipping linting of internal tools package \"{projectName}\". This can be changed by setting `lintInternalTools` to `true` in the Storm TypeScript plugin options.' "
+              }
+            };
+          } else {
+            targets["lint-ls"] ??= {
+              cache: true,
+              inputs: ["linting", "typescript", "^production"],
+              dependsOn: ["^lint-ls"],
+              executor: "nx:run-commands",
+              options: {
+                command: 'pnpm exec ls-lint --config="node_modules/@storm-software/linting-tools/ls-lint/.ls-lint.yml" '
+              }
+            };
+            if (enableMarkdownlint) {
+              targets["lint-markdown"] ??= {
+                cache: true,
+                inputs: [
+                  "linting",
+                  "{projectRoot}/**/*.md",
+                  "{projectRoot}/**/*.mdx"
+                ],
+                outputs: ["{projectRoot}/**/*.md", "{projectRoot}/**/*.mdx"],
+                dependsOn: ["^lint-markdown"],
+                executor: "nx:run-commands",
+                options: {
+                  command: 'pnpm exec markdownlint-cli2 "{projectRoot}/*.{md,mdx}" "{projectRoot}/**/*.{md,mdx}" --config "node_modules/@storm-software/markdownlint/config/base.markdownlint-cli2.jsonc" --fix'
+                }
+              };
+            }
+            if (enableTypeCheck) {
+              targets["lint:tsc"] ??= {
+                cache: true,
+                inputs: ["typescript", "^production"],
+                outputs: ["{workspaceRoot}/dist/{projectRoot}"],
+                executor: "nx:run-commands",
+                dependsOn: ["^lint:tsc"],
+                options: {
+                  command: `pnpm exec tsc --noEmit --pretty --project ${join(
+                    projectConfig.root,
+                    "tsconfig.json"
+                  )}`
+                }
+              };
+            }
+            if (enableEslint) {
+              let eslintConfig = checkEslintConfigAtPath(projectConfig.root);
+              if (!eslintConfig) {
+                eslintConfig = checkEslintConfigAtPath(context2.workspaceRoot);
+              }
+              if (eslintConfig) {
+                targets.lint ??= {
+                  cache: true,
+                  inputs: ["linting", "typescript", "^production"],
+                  outputs: [
+                    "{projectRoot}/**/*.{ts,tsx,js,jsx,json,md,mdx,yaml,yml,html,css,scss,sass,less,graphql,gql}"
+                  ],
+                  dependsOn: [
+                    enableMarkdownlint ? "lint-markdown" : void 0,
+                    enableTypeCheck ? "lint:tsc" : void 0,
+                    "^lint"
+                  ].filter(Boolean),
+                  executor: "@nx/eslint:lint",
+                  options: {
+                    format: "stylish",
+                    fix: true,
+                    errorOnUnmatchedPattern: false,
+                    cache: true,
+                    cacheLocation: "{workspaceRoot}/node_modules/.cache/eslint/{projectRoot}",
+                    eslintConfig
+                  }
+                };
+              }
+            }
+          }
+          targets["format-toml"] ??= {
+            cache: true,
+            inputs: ["linting", "{projectRoot}/**/*.toml"],
+            outputs: ["{projectRoot}/**/*.toml"],
+            dependsOn: ["^format-toml"],
+            executor: "nx:run-commands",
+            options: {
+              command: 'pnpm exec taplo format --config="node_modules/@storm-software/linting-tools/taplo/config.toml" --cache-path="node_modules/.cache/taplo/{projectRoot}" --colors="always" "{projectRoot}/*.toml" "{projectRoot}/**/*.toml" '
+            }
+          };
+          targets["format-readme"] ??= {
+            cache: true,
+            inputs: [
+              "linting",
+              "documentation",
+              "{projectRoot}/{README.md,package.json,Cargo.toml,executors.json,generators.json}"
+            ],
+            outputs: ["{projectRoot}/README.md"],
+            dependsOn: ["^format-readme"],
+            executor: "nx:run-commands",
+            options: {
+              command: 'pnpm exec storm-git readme --templates="tools/readme-templates" --project="{projectName}"'
+            }
+          };
+          targets["format-prettier"] ??= {
+            cache: true,
+            inputs: ["linting", "typescript", "^production"],
+            outputs: ["{projectRoot}/**/*"],
+            dependsOn: ["^format-prettier"],
+            executor: "nx:run-commands",
+            options: {
+              command: 'pnpm exec prettier "{projectRoot}/**/*" --write --ignore-unknown --no-error-on-unmatched-pattern --config="node_modules/@storm-software/prettier/config.json" --ignore-path="node_modules/@storm-software/prettier/.prettierignore" --cache --cache-location="node_modules/.cache/prettier/{projectRoot}" '
+            }
+          };
+          targets.format ??= {
+            cache: true,
+            inputs: ["linting", "typescript", "^production"],
+            outputs: ["{projectRoot}/**/*"],
+            dependsOn: [
+              "format-readme",
+              "format-toml",
+              "format-prettier",
+              "^format"
+            ],
+            executor: "nx:run-commands",
+            options: {
+              command: `echo 'Formatting the project files in "{projectRoot}"' `
+            }
+          };
+          targets.clean ??= {
+            cache: true,
+            executor: "nx:run-commands",
+            inputs: ["typescript", "^production"],
+            outputs: ["{workspaceRoot}/dist/{projectRoot}"],
+            options: {
+              command: "pnpm exec rimraf dist/{projectRoot}",
+              color: true,
+              cwd: "{workspaceRoot}"
+            }
+          };
+          targets.rebuild ??= {
+            cache: false,
+            executor: "nx:run-commands",
+            dependsOn: ["clean", "^build"],
+            inputs: ["typescript", "^production"],
+            outputs: ["{workspaceRoot}/dist/{projectRoot}"],
+            options: {
+              command: `pnpm exec nx run ${projectConfig.name}:build`
+            }
+          };
+          if (checkJestConfigAtPath(projectConfig.root)) {
+            targets.test ??= {
+              cache: true,
+              executor: "@nx/jest:jest",
+              inputs: ["testing", "typescript", "^production"],
+              outputs: ["{workspaceRoot}/coverage/{projectRoot}"],
+              defaultConfiguration: "development",
+              options: {
+                jestConfig: "{projectRoot}/jest.config.ts",
+                passWithNoTests: true
+              },
+              configurations: {
+                development: {
+                  ci: false,
+                  codeCoverage: true
+                },
+                production: {
+                  ci: true,
+                  codeCoverage: true
+                }
+              }
+            };
+          }
+          targets["docs"] ??= {
+            cache: true,
+            inputs: ["linting", "documentation", "typescript", "^production"],
+            outputs: ["{projectRoot}/docs"],
+            dependsOn: ["build", "format-readme", "lint-docs", "^docs"],
+            options: {}
+          };
+          targets["size-limit"] ??= {
+            cache: true,
+            inputs: ["testing", "typescript", "^production"],
+            outputs: ["{workspaceRoot}/dist/{projectRoot}"],
+            dependsOn: ["build", "^size-limit"],
+            options: {}
+          };
+          const isPrivate = packageJson.private ?? false;
+          if (!isPrivate) {
+            addProjectTag(
+              projectConfig,
+              ProjectTagConstants.Registry.TAG_ID,
+              ProjectTagConstants.Registry.NPM,
+              { overwrite: true }
+            );
+            targets["nx-release-publish"] = {
+              cache: false,
+              dependsOn: ["build", "size-limit", "^nx-release-publish"],
+              executor: "@storm-software/workspace-tools:npm-publish",
+              options: {}
+            };
+            if (projectConfig.projectType === "application" || isEqualProjectTag(
+              projectConfig,
+              ProjectTagConstants.ProjectType.TAG_ID,
+              ProjectTagConstants.ProjectType.APPLICATION
+            ) || isEqualProjectTag(
+              projectConfig,
+              ProjectTagConstants.DistStyle.TAG_ID,
+              ProjectTagConstants.DistStyle.CLEAN
+            )) {
+              targets["clean-package"] ??= {
+                cache: true,
+                dependsOn: ["build"],
+                inputs: ["{workspaceRoot}/dist/{projectRoot}"],
+                outputs: ["{workspaceRoot}/dist/{projectRoot}"],
+                executor: "@storm-software/workspace-tools:clean-package",
+                options: {
+                  cleanReadMe: true,
+                  cleanComments: true
+                }
+              };
+              targets["nx-release-publish"].dependsOn?.push("clean-package");
+              targets["size-limit"].dependsOn?.push("clean-package");
+            }
+          }
+          addProjectTag(
+            projectConfig,
+            ProjectTagConstants.Language.TAG_ID,
+            ProjectTagConstants.Language.TYPESCRIPT,
+            { overwrite: true }
+          );
+          const platform = getProjectPlatform(projectConfig);
+          switch (platform) {
+            case "worker":
+              addProjectTag(
+                projectConfig,
+                ProjectTagConstants.Platform.TAG_ID,
+                ProjectTagConstants.Platform.WORKER,
+                { overwrite: true }
+              );
+              break;
+            case "node":
+              addProjectTag(
+                projectConfig,
+                ProjectTagConstants.Platform.TAG_ID,
+                ProjectTagConstants.Platform.NODE,
+                { overwrite: true }
+              );
+              break;
+            case "browser":
+              addProjectTag(
+                projectConfig,
+                ProjectTagConstants.Platform.TAG_ID,
+                ProjectTagConstants.Platform.BROWSER,
+                { overwrite: true }
+              );
+              break;
+            default:
+              addProjectTag(
+                projectConfig,
+                ProjectTagConstants.Platform.TAG_ID,
+                ProjectTagConstants.Platform.NEUTRAL,
+                { overwrite: true }
+              );
+              break;
+          }
+          setDefaultProjectTags(projectConfig, name);
+          return {
+            projects: {
+              [root]: defu(
+                {
+                  root,
+                  targets,
+                  release: {
+                    version: {
+                      generator: "@storm-software/workspace-tools:release-version"
+                    }
+                  }
+                },
+                projectConfig
+              )
+            }
+          };
+        } catch (e) {
+          console.error(e);
+          return {};
+        }
+      },
+      configFiles,
+      options,
+      context
+    );
+  }
+];
+function createProjectFromPackageJsonNextToProjectJson(projectJsonPath, packageJson) {
+  const { nx, name: name2 } = packageJson;
+  const root = dirname(projectJsonPath);
+  return {
+    ...nx,
+    name: name2,
+    root,
+    targets: {}
+  };
+}
+function createPackageJson(projectJsonPath, workspaceRoot) {
+  try {
+    const root = dirname(projectJsonPath);
+    const packageJsonPath = join(workspaceRoot, root, "package.json");
+    if (!existsSync(packageJsonPath)) {
+      return null;
+    }
+    return readJsonFile(packageJsonPath);
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
+}
+async function createTsconfig(projectJsonPath, workspaceRoot) {
+  try {
+    const root = dirname(projectJsonPath);
+    const tsconfigJsonPath = join(workspaceRoot, root, "tsconfig.json");
+    if (!existsSync(tsconfigJsonPath)) {
+      return null;
+    }
+    return readTSConfig(tsconfigJsonPath);
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
+}
+function checkEslintConfigAtPath(directory) {
+  const hasEslintConfigFile = (fileName) => {
+    return existsSync(join(directory, fileName));
+  };
+  if (hasEslintConfigFile(".eslintrc.js")) {
+    return ".eslintrc.js";
+  } else if (hasEslintConfigFile(".eslintrc.cjs")) {
+    return ".eslintrc.cjs";
+  } else if (hasEslintConfigFile(".eslintrc.yaml")) {
+    return ".eslintrc.yaml";
+  } else if (hasEslintConfigFile(".eslintrc.yml")) {
+    return ".eslintrc.yml";
+  } else if (hasEslintConfigFile(".eslintrc.json")) {
+    return ".eslintrc.json";
+  } else if (hasEslintConfigFile(".eslintrc")) {
+    return ".eslintrc";
+  } else if (hasEslintConfigFile("eslint.config.js")) {
+    return "eslint.config.js";
+  } else if (hasEslintConfigFile("eslint.config.cjs")) {
+    return "eslint.config.cjs";
+  } else if (hasEslintConfigFile("eslint.config.mjs")) {
+    return "eslint.config.mjs";
+  } else if (hasEslintConfigFile("eslint.config.ts")) {
+    return "eslint.config.ts";
+  } else if (hasEslintConfigFile("eslint.config.cts")) {
+    return "eslint.config.cts";
+  } else if (hasEslintConfigFile("eslint.config.mts")) {
+    return "eslint.config.mts";
+  }
+  return null;
+}
+function checkJestConfigAtPath(directory) {
+  const hasJestConfigFile = (fileName) => {
+    return existsSync(join(directory, fileName));
+  };
+  if (hasJestConfigFile("eslint.config.js")) {
+    return "jest.config.js";
+  } else if (hasJestConfigFile("eslint.config.cjs")) {
+    return "jest.config.cjs";
+  } else if (hasJestConfigFile("eslint.config.mjs")) {
+    return "jest.config.mjs";
+  } else if (hasJestConfigFile("eslint.config.ts")) {
+    return "jest.config.ts";
+  } else if (hasJestConfigFile("jest.config.cts")) {
+    return "jest.config.cts";
+  } else if (hasJestConfigFile("jest.config.mts")) {
+    return "jest.config.mts";
+  }
+  return null;
+}
 export {
   createNodesV2,
   name

package/dist/src/plugins/typescript/tsup.mjs

@@ -4,7 +4,7 @@ import {
 import {
   setDefaultProjectTags
 } from "../../../chunk-F66XEAID.mjs";
-import "../../../chunk-5EK4H7VB.mjs";
+import "../../../chunk-IPJSQ4JM.mjs";
 
 // src/plugins/typescript/tsup.ts
 import {

package/dist/src/plugins/typescript/untyped-schema.mjs

@@ -5,7 +5,7 @@ import {
   ProjectTagConstants,
   addProjectTag
 } from "../../../chunk-F66XEAID.mjs";
-import "../../../chunk-5EK4H7VB.mjs";
+import "../../../chunk-IPJSQ4JM.mjs";
 
 // src/plugins/typescript/untyped-schema.ts
 import {

package/dist/src/types.mjs

@@ -6,7 +6,7 @@ import {
   ProjectTagTypeValue,
   ProjectTagVariant
 } from "../chunk-BO44O7D2.mjs";
-import "../chunk-5EK4H7VB.mjs";
+import "../chunk-IPJSQ4JM.mjs";
 export {
   ProjectTagDistStyleValue,
   ProjectTagLanguageValue,

package/dist/src/utils/apply-workspace-tokens.mjs

@@ -3,7 +3,7 @@ import {
 } from "../../chunk-KLAMLNPM.mjs";
 import "../../chunk-M5Z57CUO.mjs";
 import "../../chunk-U7JFVMCK.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   applyWorkspaceExecutorTokens
 };

package/dist/src/utils/cargo.mjs

@@ -9,7 +9,7 @@ import {
   isExternal,
   runProcess
 } from "../../chunk-6LP3KKXE.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   INVALID_CARGO_ARGS,
   buildCargoCommand,

package/dist/src/utils/create-cli-options.mjs

@@ -1,7 +1,7 @@
 import {
   createCliOptions
 } from "../../chunk-W2C5IGWW.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   createCliOptions
 };

package/dist/src/utils/get-project-configurations.mjs

@@ -4,7 +4,7 @@ import {
 } from "../../chunk-OWKH2ZBQ.mjs";
 import "../../chunk-M5Z57CUO.mjs";
 import "../../chunk-U7JFVMCK.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   getProjectConfiguration,
   getProjectConfigurations

package/dist/src/utils/index.mjs

@@ -90,7 +90,7 @@ import {
 import "../../chunk-V44DYGWX.mjs";
 import "../../chunk-M5Z57CUO.mjs";
 import "../../chunk-U7JFVMCK.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   INVALID_CARGO_ARGS,
   LOCK_FILES,

package/dist/src/utils/lock-file.mjs

@@ -11,7 +11,7 @@ import {
   getLockFileNodes,
   lockFileExists
 } from "../../chunk-ABE7UOMX.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   LOCK_FILES,
   NPM_LOCK_FILE,

package/dist/src/utils/nx-json.mjs

@@ -3,7 +3,7 @@ import {
   RELEASE,
   withNamedInputs
 } from "../../chunk-2LY7DGBH.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   NAMED_INPUTS,
   RELEASE,

package/dist/src/utils/package-helpers.mjs

@@ -7,7 +7,7 @@ import "../../chunk-SVIG7SR3.mjs";
 import "../../chunk-F66XEAID.mjs";
 import "../../chunk-V44DYGWX.mjs";
 import "../../chunk-U7JFVMCK.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   PackageManagerTypes,
   addPackageJsonGitHead,

package/dist/src/utils/plugin-helpers.mjs

@@ -6,7 +6,7 @@ import {
   getRoot
 } from "../../chunk-FHBOYSRN.mjs";
 import "../../chunk-F66XEAID.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   getProjectConfigFromProjectJsonPath,
   getProjectConfigFromProjectRoot,

package/dist/src/utils/pnpm-deps-update.mjs

@@ -2,7 +2,7 @@ import {
   pnpmUpdate
 } from "../../chunk-KHT5W6AJ.mjs";
 import "../../chunk-U7JFVMCK.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   pnpmUpdate
 };

package/dist/src/utils/project-tags.mjs

@@ -8,7 +8,7 @@ import {
   isEqualProjectTag,
   setDefaultProjectTags
 } from "../../chunk-F66XEAID.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   ProjectTagConstants,
   addPluginProjectTag,

package/dist/src/utils/typia-transform.mjs

@@ -1,7 +1,7 @@
 import {
   getTypiaTransform
 } from "../../chunk-KR72GKIT.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   getTypiaTransform
 };

package/dist/src/utils/versions.mjs

@@ -18,7 +18,7 @@ import {
   typescriptVersion,
   verdaccioVersion
 } from "../../chunk-EK75QNMS.mjs";
-import "../../chunk-5EK4H7VB.mjs";
+import "../../chunk-IPJSQ4JM.mjs";
 export {
   eslintVersion,
   lintStagedVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.279.3",
+  "version": "1.280.1",
   "description": "Tools for managing a Storm workspace, including various Nx generators and executors for common development tasks.",
   "repository": {
     "type": "github",
@@ -208,9 +208,9 @@
     "@size-limit/esbuild": "11.1.4",
     "@size-limit/esbuild-why": "11.1.4",
     "@size-limit/file": "11.1.4",
-    "@storm-software/esbuild": "^0.45.62",
-    "@storm-software/prettier": "^0.51.74",
-    "@storm-software/unbuild": "^0.49.73",
+    "@storm-software/esbuild": "^0.46.1",
+    "@storm-software/prettier": "^0.52.1",
+    "@storm-software/unbuild": "^0.50.1",
     "fs-extra": "11.2.0",
     "glob": "^11.0.1",
     "jiti": "^2.4.2",
@@ -238,5 +238,5 @@
   "publishConfig": { "access": "public" },
   "executors": "./executors.json",
   "generators": "./generators.json",
-  "gitHead": "4468c724d9bcbd9d59abbe56d856277bdd524b6e"
+  "gitHead": "e98f9f2645646b8bc1842cb3626e3defb604472f"
 }