chore: update-tools

made a package within tools and refactored cli

Author: ryanbas21

.changeset/config.json

@@ -17,6 +17,7 @@
     "@forgerock/device-client",
     "@forgerock/davinci-app",
     "@forgerock/davinci-suites",
-    "@forgerock/mock-api-v2"
+    "@forgerock/mock-api-v2",
+    "@forgerock/local-release-tool"
   ]
 }

package.json

@@ -18,6 +18,7 @@
     "docs": "nx affected --target=typedoc",
     "format": "pnpm nx format:write",
     "lint": "nx affected --target=lint",
+    "local-release": "pnpm ts-node tools/release/release.ts",
     "nx": "nx",
     "preinstall": "npx only-allow pnpm",
     "prepare": "node .husky/install.mjs",
@@ -52,6 +53,7 @@
     "@commitlint/cli": "^19.1.0",
     "@commitlint/config-conventional": "^19.1.0",
     "@commitlint/prompt": "^19.1.0",
+    "@effect/cli": "0.59.9",
     "@effect/language-service": "^0.2.0",
     "@effect/platform": "^0.58.27",
     "@effect/platform-node": "^0.53.26",
@@ -127,8 +129,5 @@
   },
   "nx": {
     "includedScripts": []
-  },
-  "dependencies": {
-    "@effect/cli": "0.59.9"
   }
 }

pnpm-lock.yaml

@@ -0,0 +1,68 @@
+import { Effect, Stream, Console } from 'effect';
+import { Command } from '@effect/platform';
+// Effect to check git status for staged files
+export const checkGitStatus = Command.make('git', 'status', '--porcelain').pipe(
+  Command.string,
+  Effect.flatMap((output) => {
+    // Check if the output contains lines indicating staged changes (e.g., starting with M, A, D, R, C, U followed by a space)
+    const stagedChanges = output.split('\n').some((line) => /^[MADRCU] /.test(line.trim()));
+    if (stagedChanges) {
+      return Effect.fail(
+        'Git repository has staged changes. Please commit or stash them before releasing.',
+      );
+    }
+    return Effect.void; // No staged changes
+  }),
+  // If the command fails (e.g., not a git repo), treat it as an error too.
+  Effect.catchAll((error) => Effect.fail(`Git status check command failed: ${error}`)),
+  Effect.tapError((error) => Console.error(error)), // Log the specific error message
+  Effect.asVoid, // Don't need the output on success
+);
+
+// Effect to run changesets snapshot
+export const runChangesetsSnapshot = Command.make(
+  'pnpm',
+  'changesets',
+  'version',
+  '--snapshot',
+  'beta',
+).pipe(
+  Command.lines, // Get output line by line
+  Effect.tap((line) => Console.log(`Changesets: ${line}`)), // Log output
+  Stream.runDrain, // Consume the stream and wait for completion
+  Effect.tapBoth({
+    onFailure: (error) => Console.error(`Changesets snapshot command failed: ${error}`),
+    onSuccess: () => Console.log('Changesets snapshot completed successfully.'),
+  }),
+  Effect.asVoid, // Don't need the final result
+);
+
+// Effect to start local registry (run in background)
+export const startLocalRegistry = Command.make('pnpm', 'nx', 'local-registry').pipe(
+  Command.start, // Starts the process and returns immediately
+  Effect.tap(() =>
+    Console.log('Attempting to start local registry (Verdaccio) in the background...'),
+  ),
+  Effect.tapError((error) => Console.error(`Failed to start local registry: ${error}`)),
+  Effect.asVoid, // We don't need the Process handle for this script's logic
+);
+
+export const restoreGitFiles = Command.make('git', 'restore', '.').pipe(Command.start);
+
+export const publishPackages = Command.make(
+  'pnpm',
+  'publish',
+  '-r',
+  '--tag',
+  'beta',
+  '--registry=http://localhost:4873',
+).pipe(
+  Command.lines, // Stream output line by line
+  Effect.tap((line) => Console.log(`Publish: ${line}`)),
+  Stream.runDrain,
+  Effect.tapBoth({
+    onFailure: (error) => Effect.fail(() => Console.error(`Publishing failed: ${error}`)),
+    onSuccess: () => Console.log('Packages were published successfully to the local registry.'),
+  }),
+  Effect.asVoid,
+);

