@storm-software/workspace-tools 1.202.0 → 1.203.0

package/meta.json

@@ -3761,13 +3761,29 @@
       ],
       "format": "esm"
     },
+    "packages/workspace-tools/src/utils/project-tags.ts": {
+      "bytes": 3491,
+      "imports": [
+        {
+          "path": "@nx/devkit",
+          "kind": "import-statement",
+          "external": true
+        },
+        {
+          "path": "../../declarations.d",
+          "kind": "import-statement",
+          "external": true
+        }
+      ],
+      "format": "esm"
+    },
     "packages/workspace-tools/src/utils/versions.ts": {
       "bytes": 745,
       "imports": [],
       "format": "esm"
     },
     "packages/workspace-tools/src/base/typescript-library-generator.ts": {
-      "bytes": 12995,
+      "bytes": 13895,
       "imports": [
         {
           "path": "@nx/devkit",
@@ -3795,19 +3811,19 @@
           "external": true
         },
         {
-          "path": "packages/workspace-tools/src/utils/versions.ts",
+          "path": "../executors/unbuild/schema",
           "kind": "import-statement",
-          "original": "../utils/versions"
+          "external": true
         },
         {
-          "path": "@nx/eslint/src/generators/lint-project/lint-project",
-          "kind": "require-call",
-          "external": true
+          "path": "packages/workspace-tools/src/utils/project-tags.ts",
+          "kind": "import-statement",
+          "original": "../utils/project-tags"
         },
         {
-          "path": "@nx/eslint/src/generators/utils/eslint-file",
-          "kind": "require-call",
-          "external": true
+          "path": "packages/workspace-tools/src/utils/versions.ts",
+          "kind": "import-statement",
+          "original": "../utils/versions"
         }
       ],
       "format": "esm"
@@ -23213,7 +23229,7 @@
       "format": "esm"
     },
     "packages/workspace-tools/src/executors/unbuild/schema.json": {
-      "bytes": 3823,
+      "bytes": 4020,
       "imports": []
     },
     "node_modules/.pnpm/zod-to-json-schema@3.23.1_zod@3.23.8/node_modules/zod-to-json-schema/dist/esm/Options.js": {
@@ -23977,7 +23993,7 @@
       "imports": []
     },
     "packages/workspace-tools/src/generators/node-library/generator.ts": {
-      "bytes": 1827,
+      "bytes": 1825,
       "imports": [
         {
           "path": "@nx/devkit",
@@ -24205,22 +24221,6 @@
       ],
       "format": "esm"
     },
-    "packages/workspace-tools/src/utils/project-tags.ts": {
-      "bytes": 3204,
-      "imports": [
-        {
-          "path": "@nx/devkit",
-          "kind": "import-statement",
-          "external": true
-        },
-        {
-          "path": "../../declarations.d",
-          "kind": "import-statement",
-          "external": true
-        }
-      ],
-      "format": "esm"
-    },
     "packages/workspace-tools/src/utils/package-helpers.ts": {
       "bytes": 1439,
       "imports": [
@@ -24631,7 +24631,7 @@
       "format": "esm"
     },
     "packages/workspace-tools/src/generators/neutral-library/generator.ts": {
-      "bytes": 1741,
+      "bytes": 1736,
       "imports": [
         {
           "path": "@nx/devkit",
@@ -24657,7 +24657,7 @@
       "format": "esm"
     },
     "packages/workspace-tools/src/generators/browser-library/generator.ts": {
-      "bytes": 2296,
+      "bytes": 2289,
       "imports": [
         {
           "path": "@nx/devkit",
@@ -27355,16 +27355,6 @@
           "kind": "require-call",
           "external": true
         },
-        {
-          "path": "@nx/eslint/src/generators/lint-project/lint-project",
-          "kind": "require-call",
-          "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/utils/eslint-file",
-          "kind": "require-call",
-          "external": true
-        },
         {
           "path": "@nx/devkit",
           "kind": "require-call",
@@ -30998,7 +30988,7 @@
           "bytesInOutput": 16007
         },
         "packages/workspace-tools/index.ts": {
-          "bytesInOutput": 3844
+          "bytesInOutput": 3818
         },
         "packages/workspace-tools/src/base/base-executor.ts": {
           "bytesInOutput": 4599
@@ -31013,7 +31003,10 @@
           "bytesInOutput": 3251
         },
         "packages/workspace-tools/src/base/typescript-library-generator.ts": {
-          "bytesInOutput": 11671
+          "bytesInOutput": 9318
+        },
+        "packages/workspace-tools/src/utils/project-tags.ts": {
+          "bytesInOutput": 2324
         },
         "packages/workspace-tools/src/utils/versions.ts": {
           "bytesInOutput": 582
@@ -31322,7 +31315,7 @@
           "bytesInOutput": 648
         },
         "packages/workspace-tools/src/generators/node-library/generator.ts": {
-          "bytesInOutput": 1377
+          "bytesInOutput": 1375
         },
         "packages/workspace-tools/src/generators/preset/generator.ts": {
           "bytesInOutput": 8243
@@ -31348,14 +31341,11 @@
         "packages/workspace-tools/src/utils/package-helpers.ts": {
           "bytesInOutput": 1033
         },
-        "packages/workspace-tools/src/utils/project-tags.ts": {
-          "bytesInOutput": 2194
-        },
         "packages/workspace-tools/src/utils/typia-transform.ts": {
           "bytesInOutput": 205
         }
       },
-      "bytes": 10958085
+      "bytes": 10955765
     },
     "dist/packages/workspace-tools/src/executors/unbuild/executor.js": {
       "imports": [
@@ -60085,16 +60075,6 @@
           "path": "@nx/js/src/generators/setup-verdaccio/generator",
           "kind": "require-call",
           "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/lint-project/lint-project",
-          "kind": "require-call",
-          "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/utils/eslint-file",
-          "kind": "require-call",
-          "external": true
         }
       ],
       "exports": [],
@@ -60557,19 +60537,22 @@
           "bytesInOutput": 1915
         },
         "packages/workspace-tools/src/generators/node-library/generator.ts": {
-          "bytesInOutput": 1573
+          "bytesInOutput": 1571
         },
         "packages/workspace-tools/src/base/base-generator.ts": {
           "bytesInOutput": 3245
         },
         "packages/workspace-tools/src/base/typescript-library-generator.ts": {
-          "bytesInOutput": 11657
+          "bytesInOutput": 9304
+        },
+        "packages/workspace-tools/src/utils/project-tags.ts": {
+          "bytesInOutput": 1279
         },
         "packages/workspace-tools/src/utils/versions.ts": {
           "bytesInOutput": 60
         }
       },
-      "bytes": 4207666
+      "bytes": 4206645
     },
     "dist/packages/workspace-tools/src/generators/neutral-library/generator.js": {
       "imports": [
@@ -61612,16 +61595,6 @@
           "path": "@nx/js/src/generators/setup-verdaccio/generator",
           "kind": "require-call",
           "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/lint-project/lint-project",
-          "kind": "require-call",
-          "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/utils/eslint-file",
-          "kind": "require-call",
-          "external": true
         }
       ],
       "exports": [],
@@ -62084,19 +62057,22 @@
           "bytesInOutput": 1915
         },
         "packages/workspace-tools/src/generators/neutral-library/generator.ts": {
-          "bytesInOutput": 1549
+          "bytesInOutput": 1544
         },
         "packages/workspace-tools/src/base/base-generator.ts": {
           "bytesInOutput": 3245
         },
         "packages/workspace-tools/src/base/typescript-library-generator.ts": {
-          "bytesInOutput": 11657
+          "bytesInOutput": 9304
+        },
+        "packages/workspace-tools/src/utils/project-tags.ts": {
+          "bytesInOutput": 1279
         },
         "packages/workspace-tools/src/utils/versions.ts": {
           "bytesInOutput": 27
         }
       },
