@storm-software/workspace-tools 1.202.0 → 1.203.0

package/src/generators/node-library/generator.js

@@ -67720,6 +67720,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 typesNodeVersion = "20.9.0";
 var nxVersion = "^18.0.4";
@@ -67762,6 +67819,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,
@@ -67785,21 +67843,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) {
@@ -67908,96 +67970,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 === ".") {
@@ -68101,7 +68076,7 @@ async function nodeLibraryGeneratorFn(tree, schema) {
     devDependencies: {
       "@types/node": typesNodeVersion
     },
-    buildExecutor: "@storm-software/workspace-tools:tsup-node"
+    buildExecutor: "@storm-software/workspace-tools:unbuild"
   };
   const options = await normalizeOptions(tree, tsLibraryGeneratorOptions);
   const { className, name, propertyName } = (0, import_devkit2.names)(

package/src/plugins/rust/index.js

@@ -101,6 +101,13 @@ var ProjectTagConstants = {
   Provider: {
     TAG_ID: "provider"
   },
+  Platform: {
+    TAG_ID: "platform",
+    NODE: "node",
+    BROWSER: "browser",
+    NEUTRAL: "neutral",
+    WORKER: "worker"
+  },
   Registry: {
     TAG_ID: "registry",
     CARGO: "cargo",

package/src/plugins/typescript/index.js

@@ -51,6 +51,13 @@ var ProjectTagConstants = {
   Provider: {
     TAG_ID: "provider"
   },
+  Platform: {
+    TAG_ID: "platform",
+    NODE: "node",
+    BROWSER: "browser",
+    NEUTRAL: "neutral",
+    WORKER: "worker"
+  },
   Registry: {
     TAG_ID: "registry",
     CARGO: "cargo",

package/src/utils/index.js

@@ -91244,6 +91244,13 @@ var ProjectTagConstants = {
   Provider: {
     TAG_ID: "provider"
   },
+  Platform: {
+    TAG_ID: "platform",
+    NODE: "node",
+    BROWSER: "browser",
+    NEUTRAL: "neutral",
+    WORKER: "worker"
+  },
   Registry: {
     TAG_ID: "registry",
     CARGO: "cargo",

package/src/utils/project-tags.d.ts

@@ -1,5 +1,5 @@
 import { ProjectConfiguration } from "@nx/devkit";
-import { ProjectTagDistStyleValue, ProjectTagLanguageValue, ProjectTagRegistryValue, ProjectTagTypeValue, ProjectTagVariant } from "../../declarations.d";
+import { ProjectTagDistStyleValue, ProjectTagLanguageValue, ProjectTagPlatformValue, ProjectTagRegistryValue, ProjectTagTypeValue, ProjectTagVariant } from "../../declarations.d";
 export declare const ProjectTagConstants: {
     readonly Language: {
         readonly TAG_ID: ProjectTagVariant;
@@ -19,6 +19,13 @@ export declare const ProjectTagConstants: {
     readonly Provider: {
         readonly TAG_ID: ProjectTagVariant;
     };
+    readonly Platform: {
+        readonly TAG_ID: ProjectTagVariant;
+        readonly NODE: ProjectTagPlatformValue;
+        readonly BROWSER: ProjectTagPlatformValue;
+        readonly NEUTRAL: ProjectTagPlatformValue;
+        readonly WORKER: ProjectTagPlatformValue;
+    };
     readonly Registry: {
         readonly TAG_ID: ProjectTagVariant;
         readonly CARGO: ProjectTagRegistryValue;

package/src/utils/project-tags.js

@@ -47,6 +47,13 @@ var ProjectTagConstants = {
   Provider: {
     TAG_ID: "provider"
   },
+  Platform: {
+    TAG_ID: "platform",
+    NODE: "node",
+    BROWSER: "browser",
+    NEUTRAL: "neutral",
+    WORKER: "worker"
+  },
   Registry: {
     TAG_ID: "registry",
     CARGO: "cargo",