@storm-software/workspace-tools 1.155.0 → 1.157.0

package/src/generators/release-version/schema.d.ts

@@ -1,3 +1,4 @@
 import type { ReleaseVersionGeneratorSchema as NxReleaseVersionGeneratorSchema } from "nx/src/command-line/release/version.js";
 
-export interface ReleaseVersionGeneratorSchema extends NxReleaseVersionGeneratorSchema {}
+export interface ReleaseVersionGeneratorSchema
+  extends NxReleaseVersionGeneratorSchema {}

package/src/generators/release-version/schema.json

@@ -29,10 +29,7 @@
       "type": "string",
       "default": "conventional-commits",
       "description": "Which approach to use to determine the semver specifier used to bump the version of the project.",
-      "enum": [
-        "prompt",
-        "conventional-commits"
-      ]
+      "enum": ["prompt", "conventional-commits"]
     },
     "preid": {
       "type": "string",
@@ -46,11 +43,7 @@
       "type": "string",
       "default": "disk",
       "description": "Which approach to use to determine the current version of the project.",
-      "enum": [
-        "registry",
-        "disk",
-        "git-tag"
-      ]
+      "enum": ["registry", "disk", "git-tag"]
     },
     "currentVersionResolverMetadata": {
       "type": "object",
@@ -58,9 +51,5 @@
       "default": {}
     }
   },
-  "required": [
-    "projects",
-    "projectGraph",
-    "releaseGroup"
-  ]
-}
+  "required": ["projects", "projectGraph", "releaseGroup"]
+}

package/{packages/workspace-tools/src → src}/plugins/rust/cargo-toml.d.ts

@@ -1,4 +1,8 @@
 import { type CreateDependencies, type CreateNodes } from "@nx/devkit";
 export declare const name = "storm-software/rust/cargo-toml";
-export declare const createNodes: CreateNodes;
+export interface CargoPluginOptions {
+    includeApps?: boolean;
+    skipDocs?: boolean;
+}
+export declare const createNodes: CreateNodes<CargoPluginOptions>;
 export declare const createDependencies: CreateDependencies;

package/src/plugins/rust/index.js

@@ -32,9 +32,9 @@ var import_node_path2 = require("node:path");
 var import_project_graph = require("nx/src/config/project-graph");
 
 // packages/workspace-tools/src/utils/cargo.ts
-var import_node_path = require("node:path");
-var import_node_child_process = require("node:child_process");
 var import_devkit = require("@nx/devkit");
+var import_node_child_process = require("node:child_process");
+var import_node_path = require("node:path");
 function cargoCommandSync(args = "", options) {
   const normalizedOptions = {
     stdio: options?.stdio ?? "inherit",
@@ -139,7 +139,7 @@ var setDefaultProjectTags = (project) => {
 var name = "storm-software/rust/cargo-toml";
 var createNodes = [
   "*/**/Cargo.toml",
-  (cargoFile, _opts, ctx) => {
+  (cargoFile, opts = { includeApps: true, skipDocs: false }, ctx) => {
     const metadata = cargoMetadata();
     if (!metadata) {
       return {};
@@ -172,6 +172,9 @@ var createNodes = [
             });
           }
         }
+        if (opts.includeApps === false && project.projectType === "application") {
+          continue;
+        }
         project.targets = {
           "lint-ls": {
             cache: true,
@@ -203,7 +206,7 @@ var createNodes = [
             dependsOn: ["format-readme", "format-toml", "^format"],
             executor: "nx:run-commands",
             options: {
-              command: `echo 'Formatting the project files in "{projectRoot}"' `,
+              command: `cargo fmt -p ${project.name}`,
               color: true
             }
           },
@@ -221,7 +224,7 @@ var createNodes = [
           build: {
             cache: true,
             inputs: ["rust", "^production"],
-            dependsOn: ["format", "^build"],
+            dependsOn: ["build-base", "^build"],
             executor: "@monodon/rust:check",
             outputs: ["{options.target-dir}"],
             options: {
@@ -254,6 +257,19 @@ var createNodes = [
             }
           }
         };
+        if (opts.skipDocs != true) {
+          project.targets.docs = {
+            cache: true,
+            inputs: ["linting", "documentation", "default", "^production"],
+            dependsOn: ["build", "lint-docs", "^docs"],
+            outputs: [`{workspaceRoot}/dist/docs/${cargoPackage.name}`],
+            executor: "nx:run-commands",
+            options: {
+              command: `cargo doc -p ${project.name} --target-dir dist/docs/${cargoPackage.name}`,
+              color: true
+            }
+          };
+        }
         const isPrivate = cargoPackage.publish?.length === 0;
         if (!isPrivate) {
           project.targets["nx-release-publish"] = {

package/src/plugins/typescript/index.js

@@ -105,7 +105,7 @@ var setDefaultProjectTags = (project) => {
 var name = "storm-software/typescript/project-config";
 var createNodes = [
   "{project.json,**/project.json}",
-  (file, _, ctx) => {
+  (file, opts = { includeApps: true }, ctx) => {
     const packageJson = createPackageJson(file, ctx.workspaceRoot);
     if (!packageJson) {
       return {};
@@ -114,6 +114,9 @@ var createNodes = [
       file,
       packageJson
     );
+    if (opts?.includeApps === false && project.projectType === "application") {
+      return {};
+    }
     const targets = (0, import_package_json.readTargetsFromPackageJson)(packageJson);
     if (!targets["lint-ls"]) {
       targets["lint-ls"] = {
@@ -131,7 +134,13 @@ var createNodes = [
       targets.lint = {
         cache: true,
         inputs: ["linting", "typescript", "^production"],
-        dependsOn: ["lint-ls", "^lint"],
+        dependsOn: [
+          "lint-ls",
+          "lint-sherif",
+          "lint-knip",
+          "lint-docs",
+          "^lint"
+        ],
         executor: "@nx/eslint:lint",
         options: {
           format: "stylish",
@@ -277,8 +286,8 @@ var createNodes = [
             cleanComments: true
           }
         };
-        targets["nx-release-publish"].dependsOn.push("clean-package");
-        targets["size-limit"].dependsOn.push("clean-package");
+        targets["nx-release-publish"].dependsOn?.push("clean-package");
+        targets["size-limit"].dependsOn?.push("clean-package");
       }
     }
     addProjectTag(

package/src/plugins/typescript/project-config.d.ts

@@ -0,0 +1,6 @@
+import { CreateNodes } from "@nx/devkit";
+export declare const name = "storm-software/typescript/project-config";
+export interface TypeScriptPluginOptions {
+    includeApps?: boolean;
+}
+export declare const createNodes: CreateNodes<TypeScriptPluginOptions>;