-      "bytes": 4207618
+      "bytes": 4206594
     },
     "dist/packages/workspace-tools/src/generators/browser-library/generator.js": {
       "imports": [
@@ -63139,16 +63115,6 @@
           "path": "@nx/js/src/generators/setup-verdaccio/generator",
           "kind": "require-call",
           "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/lint-project/lint-project",
-          "kind": "require-call",
-          "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/utils/eslint-file",
-          "kind": "require-call",
-          "external": true
         }
       ],
       "exports": [],
@@ -63611,19 +63577,22 @@
           "bytesInOutput": 1915
         },
         "packages/workspace-tools/src/generators/browser-library/generator.ts": {
-          "bytesInOutput": 2096
+          "bytesInOutput": 2089
         },
         "packages/workspace-tools/src/base/base-generator.ts": {
           "bytesInOutput": 3245
         },
         "packages/workspace-tools/src/base/typescript-library-generator.ts": {
-          "bytesInOutput": 11657
+          "bytesInOutput": 9304
+        },
+        "packages/workspace-tools/src/utils/project-tags.ts": {
+          "bytesInOutput": 1279
         },
         "packages/workspace-tools/src/utils/versions.ts": {
           "bytesInOutput": 27
         }
       },
-      "bytes": 4208165
+      "bytes": 4207139
     },
     "dist/packages/workspace-tools/src/generators/release-version/generator.js": {
       "imports": [
@@ -68443,10 +68412,10 @@
           "bytesInOutput": 1351
         },
         "packages/workspace-tools/src/utils/project-tags.ts": {
-          "bytesInOutput": 1719
+          "bytesInOutput": 1849
         }
       },