tools/release/commands/commands.ts

@@ -0,0 +1,13 @@
+{
+  "name": "@forgerock/local-release-tool",
+  "version": "0.0.0",
+  "private": true,
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

tools/release/package.json

@@ -1,73 +1,13 @@
-import { Effect, Console, Stream } from 'effect';
-import { Command } from '@effect/platform';
+import { Effect, Console } from 'effect';
 import { NodeContext, NodeRuntime } from '@effect/platform-node';
 import { FileSystem, Path } from '@effect/platform';
-
-// Effect to check git status for staged files
-const checkGitStatus = Command.make('git', 'status', '--porcelain').pipe(
-  Command.string,
-  Effect.flatMap((output) => {
-    // Check if the output contains lines indicating staged changes (e.g., starting with M, A, D, R, C, U followed by a space)
-    const stagedChanges = output.split('\n').some((line) => /^[MADRCU] /.test(line.trim()));
-    if (stagedChanges) {
-      return Effect.fail(
-        'Git repository has staged changes. Please commit or stash them before releasing.',
-      );
-    }
-    return Effect.void; // No staged changes
-  }),
-  // If the command fails (e.g., not a git repo), treat it as an error too.
-  Effect.catchAll((error) => Effect.fail(`Git status check command failed: ${error}`)),
-  Effect.tapError((error) => Console.error(error)), // Log the specific error message
-  Effect.asVoid, // Don't need the output on success
-);
-
-// Effect to run changesets snapshot
-const runChangesetsSnapshot = Command.make(
-  'pnpm',
-  'changesets',
-  'version',
-  '--snapshot',
-  'beta',
-).pipe(
-  Command.lines, // Get output line by line
-  Effect.tap((line) => Console.log(`Changesets: ${line}`)), // Log output
-  Stream.runDrain, // Consume the stream and wait for completion
-  Effect.tapBoth({
-    onFailure: (error) => Console.error(`Changesets snapshot command failed: ${error}`),
-    onSuccess: () => Console.log('Changesets snapshot completed successfully.'),
-  }),
-  Effect.asVoid, // Don't need the final result
-);
-
-// Effect to start local registry (run in background)
-const startLocalRegistry = Command.make('pnpm', 'nx', 'local-registry').pipe(
-  Command.start, // Starts the process and returns immediately
-  Effect.tap(() =>
-    Console.log('Attempting to start local registry (Verdaccio) in the background...'),
-  ),
-  Effect.tapError((error) => Console.error(`Failed to start local registry: ${error}`)),
-  Effect.asVoid, // We don't need the Process handle for this script's logic
-);
-
-const restoreGitFiles = Command.make('git', 'restore', '.').pipe(Command.start);
-const publishPackages = Command.make(
-  'pnpm',
-  'publish',
-  '-r',
-  '--tag',
-  'beta',
-  '--registry=http://localhost:4873',
-).pipe(
-  Command.lines, // Stream output line by line
-  Effect.tap((line) => Console.log(`Publish: ${line}`)),
-  Stream.runDrain,
-  Effect.tapBoth({
-    onFailure: (error) => Effect.fail(() => Console.error(`Publishing failed: ${error}`)),
-    onSuccess: () => Console.log('Packages were published successfully to the local registry.'),
-  }),
-  Effect.asVoid,
-);
+import {
+  checkGitStatus,
+  startLocalRegistry,
+  runChangesetsSnapshot,
+  restoreGitFiles,
+  publishPackages,
+} from './commands/commands.js';
 
 // Effect to check for the presence of changeset files
 const checkForChangesets = Effect.gen(function* () {

tools/release/release.ts

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "files": [],
-  "include": ["./release.ts"],
+  "include": ["**/*.ts"],
   "compilerOptions": {
     "moduleResolution": "NodeNext",
     "module": "NodeNext",

tools/release/tsconfig.json

@@ -18,6 +18,9 @@
     },
     {
       "path": "./packages/davinci-client"
+    },
+    {
+      "path": "./tools/release"
     }
   ]
 }