@storm-software/workspace-tools 1.155.0 → 1.156.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.155.0",
+  "version": "1.156.0",
   "type": "commonjs",
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "repository": {

package/packages/workspace-tools/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/packages/workspace-tools/src/plugins/typescript/project-config.d.ts

@@ -1,33 +1,6 @@
+import { CreateNodes } from "@nx/devkit";
 export declare const name = "storm-software/typescript/project-config";
-export declare const createNodes: (string | ((file: any, _: any, ctx: any) => {
-    projects?: undefined;
-} | {
-    projects: {
-        [x: string]: {
-            targets: {
-                [targetName: string]: import("nx/src/config/workspace-json-project-json").TargetConfiguration<any>;
-            };
-            release: {
-                version: {
-                    generator: string;
-                    generatorOptions?: Record<string, unknown>;
-                };
-            };
-            name?: string;
-            root: string;
-            sourceRoot?: string;
-            projectType?: import("nx/src/config/workspace-json-project-json").ProjectType;
-            generators?: {
-                [collectionName: string]: {
-                    [generatorName: string]: any;
-                };
-            };
-            implicitDependencies?: string[];
-            namedInputs?: {
-                [inputName: string]: (string | import("nx/src/config/workspace-json-project-json").InputDefinition)[];
-            };
-            tags?: string[];
-            metadata?: import("nx/src/config/workspace-json-project-json").ProjectMetadata;
-        };
-    };
-}))[];
+export interface TypeScriptPluginOptions {
+    includeApps?: boolean;
+}
+export declare const createNodes: CreateNodes<TypeScriptPluginOptions>;

package/src/executors/cargo-publish/executor.js

@@ -36,6 +36,7 @@ module.exports = __toCommonJS(executor_exports);
 var import_devkit2 = require("@nx/devkit");
 var import_node_child_process = require("node:child_process");
 var import_node_fs = require("node:fs");
+var import_node_https = __toESM(require("node:https"));
 
 // node_modules/.pnpm/@ltd+j-toml@1.38.0/node_modules/@ltd/j-toml/index.mjs
 var version = "1.38.0";
@@ -2922,7 +2923,6 @@ function parseCargoToml(cargoString) {
 }
 
 // packages/workspace-tools/src/executors/cargo-publish/executor.ts
-var import_node_https = __toESM(require("node:https"));
 var LARGE_BUFFER = 1024 * 1e6;
 async function runExecutor(options, context) {
   const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;

package/src/plugins/rust/index.js

@@ -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
             }
           },
@@ -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"] = {
@@ -277,8 +280,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(