-      "bytes": 15488
+      "bytes": 15618
     },
     "dist/packages/workspace-tools/src/plugins/typescript/index.js": {
       "imports": [
@@ -68486,10 +68455,10 @@
           "bytesInOutput": 7257
         },
         "packages/workspace-tools/src/utils/project-tags.ts": {
-          "bytesInOutput": 2188
+          "bytesInOutput": 2318
         }
       },
-      "bytes": 10770
+      "bytes": 10900
     },
     "dist/packages/workspace-tools/src/utils/index.js": {
       "imports": [
@@ -71448,7 +71417,7 @@
           "bytesInOutput": 1026
         },
         "packages/workspace-tools/src/utils/project-tags.ts": {
-          "bytesInOutput": 2194
+          "bytesInOutput": 2324
         },
         "node_modules/.pnpm/@ltd+j-toml@1.38.0/node_modules/@ltd/j-toml/index.mjs": {
           "bytesInOutput": 105840
@@ -71463,7 +71432,7 @@
           "bytesInOutput": 582
         }
       },
-      "bytes": 5493704
+      "bytes": 5493834
     },
     "dist/packages/workspace-tools/src/utils/project-tags.js": {
       "imports": [],
@@ -71471,10 +71440,10 @@
       "entryPoint": "packages/workspace-tools/src/utils/project-tags.ts",
       "inputs": {
         "packages/workspace-tools/src/utils/project-tags.ts": {
-          "bytesInOutput": 2616
+          "bytesInOutput": 2746
         }
       },
-      "bytes": 3686
+      "bytes": 3816
     },
     "dist/packages/workspace-tools/src/utils/toml.js": {
       "imports": [
@@ -72591,16 +72560,6 @@
           "path": "@nx/js/src/generators/setup-verdaccio/generator",
           "kind": "require-call",
           "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/lint-project/lint-project",
-          "kind": "require-call",
-          "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/utils/eslint-file",
-          "kind": "require-call",
-          "external": true
         }
       ],
       "exports": [],
@@ -73063,7 +73022,7 @@
           "bytesInOutput": 1915
         },
         "packages/workspace-tools/src/base/index.ts": {
-          "bytesInOutput": 420
+          "bytesInOutput": 394
         },
         "packages/workspace-tools/src/base/base-executor.ts": {
           "bytesInOutput": 4574
@@ -73075,13 +73034,16 @@
           "bytesInOutput": 3245
         },
         "packages/workspace-tools/src/base/typescript-library-generator.ts": {
-          "bytesInOutput": 11657
+          "bytesInOutput": 9304
+        },
+        "packages/workspace-tools/src/utils/project-tags.ts": {
+          "bytesInOutput": 1279
         },
         "packages/workspace-tools/src/utils/versions.ts": {
           "bytesInOutput": 27
         }
       },
-      "bytes": 4212947
+      "bytes": 4211891
     },
     "dist/packages/workspace-tools/src/base/base-executor.js": {
       "imports": [
@@ -76068,29 +76030,22 @@
           "path": "@nx/js/src/generators/setup-verdaccio/generator",
           "kind": "require-call",
           "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/lint-project/lint-project",
-          "kind": "require-call",
-          "external": true
-        },
-        {
-          "path": "@nx/eslint/src/generators/utils/eslint-file",
-          "kind": "require-call",
-          "external": true
         }
       ],
       "exports": [],
       "entryPoint": "packages/workspace-tools/src/base/typescript-library-generator.ts",
       "inputs": {
         "packages/workspace-tools/src/base/typescript-library-generator.ts": {
-          "bytesInOutput": 12054
+          "bytesInOutput": 9682
+        },
+        "packages/workspace-tools/src/utils/project-tags.ts": {
+          "bytesInOutput": 1275
         },
         "packages/workspace-tools/src/utils/versions.ts": {
           "bytesInOutput": 27
         }
       },
