@platforma-sdk/pl-cli 0.7.69 → 0.7.71

package/src/cmd/project/rename.ts

@@ -1,40 +1,33 @@
-import { Args, Flags } from "@oclif/core";
-import { PlCommand } from "../../base_command";
+import { Command, Option } from "commander";
+import { connect } from "../../base_command";
+import { addOptions, GlobalOptions, UserAuthOptions, AdminTargetOptions } from "../../cmd-opts";
 import { resolveProject, renameProject } from "../../project_ops";
 import { outputJson, outputText } from "../../output";
 import { resourceIdToString } from "@milaboratories/pl-client";
 
-export default class ProjectRename extends PlCommand {
-  static override description = "Rename a project.";
+export default function projectRenameCommand(): Command {
+  const cmd = new Command("rename").description("Rename a project.");
 
-  static override args = {
-    project: Args.string({
-      description: "Project ID or label",
-      required: true,
-    }),
-  };
+  cmd.argument("<project>", "Project ID or label");
+  addOptions(cmd, GlobalOptions(), UserAuthOptions(), AdminTargetOptions());
+  cmd.addOption(new Option("-n, --name <name>", "New name for the project").makeOptionMandatory());
 
-  static override flags = {
-    ...PlCommand.baseFlags,
-    name: Flags.string({
-      char: "n",
-      summary: "New name for the project",
-      helpValue: "<name>",
-      required: true,
-    }),
-  };
+  cmd.action(async (project: string, flags) => {
+    const { pl, projectListRid } = await connect(flags);
+    try {
+      const { id, rid } = await resolveProject(pl, projectListRid, project);
 
-  public async run(): Promise<void> {
-    const { args, flags } = await this.parse(ProjectRename);
-    const { pl, projectListRid } = await this.connect(flags);
-    const { id, rid } = await resolveProject(pl, projectListRid, args.project);
+      await renameProject(pl, rid, flags.name);
 
-    await renameProject(pl, rid, flags.name);
-
-    if (flags.format === "json") {
-      outputJson({ id, rid: resourceIdToString(rid), label: flags.name });
-    } else {
-      outputText(`Renamed project to "${flags.name}"`);
+      if (flags.format === "json") {
+        outputJson({ id, rid: resourceIdToString(rid), label: flags.name });
+      } else {
+        outputText(`Renamed project to "${flags.name}"`);
+      }
+    } finally {
+      await pl.close();
     }
-  }
+  });
+
+  return cmd;
 }

package/src/cmd-opts.ts

@@ -1,60 +1,43 @@
-import { Flags } from "@oclif/core";
+import { Command, Option } from "commander";
 
-export const GlobalFlags = {
-  address: Flags.string({
-    char: "a",
-    summary: "Platforma server address",
-    helpValue: "<url>",
-    env: "PL_ADDRESS",
-    required: true,
-  }),
-  format: Flags.string({
-    char: "f",
-    summary: "Output format",
-    options: ["text", "json"],
-    default: "text",
-  }),
-};
+/** Add one or more groups of options to a command, preserving group order. */
+export function addOptions(cmd: Command, ...optionGroups: Option[][]): Command {
+  for (const group of optionGroups) {
+    for (const opt of group) cmd.addOption(opt);
+  }
+  return cmd;
+}
 
-export const UserAuthFlags = {
-  user: Flags.string({
-    char: "u",
-    summary: "Username for authentication",
-    env: "PL_USER",
-  }),
-  password: Flags.string({
-    char: "p",
-    summary: "Password for authentication",
-    env: "PL_PASSWORD",
-  }),
-};
+export const GlobalOptions = (): Option[] => [
+  new Option("-a, --address <url>", "Platforma server address")
+    .env("PL_ADDRESS")
+    .makeOptionMandatory(),
+  new Option("-f, --format <format>", "Output format").choices(["text", "json"]).default("text"),
+];
+
+export const UserAuthOptions = (): Option[] => [
+  new Option("-u, --user <user>", "Username for authentication").env("PL_USER"),
+  new Option("-p, --password <password>", "Password for authentication").env("PL_PASSWORD"),
+];
 
 /** Admin credentials only (for purely admin commands like copy-project). */
-export const AdminAuthFlags = {
-  "admin-user": Flags.string({
-    summary: "Admin/controller username",
-    env: "PL_ADMIN_USER",
-    required: true,
-  }),
-  "admin-password": Flags.string({
-    summary: "Admin/controller password",
-    env: "PL_ADMIN_PASSWORD",
-    required: true,
-  }),
-};
+export const AdminAuthOptions = (): Option[] => [
+  new Option("--admin-user <user>", "Admin/controller username")
+    .env("PL_ADMIN_USER")
+    .makeOptionMandatory(),
+  new Option("--admin-password <password>", "Admin/controller password")
+    .env("PL_ADMIN_PASSWORD")
+    .makeOptionMandatory(),
+];
 
 /** Admin credentials + target user (for regular commands that can optionally operate on another user). */
-export const AdminTargetFlags = {
-  "admin-user": Flags.string({
-    summary: "Admin/controller username (enables admin mode)",
-    env: "PL_ADMIN_USER",
-  }),
-  "admin-password": Flags.string({
-    summary: "Admin/controller password",
-    env: "PL_ADMIN_PASSWORD",
-  }),
-  "target-user": Flags.string({
-    summary: "Operate on this user's data (requires admin credentials)",
-    env: "PL_TARGET_USER",
-  }),
-};
+export const AdminTargetOptions = (): Option[] => [
+  new Option("--admin-user <user>", "Admin/controller username (enables admin mode)").env(
+    "PL_ADMIN_USER",
+  ),
+  new Option("--admin-password <password>", "Admin/controller password").env("PL_ADMIN_PASSWORD"),
+  new Option(
+    "--target-user <user>",
+    "Operate on this user's data (requires admin credentials)",
+  ).env("PL_TARGET_USER"),
+];

package/dist/cmd/index.d.ts

@@ -1,14 +0,0 @@
-import { default as ProjectList } from './project/list';
-import { default as ProjectInfo } from './project/info';
-import { default as ProjectDuplicate } from './project/duplicate';
-import { default as ProjectRename } from './project/rename';
-import { default as ProjectDelete } from './project/delete';
-import { default as AdminCopyProject } from './admin/copy-project';
-export declare const COMMANDS: {
-    "project:list": typeof ProjectList;
-    "project:info": typeof ProjectInfo;
-    "project:duplicate": typeof ProjectDuplicate;
-    "project:rename": typeof ProjectRename;
-    "project:delete": typeof ProjectDelete;
-    "admin:copy-project": typeof AdminCopyProject;
-};

package/src/cmd/index.ts

@@ -1,17 +0,0 @@
-// Command index for oclif. Run `pnpm run oclif:index` to regenerate.
-
-import ProjectList from "./project/list";
-import ProjectInfo from "./project/info";
-import ProjectDuplicate from "./project/duplicate";
-import ProjectRename from "./project/rename";
-import ProjectDelete from "./project/delete";
-import AdminCopyProject from "./admin/copy-project";
-
-export const COMMANDS = {
-  "project:list": ProjectList,
-  "project:info": ProjectInfo,
-  "project:duplicate": ProjectDuplicate,
-  "project:rename": ProjectRename,
-  "project:delete": ProjectDelete,
-  "admin:copy-project": AdminCopyProject,
-};