@storm-software/workspace-tools 1.202.1 → 1.204.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.204.0 (2024-12-19)
+
+### Features
+
+- **workspace-tools:** Added `platform` to unbuild schema and project tags
+  ([bfbe9dee](https://github.com/storm-software/storm-ops/commit/bfbe9dee))
+
+## 1.203.0 (2024-12-19)
+
+### Features
+
+- **workspace-tools:** Update TypeScript library generators to use `unbuild`
+  executor
+  ([29468243](https://github.com/storm-software/storm-ops/commit/29468243))
+
 ## 1.202.1 (2024-12-19)
 
 ### Bug Fixes

package/declarations.d.ts

@@ -194,12 +194,20 @@ declare function typeScriptLibraryGeneratorFn(
 ): Promise<any>;
 export { typeScriptLibraryGeneratorFn };
 
-export type ProjectTagVariant = "language" | "type" | "dist-style" | "provider";
+export type ProjectTagVariant =
+  | "language"
+  | "type"
+  | "dist-style"
+  | "provider"
+  | "platform"
+  | "registry";
 export const ProjectTagVariant = {
   LANGUAGE: "language" as ProjectTagVariant,
   TYPE: "type" as ProjectTagVariant,
   DIST_STYLE: "dist-style" as ProjectTagVariant,
-  PROVIDER: "provider" as ProjectTagVariant
+  PROVIDER: "provider" as ProjectTagVariant,
+  PLATFORM: "platform" as ProjectTagVariant,
+  REGISTRY: "registry" as ProjectTagVariant
 };
 
 export type ProjectTagLanguageValue = "typescript" | "rust";
@@ -220,6 +228,14 @@ export const ProjectTagDistStyleValue = {
   CLEAN: "clean" as ProjectTagDistStyleValue
 };
 
+export type ProjectTagPlatformValue = "node" | "browser" | "neutral" | "worker";
+export const ProjectTagPlatformValue = {
+  NODE: "node" as ProjectTagPlatformValue,
+  BROWSER: "browser" as ProjectTagPlatformValue,
+  NEUTRAL: "neutral" as ProjectTagPlatformValue,
+  WORKER: "worker" as ProjectTagPlatformValue
+};
+
 export type ProjectTagRegistryValue = "cargo" | "npm" | "container" | "cyclone";
 export const ProjectTagRegistryValue = {
   CARGO: "cargo" as ProjectTagRegistryValue,

package/index.js

@@ -66405,7 +66405,7 @@ var init_schema = __esm({
       worker: z3.string().trim().default("Stormie-Bot").describe(
         "The worker of the package (this is the bot that will be used to perform various tasks)"
       ),
-      env: z3.enum(["development", "staging", "production"]).default("production").describe("The current runtime environment of the package"),
+      envName: z3.enum(["development", "staging", "production"]).default("production").describe("The current runtime environment name for the package"),
       workspaceRoot: z3.string().trim().default("").describe("The root directory of the workspace"),
       packageDirectory: z3.string().trim().optional().describe("The root directory of the package"),
       externalPackagePatterns: z3.array(z3.string()).default([]).describe(
@@ -66527,19 +66527,17 @@ var init_get_default_config = __esm({
       }
     };
     DEFAULT_STORM_CONFIG = {
-      name: "storm",
       namespace: "storm-software",
-      license: "Apache 2.0",
+      license: "Apache-2.0",
       homepage: "https://stormsoftware.com",
-      owner: "@storm-software/development",
+      owner: "@storm-software/admin",
       worker: "stormie-bot",
       runtimeDirectory: "node_modules/.storm",
-      cacheDirectory: "node_modules/.cache/storm",
       skipCache: false,
-      packageManager: "npm",
+      packageManager: "pnpm",
       timezone: "America/New_York",
       locale: "en-US",
-      env: "production",
+      envName: "production",
       branch: "main",
       organization: "storm-software",
       configFile: null,
@@ -67039,7 +67037,7 @@ var init_get_env = __esm({
         cacheDirectory: correctPaths(process.env[`${prefix}CACHE_DIRECTORY`]),
         runtimeVersion: process.env[`${prefix}RUNTIME_VERSION`],
         outputDirectory: correctPaths(process.env[`${prefix}OUTPUT_DIRECTORY`]),
-        env: process.env[`${prefix}ENV`] ?? process.env.NODE_ENV ?? process.env.ENVIRONMENT,
+        envName: process.env[`${prefix}ENV_NAME`] ?? process.env.NODE_ENV ?? process.env.ENVIRONMENT,
         // ci:
         //   process.env[`${prefix}CI`] !== undefined
         //     ? Boolean(
@@ -67268,10 +67266,10 @@ var init_set_env = __esm({
           config.outputDirectory
         );
       }
-      if (config.env) {
-        process.env[`${prefix}ENV`] = config.env;
-        process.env.NODE_ENV = config.env;
-        process.env.ENVIRONMENT = config.env;
+      if (config.envName) {
+        process.env[`${prefix}ENV_NAME`] = config.envName;
+        process.env.NODE_ENV = config.envName;
+        process.env.ENVIRONMENT = config.envName;
       }
       if (config.colors?.base?.light || config.colors?.base?.dark) {
         for (const key of Object.keys(config.colors)) {
@@ -221087,6 +221085,97 @@ 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 getProjectTag = (project, variant) => {
+  if (!hasProjectTag(project, variant)) {
+    return void 0;
+  }
+  project.tags = project.tags ?? [];
+  const prefix = formatProjectTag(variant, "");
+  const tag = project.tags.find((tag2) => tag2.startsWith(prefix));
+  return tag?.replace(prefix, "");
+};
+var isEqualProjectTag = (project, variant, value2) => {
+  const tag = getProjectTag(project, variant);
+  return !!(tag && tag?.toUpperCase() === value2.toUpperCase());
+};
+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));
+  }
+};
+var setDefaultProjectTags = (project) => {
+  project.tags = project.tags ?? [];
+  addProjectTag(
+    project,
+    ProjectTagConstants.ProjectType.TAG_ID,
+    project.projectType === "application" ? ProjectTagConstants.ProjectType.APPLICATION : ProjectTagConstants.ProjectType.LIBRARY,
+    { overwrite: true }
+  );
+  addProjectTag(
+    project,
+    ProjectTagConstants.DistStyle.TAG_ID,
+    project.targets && Object.keys(project.targets).includes("clean-package") ? ProjectTagConstants.DistStyle.CLEAN : ProjectTagConstants.DistStyle.NORMAL,
+    { overwrite: true }
+  );
+  addProjectTag(
+    project,
+    ProjectTagConstants.Platform.TAG_ID,
+    project.targets?.build?.options.platform === "node" ? ProjectTagConstants.Platform.NODE : project.targets?.build?.options.platform === "worker" ? ProjectTagConstants.Platform.WORKER : project.targets?.build?.options.platform === "browser" ? ProjectTagConstants.Platform.BROWSER : ProjectTagConstants.Platform.NEUTRAL,
+    { overwrite: false }
+  );
+};
+
 // packages/workspace-tools/src/utils/versions.ts
 var tsupVersion = "^7.2.0";
 var prettierPackageJsonVersion = "2.4.6";
@@ -221108,7 +221197,7 @@ var nodeVersion = "20.11.0";
 var pnpmVersion = "8.10.2";
 
 // packages/workspace-tools/src/base/typescript-library-generator.ts
-async function typeScriptLibraryGeneratorFn(tree, schema) {
+async function typeScriptLibraryGeneratorFn(tree, schema, config) {
   const options = await normalizeOptions(tree, { ...schema });
   const tasks = [];
   tasks.push(
@@ -221145,6 +221234,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,
@@ -221168,21 +221258,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: false }
+  );
   createProjectTsConfigJson(tree, options);
   (0, import_devkit.addProjectConfiguration)(tree, options.name, projectConfig);
   let repository = {
     type: "github",
-    url: "https://github.com/storm-software/storm-stack.git"
+    url: config?.repository || `https://github.com/${config?.organization || "storm-software"}/${config?.namespace || config?.name || "repository"}.git`
   };
-  let description = schema.description ?? "A package developed by Storm Software 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) {
@@ -235546,7 +235640,7 @@ async function initGenerator(tree, schema) {
 
 // packages/workspace-tools/src/generators/node-library/generator.ts
 var import_devkit11 = require("@nx/devkit");
-async function nodeLibraryGeneratorFn(tree, schema) {
+async function nodeLibraryGeneratorFn(tree, schema, config) {
   const filesDir = (0, import_devkit11.joinPathFragments)(__dirname, "./files");
   const tsLibraryGeneratorOptions = {
     ...schema,
@@ -235576,7 +235670,7 @@ async function nodeLibraryGeneratorFn(tree, schema) {
     buildable: options.bundler && options.bundler !== "none",
     hasUnitTestRunner: options.unitTestRunner !== "none"
   });
-  await typeScriptLibraryGeneratorFn(tree, tsLibraryGeneratorOptions);
+  await typeScriptLibraryGeneratorFn(tree, tsLibraryGeneratorOptions, config);
   await (0, import_devkit11.formatFiles)(tree);
   return null;
 }
@@ -236872,86 +236966,6 @@ function isPostInstallProcess() {
 // packages/workspace-tools/src/utils/package-helpers.ts
 var import_devkit16 = require("@nx/devkit");
 var import_node_fs20 = require("node:fs");
-
-// 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"
-  },
-  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 getProjectTag = (project, variant) => {
-  if (!hasProjectTag(project, variant)) {
-    return void 0;
-  }
-  project.tags = project.tags ?? [];
-  const prefix = formatProjectTag(variant, "");
-  const tag = project.tags.find((tag2) => tag2.startsWith(prefix));
-  return tag?.replace(prefix, "");
-};
-var isEqualProjectTag = (project, variant, value2) => {
-  const tag = getProjectTag(project, variant);
-  return !!(tag && tag?.toUpperCase() === value2.toUpperCase());
-};
-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));
-  }
-};
-var setDefaultProjectTags = (project) => {
-  project.tags = project.tags ?? [];
-  addProjectTag(
-    project,
-    ProjectTagConstants.ProjectType.TAG_ID,
-    project.projectType === "application" ? ProjectTagConstants.ProjectType.APPLICATION : ProjectTagConstants.ProjectType.LIBRARY,
-    { overwrite: true }
-  );
-  addProjectTag(
-    project,
-    ProjectTagConstants.DistStyle.TAG_ID,
-    project.targets && Object.keys(project.targets).includes("clean-package") ? ProjectTagConstants.DistStyle.CLEAN : ProjectTagConstants.DistStyle.NORMAL,
-    { overwrite: true }
-  );
-};
-
-// packages/workspace-tools/src/utils/package-helpers.ts
 var PackageManagerTypes = {
   PackageJson: "package.json",
   CargoToml: "Cargo.toml"