-      "bytes": 13853
+      "bytes": 12800
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.202.0",
+  "version": "1.203.0",
   "type": "commonjs",
   "description": "Tools for managing a Storm workspace, including various Nx generators and executors for common development tasks.",
   "repository": {

package/src/base/index.js

@@ -67611,7 +67611,6 @@ var init_src2 = __esm({
 // packages/workspace-tools/src/base/index.ts
 var base_exports = {};
 __export(base_exports, {
-  addLint: () => addLint,
   createProjectTsConfigJson: () => createProjectTsConfigJson,
   getOutputPath: () => getOutputPath,
   normalizeOptions: () => normalizeOptions,
@@ -67915,6 +67914,63 @@ var import_js = require("@nx/js");
 var import_init = __toESM(require("@nx/js/src/generators/init/init"));
 var import_generator = __toESM(require("@nx/js/src/generators/setup-verdaccio/generator"));
 
+// packages/workspace-tools/src/utils/project-tags.ts
+var ProjectTagConstants = {
+  Language: {
+    TAG_ID: "language",
+    TYPESCRIPT: "typescript",
+    RUST: "rust"
+  },
+  ProjectType: {
+    TAG_ID: "type",
+    LIBRARY: "library",
+    APPLICATION: "application"
+  },
+  DistStyle: {
+    TAG_ID: "dist-style",
+    NORMAL: "normal",
+    CLEAN: "clean"
+  },
+  Provider: {
+    TAG_ID: "provider"
+  },
+  Platform: {
+    TAG_ID: "platform",
+    NODE: "node",
+    BROWSER: "browser",
+    NEUTRAL: "neutral",
+    WORKER: "worker"
+  },
+  Registry: {
+    TAG_ID: "registry",
+    CARGO: "cargo",
+    NPM: "npm",
+    CONTAINER: "container",
+    CYCLONE: "cyclone"
+  }
+};
+var formatProjectTag = (variant, value2) => {
+  return `${variant}:${value2}`;
+};
+var hasProjectTag = (project, variant) => {
+  project.tags = project.tags ?? [];
+  const prefix = formatProjectTag(variant, "");
+  return project.tags.some(
+    (tag) => tag.startsWith(prefix) && tag.length > prefix.length
+  );
+};
+var addProjectTag = (project, variant, value2, options = {
+  overwrite: false
+}) => {
+  project.tags = project.tags ?? [];
+  if (options.overwrite || !hasProjectTag(project, variant)) {
+    project.tags = project.tags.filter(
+      (tag) => !tag.startsWith(formatProjectTag(variant, ""))
+    );
+    project.tags.push(formatProjectTag(variant, value2));
+  }
+};
+
 // packages/workspace-tools/src/utils/versions.ts
 var nxVersion = "^18.0.4";
 
@@ -67956,6 +68012,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
           tsConfig: (0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json"),
           project: (0, import_devkit.joinPathFragments)(options.projectRoot, "package.json"),
           defaultConfiguration: "production",
+          platform: "neutral",
           assets: [
             {
               input: options.projectRoot,
@@ -67979,21 +68036,25 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
             verbose: true
           }
         }
-      },
-      lint: {},
-      test: {}
+      }
     }
   };
-  if (schema.platform && projectConfig?.targets?.build) {
+  if (schema.platform) {
     projectConfig.targets.build.options.platform = schema.platform;
   }
+  addProjectTag(
+    projectConfig,
+    ProjectTagConstants.Platform.TAG_ID,
+    projectConfig.targets.build.options.platform === "node" ? ProjectTagConstants.Platform.NODE : projectConfig.targets.build.options.platform === "worker" ? ProjectTagConstants.Platform.WORKER : projectConfig.targets.build.options.platform === "browser" ? ProjectTagConstants.Platform.BROWSER : ProjectTagConstants.Platform.NEUTRAL,
+    { overwrite: true }
+  );
   createProjectTsConfigJson(tree, options);
   (0, import_devkit.addProjectConfiguration)(tree, options.name, projectConfig);
   let repository = {
     type: "github",
     url: "https://github.com/storm-software/storm-stack.git"
   };
-  let description = schema.description ?? "\u26A1 A Storm package used to create modern, scalable web applications.";
+  let description = schema.description ?? "A package developed by Storm Software used to create modern, scalable web applications.";
   if (tree.exists("package.json")) {
     const packageJson = (0, import_devkit.readJson)(tree, "package.json");
     if (packageJson?.repository) {
@@ -68102,96 +68163,9 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
       exclude: ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
     });
   }
-  const lintCallback = await addLint(tree, options);
-  tasks.push(lintCallback);
   await (0, import_devkit.formatFiles)(tree);
   return null;
 }
-async function addLint(tree, options) {
-  const { lintProjectGenerator } = (0, import_devkit.ensurePackage)("@nx/eslint", nxVersion);
-  const { mapLintPattern } = (
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    require("@nx/eslint/src/generators/lint-project/lint-project")
-  );
-  const projectConfiguration = (0, import_devkit.readProjectConfiguration)(tree, options.name);
-  const task = lintProjectGenerator(tree, {
-    project: options.name,
-    linter: options.linter,
-    skipFormat: true,
-    tsConfigPaths: [(0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json")],
-    unitTestRunner: options.unitTestRunner,
-    eslintFilePatterns: [
-      mapLintPattern(
-        options.projectRoot,
-        options.js ? "js" : "ts",
-        options.rootProject
-      )
-    ],
-    setParserOptionsProject: options.setParserOptionsProject,
-    rootProject: options.rootProject
-  });
-  const {
-    addOverrideToLintConfig,
-    lintConfigHasOverride,
-    isEslintConfigSupported,
-    updateOverrideInLintConfig
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-  } = require("@nx/eslint/src/generators/utils/eslint-file");
-  if (!isEslintConfigSupported(tree)) {
-    return task;
-  }
-  addOverrideToLintConfig(tree, "", {
-    files: ["*.json"],
-    parser: "jsonc-eslint-parser",
-    rules: {
-      "@nx/dependency-checks": [
-        "error",
-        {
-          "buildTargets": ["build"],
-          "ignoredFiles": [
-            "{projectRoot}/esbuild.config.{js,ts,mjs,mts}",
-            "{projectRoot}/jest.config.ts"
-          ],
-          "checkMissingDependencies": true,
-          "checkObsoleteDependencies": true,
-          "checkVersionMismatches": false
-        }
-      ]
-    }
-  });
-  if (lintConfigHasOverride(
-    tree,
-    projectConfiguration.root,
-    (o) => Array.isArray(o.files) ? o.files.some((f2) => f2.match(/\.json$/)) : !!o.files?.match(/\.json$/),
-    true
-  )) {
-    updateOverrideInLintConfig(
-      tree,
-      projectConfiguration.root,
-      (o) => o.rules?.["@nx/dependency-checks"],
-      (o) => {
-        const value2 = o.rules["@nx/dependency-checks"];
-        let ruleSeverity;
-        let ruleOptions;
-        if (Array.isArray(value2)) {
-          ruleSeverity = value2[0];
-          ruleOptions = value2[1];
-        } else {
-          ruleSeverity = value2 ?? "error";
-          ruleOptions = {};
-        }
-        if (options.bundler === "esbuild") {
-          ruleOptions.ignoredFiles = [
-            "{projectRoot}/esbuild.config.{js,ts,mjs,mts}"
-          ];
-          o.rules["@nx/dependency-checks"] = [ruleSeverity, ruleOptions];
-        }
-        return o;
-      }
-    );
-  }
-  return task;
-}
 function getOutputPath(options) {
   const parts = ["dist"];
   if (options.projectRoot === ".") {
@@ -68287,7 +68261,6 @@ async function normalizeOptions(tree, options) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  addLint,
   createProjectTsConfigJson,
   getOutputPath,
   normalizeOptions,

package/src/base/typescript-library-generator.d.ts

@@ -1,8 +1,6 @@
-import { type GeneratorCallback, type Tree } from "@nx/devkit";
-import type { AddLintOptions } from "@nx/js/src/generators/library/library";
+import { type Tree } from "@nx/devkit";
 import type { TypeScriptLibraryGeneratorNormalizedSchema, TypeScriptLibraryGeneratorSchema } from "../../declarations.d";
 export declare function typeScriptLibraryGeneratorFn(tree: Tree, schema: TypeScriptLibraryGeneratorSchema): Promise<null>;
-export declare function addLint(tree: Tree, options: AddLintOptions): Promise<GeneratorCallback>;
 export declare function getOutputPath(options: TypeScriptLibraryGeneratorNormalizedSchema): string;
 export declare function createProjectTsConfigJson(tree: Tree, options: TypeScriptLibraryGeneratorNormalizedSchema): void;
 export declare function normalizeOptions(tree: Tree, options: TypeScriptLibraryGeneratorSchema): Promise<TypeScriptLibraryGeneratorNormalizedSchema>;