@storm-software/workspace-tools 1.245.1 → 1.245.3

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.245.3 (2025-01-28)
+
+### Bug Fixes
+
+- **workspace-tools:** Resolved issue with `untyped` plugin name ([5f3706bc](https://github.com/storm-software/storm-ops/commit/5f3706bc))
+
+### Miscellaneous
+
+- **monorepo:** Regenerate README markdown files ([d5aac4fd](https://github.com/storm-software/storm-ops/commit/d5aac4fd))
+
+## 1.245.2 (2025-01-28)
+
+### Miscellaneous
+
+- **monorepo:** Regenerate README markdown files ([144ad8bf](https://github.com/storm-software/storm-ops/commit/144ad8bf))
+
 ## 1.245.1 (2025-01-28)
 
 ### Miscellaneous

package/README.md

@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-1.245.0-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
+[![Version](https://img.shields.io/badge/version-1.245.2-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

package/dist/src/plugins/typescript/tsdown.js

@@ -58,6 +58,7 @@ Please add it to your dependencies by running "pnpm add tsdown -D --filter="${pa
           ],
           executor: "nx:run-commands",
           dependsOn: [
+            "build-untyped",
             "^build"
           ],
           options: {
@@ -78,7 +79,9 @@ Please add it to your dependencies by running "pnpm add tsdown -D --filter="${pa
           ],
           executor: "nx:run-commands",
           dependsOn: [
-            "build-base"
+            "build-base",
+            "build-untyped",
+            "^build"
           ],
           options: {
             commands: [

package/dist/src/plugins/typescript/tsdown.mjs

@@ -58,6 +58,7 @@ Please add it to your dependencies by running "pnpm add tsdown -D --filter="${pa
           ],
           executor: "nx:run-commands",
           dependsOn: [
+            "build-untyped",
             "^build"
           ],
           options: {
@@ -78,7 +79,9 @@ Please add it to your dependencies by running "pnpm add tsdown -D --filter="${pa
           ],
           executor: "nx:run-commands",
           dependsOn: [
-            "build-base"
+            "build-base",
+            "build-untyped",
+            "^build"
           ],
           options: {
             commands: [

package/dist/src/plugins/typescript/tsup.js

@@ -58,7 +58,7 @@ Please add it to your dependencies by running "pnpm add tsup -D --filter="${pack
           ],
           executor: "nx:run-commands",
           dependsOn: [
-            "clean",
+            "build-untyped",
             "^build"
           ],
           options: {
@@ -79,7 +79,9 @@ Please add it to your dependencies by running "pnpm add tsup -D --filter="${pack
           ],
           executor: "nx:run-commands",
           dependsOn: [
-            "build-base"
+            "build-base",
+            "build-untyped",
+            "^build"
           ],
           options: {
             commands: [

package/dist/src/plugins/typescript/tsup.mjs

@@ -58,7 +58,7 @@ Please add it to your dependencies by running "pnpm add tsup -D --filter="${pack
           ],
           executor: "nx:run-commands",
           dependsOn: [
-            "clean",
+            "build-untyped",
             "^build"
           ],
           options: {
@@ -79,7 +79,9 @@ Please add it to your dependencies by running "pnpm add tsup -D --filter="${pack
           ],
           executor: "nx:run-commands",
           dependsOn: [
-            "build-base"
+            "build-base",
+            "build-untyped",
+            "^build"
           ],
           options: {
             commands: [

package/dist/src/plugins/typescript/untyped-schema.d.mts

@@ -0,0 +1,8 @@
+import { CreateNodesV2 } from '@nx/devkit';
+
+declare const name = "storm-software/typescript/untyped";
+interface UntypedPluginOptions {
+}
+declare const createNodesV2: CreateNodesV2<UntypedPluginOptions>;
+
+export { type UntypedPluginOptions, createNodesV2, name };

package/dist/src/plugins/typescript/untyped-schema.d.ts

@@ -0,0 +1,8 @@
+import { CreateNodesV2 } from '@nx/devkit';
+
+declare const name = "storm-software/typescript/untyped";
+interface UntypedPluginOptions {
+}
+declare const createNodesV2: CreateNodesV2<UntypedPluginOptions>;
+
+export { type UntypedPluginOptions, createNodesV2, name };

package/dist/src/plugins/typescript/{untyped.js → untyped-schema.js}

@@ -6,13 +6,13 @@ var _chunk7YRW5HNXjs = require('../../../chunk-7YRW5HNX.js');
 
 var _chunk3GQAWCBQjs = require('../../../chunk-3GQAWCBQ.js');
 
-// src/plugins/typescript/untyped.ts
+// src/plugins/typescript/untyped-schema.ts
 var _devkit = require('@nx/devkit');
 var _fs = require('fs');
 var _path = require('path');
 var _nxjsonjs = require('nx/src/config/nx-json.js');
 var _packagejson = require('nx/src/utils/package-json');
-var name = "storm-software/typescript/tsup";
+var name = "storm-software/typescript/untyped";
 var createNodesV2 = [
   "**/*untyped.ts",
   async (configFiles, options, context) => {

package/dist/src/plugins/typescript/{untyped.mjs → untyped-schema.mjs}

@@ -6,13 +6,13 @@ import {
   __name
 } from "../../../chunk-XUV4U54K.mjs";
 
-// src/plugins/typescript/untyped.ts
+// src/plugins/typescript/untyped-schema.ts
 import { createNodesFromFiles, readJsonFile } from "@nx/devkit";
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { readNxJson } from "nx/src/config/nx-json.js";
 import { readTargetsFromPackageJson } from "nx/src/utils/package-json";
-var name = "storm-software/typescript/tsup";
+var name = "storm-software/typescript/untyped";
 var createNodesV2 = [
   "**/*untyped.ts",
   async (configFiles, options, context) => {

package/dist/src/plugins/typescript/untyped-schema.ts

@@ -0,0 +1,186 @@
+import {
+  createNodesFromFiles,
+  CreateNodesResultV2,
+  CreateNodesV2,
+  readJsonFile
+} from "@nx/devkit";
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { readNxJson } from "nx/src/config/nx-json.js";
+import type { ProjectConfiguration } from "nx/src/config/workspace-json-project-json";
+import {
+  readTargetsFromPackageJson,
+  type PackageJson
+} from "nx/src/utils/package-json";
+import { addProjectTag, ProjectTagConstants } from "../../utils/project-tags";
+
+export const name = "storm-software/typescript/untyped";
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface UntypedPluginOptions {}
+
+export const createNodesV2: CreateNodesV2<UntypedPluginOptions> = [
+  "**/*untyped.ts",
+  async (configFiles, options, context): Promise<CreateNodesResultV2> => {
+    return await createNodesFromFiles(
+      (configFile, options, context) => {
+        try {
+          console.log(`Processing untyped schema file: ${configFile}`);
+
+          const projectRoot = createProjectRoot(
+            configFile,
+            context.workspaceRoot
+          );
+          if (!projectRoot) {
+            console.error(
+              "No project.json found in parent directories of Untyped schema file: ",
+              configFile
+            );
+
+            return {};
+          }
+
+          const packageJson = readJsonFile(join(projectRoot, "package.json"));
+          if (!packageJson) {
+            console.error(
+              `No package.json found in project root: ${projectRoot}`
+            );
+            return {};
+          }
+
+          if (
+            !packageJson.devDependencies?.untyped &&
+            !packageJson.dependencies?.untyped
+          ) {
+            console.warn(
+              `No "untyped" dependency or devDependency found in package.json: ${configFile}
+Please add it to your dependencies by running "pnpm add untyped -D --filter="${packageJson.name}"`
+            );
+          }
+
+          const project = createProjectFromPackageJsonNextToProjectJson(
+            join(projectRoot, "project.json"),
+            packageJson
+          );
+
+          const nxJson = readNxJson(context.workspaceRoot);
+          const targets: ProjectConfiguration["targets"] =
+            readTargetsFromPackageJson(packageJson, nxJson);
+
+          let relativeRoot = projectRoot
+            .replaceAll("\\", "/")
+            .replace(context.workspaceRoot.replaceAll("\\", "/"), "");
+          if (relativeRoot.startsWith("/")) {
+            relativeRoot = relativeRoot.slice(1);
+          }
+
+          let relativeConfig = configFile.replaceAll(relativeRoot, "");
+          while (relativeConfig.startsWith(".")) {
+            relativeConfig = relativeConfig.slice(1);
+          }
+          while (relativeConfig.startsWith("/")) {
+            relativeConfig = relativeConfig.slice(1);
+          }
+
+          targets["build-untyped"] ??= {
+            cache: true,
+            executor: "nx:run-commands",
+            dependsOn: ["clean", "^build"],
+            inputs: [
+              "{projectRoot}/src/**/untyped.ts",
+              "{projectRoot}/src/**/*.untyped.ts"
+            ],
+            outputs: [
+              "{projectRoot}/src/**/schema.d.ts",
+              "{projectRoot}/src/**/*.schema.d.ts",
+              "{projectRoot}/src/**/schema.md",
+              "{projectRoot}/src/**/*.schema.md",
+              "{projectRoot}/src/**/schema.json",
+              "{projectRoot}/src/**/*.schema.json"
+            ],
+            options: {
+              commands: [
+                `storm-untyped generate --entry=\"${projectRoot}/**/{untyped.ts,*.untyped.ts}\" `
+              ]
+            }
+          };
+
+          addProjectTag(project, ProjectTagConstants.Plugin.TAG_ID, name);
+
+          const result = project?.name
+            ? {
+                projects: {
+                  [project.name]: {
+                    ...project,
+                    root: relativeRoot,
+                    targets
+                  }
+                }
+              }
+            : {};
+          console.log(`Writing Results for ${project?.name ?? "missing name"}`);
+          console.log(result);
+
+          return result;
+        } catch (e) {
+          console.error(e);
+          return {};
+        }
+      },
+      configFiles,
+      options,
+      context
+    );
+  }
+];
+
+function createProjectFromPackageJsonNextToProjectJson(
+  projectJsonPath: string,
+  packageJson: PackageJson
+): ProjectConfiguration {
+  const { nx, name } = packageJson;
+  const root = dirname(projectJsonPath);
+  const projectJson = readJsonFile(projectJsonPath);
+
+  return {
+    targets: {},
+    tags: [],
+    name,
+    ...nx,
+    ...projectJson,
+    root
+  } as ProjectConfiguration;
+}
+
+function createProjectRoot(
+  configPath: string,
+  workspaceRoot: string
+): string | null {
+  try {
+    let root = dirname(configPath);
+    while (
+      root &&
+      root !== "/" &&
+      root !== workspaceRoot &&
+      !existsSync(join(root, "project.json"))
+    ) {
+      root = join(root, "..");
+    }
+    if (!existsSync(join(root, "project.json"))) {
+      return null;
+    }
+
+    const projectRoot = join(workspaceRoot, root);
+    if (
+      !existsSync(join(projectRoot, "package.json")) &&
+      !existsSync(join(projectRoot, "project.json"))
+    ) {
+      return null;
+    }
+
+    return projectRoot;
+  } catch (e) {
+    console.error(e);
+    return null;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.245.1",
+  "version": "1.245.3",
   "description": "Tools for managing a Storm workspace, including various Nx generators and executors for common development tasks.",
   "repository": {
     "type": "github",
@@ -152,7 +152,8 @@
     "./plugins/typescript": "./dist/src/plugins/typescript/index.js",
     "./plugins/typescript/tsup": "./dist/src/plugins/typescript/tsup.js",
     "./plugins/typescript/tsdown": "./dist/src/plugins/typescript/tsdown.js",
-    "./plugins/typescript/untyped": "./dist/src/plugins/typescript/untyped.js"
+    "./plugins/typescript/untyped": "./dist/src/plugins/typescript/untyped-schema.js",
+    "./plugins/typescript/untyped-schema": "./dist/src/plugins/typescript/untyped-schema.js"
   },
   "typings": "dist/index.d.ts",
   "keywords": [

package/dist/src/plugins/typescript/schema.d.d.mts

@@ -1,12 +0,0 @@
-// Generated by @storm-software/untyped
-// Do not edit this file directly
-
-interface TypeSchema {
- /** @default ["**\/*untyped.ts",null] */
- createNodesV2?: Array<string|Function>,
-
- /** @default "storm-software/typescript/tsup" */
- name?: string,
-}
-
-export type { TypeSchema };

package/dist/src/plugins/typescript/schema.d.d.ts

@@ -1,12 +0,0 @@
-// Generated by @storm-software/untyped
-// Do not edit this file directly
-
-interface TypeSchema {
- /** @default ["**\/*untyped.ts",null] */
- createNodesV2?: Array<string|Function>,
-
- /** @default "storm-software/typescript/tsup" */
- name?: string,
-}
-
-export type { TypeSchema };

package/dist/src/plugins/typescript/schema.d.js

@@ -1 +0,0 @@
-"use strict";

package/dist/src/plugins/typescript/schema.d.mjs

@@ -1 +0,0 @@
-import "../../../chunk-XUV4U54K.mjs";

package/dist/src/plugins/typescript/schema.d.ts

@@ -1,12 +0,0 @@
-
-// Generated by @storm-software/untyped
-// Do not edit this file directly
-
-export interface TypeSchema {
- /** @default ["**\/*untyped.ts",null] */
- createNodesV2?: Array<string|Function>,
-
- /** @default "storm-software/typescript/tsup" */
- name?: string,
-}
-

package/dist/src/plugins/typescript/schema.json

@@ -1,32 +0,0 @@
-{
-  "id": "#",
-  "properties": {
-    "createNodesV2": {
-      "type": "array",
-      "id": "#createNodesV2",
-      "default": [
-        "**/*untyped.ts",
-        null
-      ],
-      "items": {
-        "type": [
-          "string",
-          "function"
-        ]
-      }
-    },
-    "name": {
-      "type": "string",
-      "id": "#name",
-      "default": "storm-software/typescript/tsup"
-    }
-  },
-  "type": "object",
-  "default": {
-    "createNodesV2": [
-      "**/*untyped.ts",
-      null
-    ],
-    "name": "storm-software/typescript/tsup"
-  }
-}

package/dist/src/plugins/typescript/schema.md

@@ -1,16 +0,0 @@
-
-<!-- Generated by @storm-software/untyped -->
-<!-- Do not edit this file directly -->
-
-# 
-
-## `createNodesV2`
-- **Type**: `array`
-- **Default**: `["**/*untyped.ts",null]`
-
-
-## `name`
-- **Type**: `string`
-- **Default**: `"storm-software/typescript/tsup"`
-
-

package/dist/src/plugins/typescript/untyped.d.mts

@@ -1,8 +0,0 @@
-import { CreateNodesV2 } from '@nx/devkit';
-
-declare const name = "storm-software/typescript/tsup";
-interface TsupPluginOptions {
-}
-declare const createNodesV2: CreateNodesV2<TsupPluginOptions>;
-
-export { type TsupPluginOptions, createNodesV2, name };

package/dist/src/plugins/typescript/untyped.d.ts

@@ -1,8 +0,0 @@
-import { CreateNodesV2 } from '@nx/devkit';
-
-declare const name = "storm-software/typescript/tsup";
-interface TsupPluginOptions {
-}
-declare const createNodesV2: CreateNodesV2<TsupPluginOptions>;
-
-export { type TsupPluginOptions, createNodesV2, name };

package/docs/api/plugins/typescript/schema.md

@@ -1,16 +0,0 @@
-
-<!-- Generated by @storm-software/untyped -->
-<!-- Do not edit this file directly -->
-
-# 
-
-## `createNodesV2`
-- **Type**: `array`
-- **Default**: `["**/*untyped.ts",null]`
-
-
-## `name`
-- **Type**: `string`
-- **Default**: `"storm-software/typescript/tsup"`
-
-