@reventlessdev/reventless-aws 3.0.0-alpha.355 → 3.0.0-alpha.356

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 3.0.0-alpha.356 (2026-09-23)
+
+* feat(node)!: every command-line tool reads its arguments through parseArgs ([2e41979](https://github.com/ReventlessDev/reventless-core/commit/2e41979b73646c46356e197e17eb4a3da0154c73))
+
+### BREAKING CHANGES
+
+* NodeProcess.onSignal takes the new NodeProcess.signal
+variant (SIGINT | SIGTERM | SIGHUP) instead of a polymorphic variant:
+write onSignal(SIGINT, …) for onSignal(#SIGINT, …). Node receives the
+same string.
+
+
+
 # 3.0.0-alpha.355 (2026-09-23)
 
 **Note:** Version bump only for package @reventlessdev/reventless-aws

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-aws",
-  "version": "3.0.0-alpha.355",
+  "version": "3.0.0-alpha.356",
   "description": "AWS adapters for Reventless",
   "license": "Apache-2.0",
   "bin": {
@@ -20,19 +20,19 @@
     "sury": "11.0.0",
     "uuid": "^13.0.0",
     "yaml": "^2.8.3",
-    "@reventlessdev/rescript-aws-sdk": "3.0.0-alpha.21",
+    "@reventlessdev/rescript-aws-sdk": "3.0.0-alpha.22",
     "@reventlessdev/rescript-jest": "1.0.0-alpha.11",
-    "@reventlessdev/rescript-node": "2.0.0-alpha.14",
+    "@reventlessdev/rescript-node": "2.0.0-alpha.15",
+    "@reventlessdev/rescript-pulumi-aws": "3.0.0-alpha.17",
     "@reventlessdev/rescript-effect": "0.1.0-alpha.34",
-    "@reventlessdev/rescript-pulumi-aws": "3.0.0-alpha.16",
     "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.22",
-    "@reventlessdev/rescript-uuid": "2.0.0-alpha.1",
     "@reventlessdev/rescript-web": "1.0.0-alpha.5",
-    "@reventlessdev/reventless-interop": "3.0.0-alpha.38",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.171",
-    "@reventlessdev/reventless-core": "3.0.0-alpha.271",
-    "@reventlessdev/reventless-postgres": "3.0.0-alpha.135",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.143"
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.172",
+    "@reventlessdev/reventless-postgres": "3.0.0-alpha.136",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.144",
+    "@reventlessdev/reventless-core": "3.0.0-alpha.272",
+    "@reventlessdev/rescript-uuid": "2.0.0-alpha.1",
+    "@reventlessdev/reventless-interop": "3.0.0-alpha.38"
   },
   "devDependencies": {
     "rescript": "12.3.1",

package/scripts/BakeManifest.res

@@ -30,36 +30,19 @@ type args = {
   help: bool,
 }
 
-let parseArgs = (argv: array<string>): result<args, string> => {
-  let acc = ref(Ok({manifest: None, stack: None, since: None, help: false}))
-  let i = ref(0)
-  let count = argv->Array.length
-  while i.contents < count {
-    let flag = argv->Array.getUnsafe(i.contents)
-    let value = argv->Array.get(i.contents + 1)
-    switch (acc.contents, flag, value) {
-    | (Error(_), _, _) => i := count
-    | (Ok(a), "--manifest", Some(v)) =>
-      acc := Ok({...a, manifest: Some(v)})
-      i := i.contents + 2
-    | (Ok(a), "--stack", Some(v)) =>
-      acc := Ok({...a, stack: Some(v)})
-      i := i.contents + 2
-    | (Ok(a), "--since", Some(v)) =>
-      acc := Ok({...a, since: v == "" ? None : Some(v)})
-      i := i.contents + 2
-    | (Ok(a), "--help", _) | (Ok(a), "-h", _) =>
-      acc := Ok({...a, help: true})
-      i := i.contents + 1
-    | (Ok(_), "--manifest", None) | (Ok(_), "--stack", None) | (Ok(_), "--since", None) =>
-      acc := Error(`${flag} needs a value`)
-    | (Ok(_), unknown, _) => acc := Error(`unknown argument "${unknown}"`)
-    }
-  }
-  acc.contents
-}
+let parseArgs = (argv: array<string>): result<args, string> =>
+  Reventless.CliArgs.parse(~strings=["manifest", "stack", "since"], argv)
+  ->Result.flatMap(Reventless.CliArgs.noPositionals)
+  ->Result.map(a => {
+    manifest: a->Reventless.CliArgs.string("manifest"),
+    stack: a->Reventless.CliArgs.string("stack"),
+    since: a->Reventless.CliArgs.string("since")->Option.flatMap(v => v == "" ? None : Some(v)),
+    help: a->Reventless.CliArgs.help,
+  })
 
 let usage = `
+Usage: bake-manifest [--manifest <path>] [--stack <name>] [--since <instant>]
+
 Bake the component manifest of a deployed platform.
 
   --manifest <path>   The deploy manifest. Defaults to ${DeployManifest.defaultFile}
@@ -363,33 +346,30 @@ let bake = async (~manifest: DeployManifest.resolved, ~stack: string, ~since: op
     }
   }
 
-let run = async (): result<unit, string> =>
-  switch parseArgs(NodeProcess.argv->Array.slice(~start=2, ~end=NodeProcess.argv->Array.length)) {
+let run = async (args: args): result<unit, string> =>
+  switch DeployManifest.load(args.manifest->Option.getOr(DeployManifest.defaultFile)) {
   | Error(_) as e => e
-  | Ok(args) if args.help =>
-    Console.log(usage)
-    Ok()
-  | Ok(args) =>
-    switch DeployManifest.load(args.manifest->Option.getOr(DeployManifest.defaultFile)) {
-    | Error(_) as e => e
-    | Ok(manifest) =>
-      switch args.stack->Option.orElse(PulumiCli.selectedStack(~dir=manifest.platform.dir)) {
-      | None => Error(`no stack selected in ${manifest.platform.dir} — pass --stack`)
-      | Some(stack) => await bake(~manifest, ~stack, ~since=args.since)
-      }
+  | Ok(manifest) =>
+    switch args.stack->Option.orElse(PulumiCli.selectedStack(~dir=manifest.platform.dir)) {
+    | None => Error(`no stack selected in ${manifest.platform.dir} — pass --stack`)
+    | Some(stack) => await bake(~manifest, ~stack, ~since=args.since)
     }
   }
 
-let main = async () =>
-  switch await run() {
-  | Ok() => ()
-  | Error(message) =>
-    Console.error(inGitHubActions() ? `::error::${message}` : `bake-manifest: ${message}`)
-    NodeProcess.exit(1)
-  | exception exn =>
-    Console.error(`bake-manifest: ${Util_AwsError.describe(exn)}`)
-    NodeProcess.exit(1)
-  }
+let cli: Reventless.CliArgs.cli<args> = {bin: "bake-manifest", usage, parse: parseArgs}
+
+let main = () =>
+  Reventless.CliArgs.run(cli, async args =>
+    switch await run(args) {
+    | Ok() => ()
+    | Error(message) =>
+      Console.error(inGitHubActions() ? `::error::${message}` : `bake-manifest: ${message}`)
+      NodeProcess.exit(1)
+    | exception exn =>
+      Console.error(`bake-manifest: ${Util_AwsError.describe(exn)}`)
+      NodeProcess.exit(1)
+    }
+  )
 
 // No top-level call: `../run-bake-manifest.mjs` invokes [main], so a test can
 // import this module.

package/scripts/BakeManifest.res.mjs

@@ -5,7 +5,9 @@ import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Lambda$AwsSdk from "@reventlessdev/rescript-aws-sdk/src/Lambda.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Stdlib_Result from "@rescript/runtime/lib/es6/Stdlib_Result.js";
 import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
+import * as CliArgs$Reventless from "@reventlessdev/reventless-spec/src/CliArgs.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as ClientLambda from "@aws-sdk/client-lambda";
 import * as PulumiCli$ReventlessAws from "./PulumiCli.res.mjs";
@@ -13,110 +15,27 @@ import * as Util_AwsError$ReventlessAws from "../src/util/Util_AwsError.res.mjs"
 import * as DeployManifest$ReventlessAws from "./DeployManifest.res.mjs";
 
 function parseArgs(argv) {
-  let acc = {
-    TAG: "Ok",
-    _0: {
-      manifest: undefined,
-      stack: undefined,
-      since: undefined,
-      help: false
-    }
-  };
-  let i = 0;
-  let count = argv.length;
-  while (i < count) {
-    let flag = argv[i];
-    let value = argv[i + 1 | 0];
-    let match = acc;
-    let exit = 0;
-    if (match.TAG === "Ok") {
-      let a = match._0;
-      let exit$1 = 0;
-      switch (flag) {
-        case "--manifest" :
-          if (value !== undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                manifest: value,
-                stack: a.stack,
-                since: a.since,
-                help: a.help
-              }
-            };
-            i = i + 2 | 0;
-          } else {
-            exit = 1;
-          }
-          break;
-        case "--since" :
-          if (value !== undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                manifest: a.manifest,
-                stack: a.stack,
-                since: value === "" ? undefined : value,
-                help: a.help
-              }
-            };
-            i = i + 2 | 0;
-          } else {
-            exit = 1;
-          }
-          break;
-        case "--stack" :
-          if (value !== undefined) {
-            acc = {
-              TAG: "Ok",
-              _0: {
-                manifest: a.manifest,
-                stack: value,
-                since: a.since,
-                help: a.help
-              }
-            };
-            i = i + 2 | 0;
-          } else {
-            exit = 1;
-          }
-          break;
-        case "--help" :
-        case "-h" :
-          exit$1 = 2;
-          break;
-        default:
-          acc = {
-            TAG: "Error",
-            _0: `unknown argument "` + flag + `"`
-          };
-      }
-      if (exit$1 === 2) {
-        acc = {
-          TAG: "Ok",
-          _0: {
-            manifest: a.manifest,
-            stack: a.stack,
-            since: a.since,
-            help: true
-          }
-        };
-        i = i + 1 | 0;
+  return Stdlib_Result.map(Stdlib_Result.flatMap(CliArgs$Reventless.parse([
+    "manifest",
+    "stack",
+    "since"
+  ], undefined, undefined, undefined, argv), CliArgs$Reventless.noPositionals), a => ({
+    manifest: CliArgs$Reventless.string(a, "manifest"),
+    stack: CliArgs$Reventless.string(a, "stack"),
+    since: Stdlib_Option.flatMap(CliArgs$Reventless.string(a, "since"), v => {
+      if (v === "") {
+        return;
+      } else {
+        return v;
       }
-    } else {
-      i = count;
-    }
-    if (exit === 1) {
-      acc = {
-        TAG: "Error",
-        _0: flag + ` needs a value`
-      };
-    }
-  };
-  return acc;
+    }),
+    help: CliArgs$Reventless.help(a)
+  }));
 }
 
 let usage = `
+Usage: bake-manifest [--manifest <path>] [--stack <name>] [--since <instant>]
+
 Bake the component manifest of a deployed platform.
 
   --manifest <path>   The deploy manifest. Defaults to ` + DeployManifest$ReventlessAws.defaultFile + `
@@ -409,24 +328,12 @@ async function bake(manifest, stack, since) {
   };
 }
 
-async function run() {
-  let e = parseArgs(process.argv.slice(2, process.argv.length));
+async function run(args) {
+  let e = DeployManifest$ReventlessAws.load(Stdlib_Option.getOr(args.manifest, DeployManifest$ReventlessAws.defaultFile));
   if (e.TAG !== "Ok") {
     return e;
   }
-  let args = e._0;
-  if (args.help) {
-    console.log(usage);
-    return {
-      TAG: "Ok",
-      _0: undefined
-    };
-  }
-  let e$1 = DeployManifest$ReventlessAws.load(Stdlib_Option.getOr(args.manifest, DeployManifest$ReventlessAws.defaultFile));
-  if (e$1.TAG !== "Ok") {
-    return e$1;
-  }
-  let manifest = e$1._0;
+  let manifest = e._0;
   let stack = Stdlib_Option.orElse(args.stack, PulumiCli$ReventlessAws.selectedStack(manifest.platform.dir));
   if (stack !== undefined) {
     return await bake(manifest, stack, args.since);
@@ -438,22 +345,30 @@ async function run() {
   }
 }
 
-async function main() {
-  let message;
-  try {
-    message = await run();
-  } catch (raw_exn) {
-    let exn = Primitive_exceptions.internalToException(raw_exn);
-    console.error(`bake-manifest: ` + Util_AwsError$ReventlessAws.describe(exn));
+let cli = {
+  bin: "bake-manifest",
+  usage: usage,
+  parse: parseArgs
+};
+
+function main() {
+  return CliArgs$Reventless.run(cli, undefined, undefined, async args => {
+    let message;
+    try {
+      message = await run(args);
+    } catch (raw_exn) {
+      let exn = Primitive_exceptions.internalToException(raw_exn);
+      console.error(`bake-manifest: ` + Util_AwsError$ReventlessAws.describe(exn));
+      process.exit(1);
+      return;
+    }
+    if (message.TAG === "Ok") {
+      return;
+    }
+    let message$1 = message._0;
+    console.error(inGitHubActions() ? `::error::` + message$1 : `bake-manifest: ` + message$1);
     process.exit(1);
-    return;
-  }
-  if (message.TAG === "Ok") {
-    return;
-  }
-  let message$1 = message._0;
-  console.error(inGitHubActions() ? `::error::` + message$1 : `bake-manifest: ` + message$1);
-  process.exit(1);
+  });
 }
 
 let Lambda;
@@ -482,6 +397,7 @@ export {
   invokeWith,
   bake,
   run,
+  cli,
   main,
 }
 /* Lambda-AwsSdk Not a pure module */

package/scripts/DeployApp.res

@@ -37,39 +37,28 @@ type args = {
 
 let defaultStack = "dev"
 
-let parseArgs = (argv: array<string>): result<args, string> => {
-  let acc = ref(Ok({command: None, manifest: None, stack: defaultStack, help: false}))
-  let i = ref(0)
-  let count = argv->Array.length
-  while i.contents < count {
-    let flag = argv->Array.getUnsafe(i.contents)
-    let value = argv->Array.get(i.contents + 1)
-    switch (acc.contents, flag, value) {
-    | (Error(_), _, _) => i := count
-    | (Ok(a), "up", _) if a.command == None =>
-      acc := Ok({...a, command: Some(Up)})
-      i := i.contents + 1
-    | (Ok(a), "down", _) if a.command == None =>
-      acc := Ok({...a, command: Some(Down)})
-      i := i.contents + 1
-    | (Ok(a), "--manifest", Some(v)) =>
-      acc := Ok({...a, manifest: Some(v)})
-      i := i.contents + 2
-    | (Ok(a), "--stack", Some(v)) =>
-      acc := Ok({...a, stack: v})
-      i := i.contents + 2
-    | (Ok(a), "--help", _) | (Ok(a), "-h", _) =>
-      acc := Ok({...a, help: true})
-      i := i.contents + 1
-    | (Ok(_), "--manifest", None) | (Ok(_), "--stack", None) =>
-      acc := Error(`${flag} needs a value`)
-    | (Ok(_), unknown, _) => acc := Error(`unknown argument "${unknown}"`)
+let parseArgs = (argv: array<string>): result<args, string> =>
+  Reventless.CliArgs.parse(~strings=["manifest", "stack"], argv)->Result.flatMap(a => {
+    let help = a->Reventless.CliArgs.help
+    let args = {
+      command: None,
+      manifest: a->Reventless.CliArgs.string("manifest"),
+      stack: a->Reventless.CliArgs.string("stack")->Option.getOr(defaultStack),
+      help,
     }
-  }
-  acc.contents
-}
+    let positionals = a->Reventless.CliArgs.positionals
+    switch (positionals->Array.get(0), positionals->Array.get(1)) {
+    | (_, Some(surplus)) => Reventless.CliArgs.extra(surplus)
+    | (Some("up"), None) => Ok({...args, command: Some(Up)})
+    | (Some("down"), None) => Ok({...args, command: Some(Down)})
+    | (Some(other), None) => Reventless.CliArgs.extra(other)
+    | (None, None) => help ? Ok(args) : Error("say `up` or `down`")
+    }
+  })
 
 let usage = `
+Usage: deploy-app up|down [--manifest <path>] [--stack <name>]
+
 Deploy an app to AWS, or remove it again.
 
   deploy-app up     Deploy the platform and every plugin, bake the component
@@ -675,34 +664,31 @@ let down = async (~manifest: DeployManifest.resolved, ~stack: string): result<un
     }
   }
 
-let run = async (): result<unit, string> =>
-  switch parseArgs(NodeProcess.argv->Array.slice(~start=2, ~end=NodeProcess.argv->Array.length)) {
+let run = async ({command, manifest, stack}: args): result<unit, string> =>
+  switch DeployManifest.load(manifest->Option.getOr(DeployManifest.defaultFile)) {
   | Error(_) as e => e
-  | Ok(args) if args.help =>
-    Console.log(usage)
-    Ok()
-  | Ok({command: None}) => Error("say `up` or `down` (--help for more)")
-  | Ok({command: Some(command), manifest, stack}) =>
-    switch DeployManifest.load(manifest->Option.getOr(DeployManifest.defaultFile)) {
-    | Error(_) as e => e
-    | Ok(manifest) =>
-      switch command {
-      | Up => await up(~manifest, ~stack)
-      | Down => await down(~manifest, ~stack)
-      }
+  | Ok(manifest) =>
+    switch command {
+    | Some(Up) => await up(~manifest, ~stack)
+    | Some(Down) => await down(~manifest, ~stack)
+    | None => Error("say `up` or `down`")
     }
   }
 
-let main = async () =>
-  switch await run() {
-  | Ok() => ()
-  | Error(message) =>
-    Console.error(`deploy-app: ${message}`)
-    NodeProcess.exit(1)
-  | exception exn =>
-    Console.error(`deploy-app: ${Util_AwsError.describe(exn)}`)
-    NodeProcess.exit(1)
-  }
+let cli: Reventless.CliArgs.cli<args> = {bin: "deploy-app", usage, parse: parseArgs}
+
+let main = () =>
+  Reventless.CliArgs.run(cli, async args =>
+    switch await run(args) {
+    | Ok() => ()
+    | Error(message) =>
+      Console.error(`deploy-app: ${message}`)
+      NodeProcess.exit(1)
+    | exception exn =>
+      Console.error(`deploy-app: ${Util_AwsError.describe(exn)}`)
+      NodeProcess.exit(1)
+    }
+  )
 
 // No top-level call: `../run-deploy-app.mjs` invokes [main], so a test can import
 // this module.