@platforma-sdk/pl-cli 0.7.69 → 0.7.71

package/src/cmd/admin/copy-project.ts

@@ -1,9 +1,9 @@
-import { Flags } from "@oclif/core";
+import { Command, Option } from "commander";
 import { field, resourceIdToString } from "@milaboratories/pl-client";
 import { ProjectMetaKey } from "@milaboratories/pl-middle-layer";
 import { randomUUID } from "node:crypto";
-import { PlCommand } from "../../base_command";
-import { GlobalFlags, AdminAuthFlags } from "../../cmd-opts";
+import { connectClient } from "../../base_command";
+import { addOptions, GlobalOptions, AdminAuthOptions } from "../../cmd-opts";
 import {
   resolveProject,
   deduplicateName,
@@ -13,91 +13,90 @@ import {
 } from "../../project_ops";
 import { outputJson, outputText } from "../../output";
 
-export default class AdminCopyProject extends PlCommand {
-  static override description =
-    "Copy a project from one user to another. Requires admin/controller credentials.";
+export default function adminCopyProjectCommand(): Command {
+  const cmd = new Command("copy-project").description(
+    "Copy a project from one user to another. Requires admin/controller credentials.",
+  );
 
-  static override flags = {
-    ...GlobalFlags,
-    ...AdminAuthFlags,
-    "source-user": Flags.string({
-      summary: "Username of the source project owner",
-      required: true,
-    }),
-    "source-project": Flags.string({
-      summary: "Source project ID or label",
-      required: true,
-    }),
-    "target-user": Flags.string({
-      summary: "Username of the target user (defaults to source-user for same-user copy)",
-    }),
-    name: Flags.string({
-      char: "n",
-      summary: "Name for the copied project",
-      helpValue: "<name>",
-    }),
-    "auto-rename": Flags.boolean({
-      summary: "Auto-rename on collision (default: true)",
-      default: true,
-      allowNo: true,
-    }),
-  };
+  addOptions(cmd, GlobalOptions(), AdminAuthOptions());
+  cmd.addOption(
+    new Option(
+      "--source-user <user>",
+      "Username of the source project owner",
+    ).makeOptionMandatory(),
+  );
+  cmd.addOption(
+    new Option("--source-project <project>", "Source project ID or label").makeOptionMandatory(),
+  );
+  cmd.option(
+    "--target-user <user>",
+    "Username of the target user (defaults to source-user for same-user copy)",
+  );
+  cmd.option("-n, --name <name>", "Name for the copied project");
+  cmd.addOption(
+    new Option("--auto-rename", "Auto-rename on collision (default: true)").default(true),
+  );
+  cmd.option("--no-auto-rename", "Fail on name collision instead of auto-renaming");
 
-  public async run(): Promise<void> {
-    const { flags } = await this.parse(AdminCopyProject);
-    const pl = await this.connectClient(flags);
+  cmd.action(async (flags) => {
+    const pl = await connectClient(flags);
+    try {
+      const targetUser = flags.targetUser ?? flags.sourceUser;
 
-    const targetUser = flags["target-user"] ?? flags["source-user"];
-
-    const source = await navigateToUserRoot(pl, flags["source-user"]);
-    const { rid: sourceRid } = await resolveProject(
-      pl,
-      source.projectListRid,
-      flags["source-project"],
-    );
+      const source = await navigateToUserRoot(pl, flags.sourceUser);
+      const { rid: sourceRid } = await resolveProject(
+        pl,
+        source.projectListRid,
+        flags.sourceProject,
+      );
 
-    const target =
-      targetUser === flags["source-user"] ? source : await navigateToUserRoot(pl, targetUser);
+      const target =
+        targetUser === flags.sourceUser ? source : await navigateToUserRoot(pl, targetUser);
 
-    const newId = randomUUID();
+      const newId = randomUUID();
 
-    const result = await pl.withWriteTx("adminCopyProject", async (tx) => {
-      const sourceMetaStr = await tx.getKValueString(sourceRid, ProjectMetaKey);
-      const sourceMeta = JSON.parse(sourceMetaStr);
-      const sourceLabel: string = sourceMeta.label;
+      const result = await pl.withWriteTx("adminCopyProject", async (tx) => {
+        const sourceMetaStr = await tx.getKValueString(sourceRid, ProjectMetaKey);
+        const sourceMeta = JSON.parse(sourceMetaStr);
+        const sourceLabel: string = sourceMeta.label;
 
-      const existingLabels = await getExistingLabelsInTx(tx, target.projectListRid);
+        const existingLabels = await getExistingLabelsInTx(tx, target.projectListRid);
 
-      let newLabel: string = flags.name ?? sourceLabel;
+        let newLabel: string = flags.name ?? sourceLabel;
 
-      if (existingLabels.includes(newLabel)) {
-        if (!flags["auto-rename"]) {
-          throw new Error(`Project name "${newLabel}" already exists for target user.`);
+        if (existingLabels.includes(newLabel)) {
+          if (!flags.autoRename) {
+            throw new Error(`Project name "${newLabel}" already exists for target user.`);
+          }
+          newLabel = deduplicateName(flags.name ?? sourceLabel, existingLabels);
         }
-        newLabel = deduplicateName(flags.name ?? sourceLabel, existingLabels);
-      }
-
-      const newPrj = await duplicateProject(tx, sourceRid, { label: newLabel });
-      tx.createField(field(target.projectListRid, newId), "Dynamic", newPrj);
-      await tx.commit();
 
-      const prjResourceId = await newPrj.globalId;
-      const prjId = resourceIdToString(prjResourceId);
-      return { id: prjId, rid: prjResourceId, label: newLabel };
-    });
+        const newPrj = await duplicateProject(tx, sourceRid, { label: newLabel });
+        tx.createField(field(target.projectListRid, newId), "Dynamic", newPrj);
+        await tx.commit();
 
-    if (flags.format === "json") {
-      outputJson({
-        id: result.id,
-        rid: resourceIdToString(result.rid),
-        label: result.label,
-        sourceUser: flags["source-user"],
-        targetUser,
+        const prjResourceId = await newPrj.globalId;
+        const prjId = resourceIdToString(prjResourceId);
+        return { id: prjId, rid: prjResourceId, label: newLabel };
       });
-    } else {
-      outputText(
-        `Copied project from ${flags["source-user"]} to ${targetUser} as "${result.label}" (id: ${result.id}, rid: ${resourceIdToString(result.rid)})`,
-      );
+
+      if (flags.format === "json") {
+        outputJson({
+          id: result.id,
+          rid: resourceIdToString(result.rid),
+          label: result.label,
+          sourceUser: flags.sourceUser,
+          targetUser,
+        });
+      } else {
+        outputText(
+          `Copied project from ${flags.sourceUser} to ${targetUser} as "${result.label}" (id: ${result.id}, rid: ${resourceIdToString(result.rid)})`,
+        );
+      }
+    } finally {
+      await pl.close();
     }
-  }
+  });
+
+  return cmd;
 }

package/src/cmd/project/delete.ts

@@ -1,58 +1,55 @@
-import { Args, Flags } from "@oclif/core";
+import { Command } from "commander";
 import { createInterface } from "node:readline";
-import { PlCommand } from "../../base_command";
+import { connect } from "../../base_command";
+import { addOptions, GlobalOptions, UserAuthOptions, AdminTargetOptions } from "../../cmd-opts";
 import { resolveProject, deleteProject, getProjectInfo } from "../../project_ops";
 import { outputJson, outputText } from "../../output";
 
-export default class ProjectDelete extends PlCommand {
-  static override description = "Delete a project. This permanently destroys all project data.";
-
-  static override args = {
-    project: Args.string({
-      description: "Project ID or label",
-      required: true,
-    }),
-  };
-
-  static override flags = {
-    ...PlCommand.baseFlags,
-    force: Flags.boolean({
-      summary: "Skip confirmation",
-      default: false,
-    }),
-  };
-
-  public async run(): Promise<void> {
-    const { args, flags } = await this.parse(ProjectDelete);
-    const { pl, projectListRid } = await this.connect(flags);
-    const { id, rid, fieldName } = await resolveProject(pl, projectListRid, args.project);
-
-    const info = await getProjectInfo(pl, id, rid);
-
-    if (!flags.force) {
-      const rl = createInterface({ input: process.stdin, output: process.stderr });
-      try {
-        const answer = await new Promise<string>((resolve) => {
-          rl.question(
-            `Delete project "${info.label}" (${info.blockCount} blocks)? [y/N] `,
-            resolve,
-          );
-        });
-        if (answer.toLowerCase() !== "y") {
-          outputText("Aborted.");
-          return;
+export default function projectDeleteCommand(): Command {
+  const cmd = new Command("delete").description(
+    "Delete a project. This permanently destroys all project data.",
+  );
+
+  cmd.argument("<project>", "Project ID or label");
+  addOptions(cmd, GlobalOptions(), UserAuthOptions(), AdminTargetOptions());
+  cmd.option("--force", "Skip confirmation", false);
+
+  cmd.action(async (project: string, flags) => {
+    const { pl, projectListRid } = await connect(flags);
+    try {
+      const { id, rid, fieldName } = await resolveProject(pl, projectListRid, project);
+
+      const info = await getProjectInfo(pl, id, rid);
+
+      if (!flags.force) {
+        const rl = createInterface({ input: process.stdin, output: process.stderr });
+        try {
+          const answer = await new Promise<string>((resolve) => {
+            rl.question(
+              `Delete project "${info.label}" (${info.blockCount} blocks)? [y/N] `,
+              resolve,
+            );
+          });
+          if (answer.toLowerCase() !== "y") {
+            outputText("Aborted.");
+            return;
+          }
+        } finally {
+          rl.close();
         }
-      } finally {
-        rl.close();
       }
-    }
 
-    await deleteProject(pl, projectListRid, fieldName);
+      await deleteProject(pl, projectListRid, fieldName);
 
-    if (flags.format === "json") {
-      outputJson({ deleted: true, id, label: info.label });
-    } else {
-      outputText(`Deleted project "${info.label}"`);
+      if (flags.format === "json") {
+        outputJson({ deleted: true, id, label: info.label });
+      } else {
+        outputText(`Deleted project "${info.label}"`);
+      }
+    } finally {
+      await pl.close();
     }
-  }
+  });
+
+  return cmd;
 }

package/src/cmd/project/duplicate.ts

@@ -1,8 +1,9 @@
-import { Args, Flags } from "@oclif/core";
+import { Command, Option } from "commander";
 import { field, resourceIdToString } from "@milaboratories/pl-client";
 import { ProjectMetaKey } from "@milaboratories/pl-middle-layer";
 import { randomUUID } from "node:crypto";
-import { PlCommand } from "../../base_command";
+import { connect } from "../../base_command";
+import { addOptions, GlobalOptions, UserAuthOptions, AdminTargetOptions } from "../../cmd-opts";
 import {
   resolveProject,
   deduplicateName,
@@ -11,72 +12,64 @@ import {
 } from "../../project_ops";
 import { outputJson, outputText } from "../../output";
 
-export default class ProjectDuplicate extends PlCommand {
-  static override description =
-    "Duplicate a project within the same user. Auto-renames on collision by default.";
+export default function projectDuplicateCommand(): Command {
+  const cmd = new Command("duplicate").description(
+    "Duplicate a project within the same user. Auto-renames on collision by default.",
+  );
 
-  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.option("-n, --name <name>", "Name for the duplicate");
+  cmd.addOption(
+    new Option("--auto-rename", "Auto-rename on collision (default: true)").default(true),
+  );
+  cmd.option("--no-auto-rename", "Fail on name collision instead of auto-renaming");
 
-  static override flags = {
-    ...PlCommand.baseFlags,
-    name: Flags.string({
-      char: "n",
-      summary: "Name for the duplicate",
-      helpValue: "<name>",
-    }),
-    "auto-rename": Flags.boolean({
-      summary: "Auto-rename on collision (default: true)",
-      default: true,
-      allowNo: true,
-    }),
-  };
+  cmd.action(async (project: string, flags) => {
+    const { pl, projectListRid } = await connect(flags);
+    try {
+      const { rid: sourceRid } = await resolveProject(pl, projectListRid, project);
 
-  public async run(): Promise<void> {
-    const { args, flags } = await this.parse(ProjectDuplicate);
-    const { pl, projectListRid } = await this.connect(flags);
+      const newId = randomUUID();
 
-    const { rid: sourceRid } = await resolveProject(pl, projectListRid, args.project);
+      const result = await pl.withWriteTx("duplicateProject", async (tx) => {
+        const sourceMetaStr = await tx.getKValueString(sourceRid, ProjectMetaKey);
+        const sourceMeta = JSON.parse(sourceMetaStr);
+        const sourceLabel: string = sourceMeta.label;
 
-    const newId = randomUUID();
+        const existingLabels = await getExistingLabelsInTx(tx, projectListRid);
 
-    const result = await pl.withWriteTx("duplicateProject", async (tx) => {
-      const sourceMetaStr = await tx.getKValueString(sourceRid, ProjectMetaKey);
-      const sourceMeta = JSON.parse(sourceMetaStr);
-      const sourceLabel: string = sourceMeta.label;
-
-      const existingLabels = await getExistingLabelsInTx(tx, projectListRid);
-
-      // Compute new label
-      let newLabel: string;
-      if (flags.name) {
-        if (!flags["auto-rename"] && existingLabels.includes(flags.name)) {
-          throw new Error(`Project name "${flags.name}" already exists.`);
+        // Compute new label
+        let newLabel: string;
+        if (flags.name) {
+          if (!flags.autoRename && existingLabels.includes(flags.name)) {
+            throw new Error(`Project name "${flags.name}" already exists.`);
+          }
+          newLabel = existingLabels.includes(flags.name)
+            ? deduplicateName(flags.name, existingLabels)
+            : flags.name;
+        } else {
+          newLabel = deduplicateName(sourceLabel, existingLabels);
         }
-        newLabel = existingLabels.includes(flags.name)
-          ? deduplicateName(flags.name, existingLabels)
-          : flags.name;
-      } else {
-        newLabel = deduplicateName(sourceLabel, existingLabels);
-      }
 
-      const newPrj = await duplicateProject(tx, sourceRid, { label: newLabel });
-      tx.createField(field(projectListRid, newId), "Dynamic", newPrj);
-      await tx.commit();
+        const newPrj = await duplicateProject(tx, sourceRid, { label: newLabel });
+        tx.createField(field(projectListRid, newId), "Dynamic", newPrj);
+        await tx.commit();
 
-      const projectResourceId = await newPrj.globalId;
-      const projectId = resourceIdToString(projectResourceId);
-      return { id: projectId, rid: projectResourceId, label: newLabel };
-    });
+        const projectResourceId = await newPrj.globalId;
+        const projectId = resourceIdToString(projectResourceId);
+        return { id: projectId, rid: projectResourceId, label: newLabel };
+      });
 
-    if (flags.format === "json") {
-      outputJson({ id: result.id, rid: resourceIdToString(result.rid), label: result.label });
-    } else {
-      outputText(`Duplicated project as "${result.label}" (id: ${result.id})`);
+      if (flags.format === "json") {
+        outputJson({ id: result.id, rid: resourceIdToString(result.rid), label: result.label });
+      } else {
+        outputText(`Duplicated project as "${result.label}" (id: ${result.id})`);
+      }
+    } finally {
+      await pl.close();
     }
-  }
+  });
+
+  return cmd;
 }

package/src/cmd/project/info.ts

@@ -1,53 +1,51 @@
-import { Args } from "@oclif/core";
-import { PlCommand } from "../../base_command";
+import { Command } from "commander";
+import { connect } from "../../base_command";
+import { addOptions, GlobalOptions, UserAuthOptions, AdminTargetOptions } from "../../cmd-opts";
 import { resolveProject, getProjectInfo } from "../../project_ops";
 import { formatDate, outputJson, outputText } from "../../output";
 import { resourceIdToString } from "@milaboratories/pl-client";
 
-export default class ProjectInfo extends PlCommand {
-  static override description = "Show detailed information about a project.";
+export default function projectInfoCommand(): Command {
+  const cmd = new Command("info").description("Show detailed information about 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());
 
-  static override flags = {
-    ...PlCommand.baseFlags,
-  };
+  cmd.action(async (project: string, flags) => {
+    const { pl, projectListRid } = await connect(flags);
+    try {
+      const { id, rid } = await resolveProject(pl, projectListRid, project);
+      const info = await getProjectInfo(pl, id, rid);
 
-  public async run(): Promise<void> {
-    const { args, flags } = await this.parse(ProjectInfo);
-    const { pl, projectListRid } = await this.connect(flags);
-    const { id, rid } = await resolveProject(pl, projectListRid, args.project);
-    const info = await getProjectInfo(pl, id, rid);
-
-    if (flags.format === "json") {
-      outputJson({
-        id: info.id,
-        rid: resourceIdToString(info.rid),
-        label: info.label,
-        schemaVersion: info.schemaVersion,
-        blockCount: info.blockCount,
-        blockIds: info.blockIds,
-        created: info.created.toISOString(),
-        lastModified: info.lastModified.toISOString(),
-      });
-    } else {
-      outputText(`Project: ${info.label}`);
-      outputText(`ID:      ${info.id}`);
-      outputText(`RID:     ${resourceIdToString(info.rid)}`);
-      outputText(`Schema:  ${info.schemaVersion ?? "(unknown)"}`);
-      outputText(`Blocks:  ${info.blockCount}`);
-      if (info.blockIds.length > 0) {
-        for (const bid of info.blockIds) {
-          outputText(`  - ${bid}`);
+      if (flags.format === "json") {
+        outputJson({
+          id: info.id,
+          rid: resourceIdToString(info.rid),
+          label: info.label,
+          schemaVersion: info.schemaVersion,
+          blockCount: info.blockCount,
+          blockIds: info.blockIds,
+          created: info.created.toISOString(),
+          lastModified: info.lastModified.toISOString(),
+        });
+      } else {
+        outputText(`Project: ${info.label}`);
+        outputText(`ID:      ${info.id}`);
+        outputText(`RID:     ${resourceIdToString(info.rid)}`);
+        outputText(`Schema:  ${info.schemaVersion ?? "(unknown)"}`);
+        outputText(`Blocks:  ${info.blockCount}`);
+        if (info.blockIds.length > 0) {
+          for (const bid of info.blockIds) {
+            outputText(`  - ${bid}`);
+          }
         }
+        outputText(`Created:       ${formatDate(info.created)}`);
+        outputText(`Last Modified: ${formatDate(info.lastModified)}`);
       }
-      outputText(`Created:       ${formatDate(info.created)}`);
-      outputText(`Last Modified: ${formatDate(info.lastModified)}`);
+    } finally {
+      await pl.close();
     }
-  }
+  });
+
+  return cmd;
 }

package/src/cmd/project/list.ts

@@ -1,49 +1,54 @@
-import { PlCommand } from "../../base_command";
+import { Command } from "commander";
+import { connect } from "../../base_command";
+import { addOptions, GlobalOptions, UserAuthOptions, AdminTargetOptions } from "../../cmd-opts";
 import { listProjects } from "../../project_ops";
 import { formatTable, formatDate, outputJson, outputText } from "../../output";
 import { resourceIdToString } from "@milaboratories/pl-client";
 
-export default class ProjectList extends PlCommand {
-  static override description = "List all projects for the authenticated user.";
+export default function projectListCommand(): Command {
+  const cmd = new Command("list").description("List all projects for the authenticated user.");
 
-  static override flags = {
-    ...PlCommand.baseFlags,
-  };
+  addOptions(cmd, GlobalOptions(), UserAuthOptions(), AdminTargetOptions());
 
-  public async run(): Promise<void> {
-    const { flags } = await this.parse(ProjectList);
-    const { pl, projectListRid } = await this.connect(flags);
-    const projects = await listProjects(pl, projectListRid);
+  cmd.action(async (flags) => {
+    const { pl, projectListRid } = await connect(flags);
+    try {
+      const projects = await listProjects(pl, projectListRid);
 
-    if (flags.format === "json") {
-      outputJson(
-        projects.map((p) => ({
-          id: p.id,
-          rid: resourceIdToString(p.rid),
-          label: p.label,
-          created: p.created.toISOString(),
-          lastModified: p.lastModified.toISOString(),
-        })),
-      );
-    } else {
-      if (projects.length === 0) {
-        outputText("No projects found.");
-        return;
-      }
+      if (flags.format === "json") {
+        outputJson(
+          projects.map((p) => ({
+            id: p.id,
+            rid: resourceIdToString(p.rid),
+            label: p.label,
+            created: p.created.toISOString(),
+            lastModified: p.lastModified.toISOString(),
+          })),
+        );
+      } else {
+        if (projects.length === 0) {
+          outputText("No projects found.");
+          return;
+        }
 
-      outputText(
-        formatTable(
-          ["ID", "RID", "LABEL", "CREATED", "LAST MODIFIED"],
-          projects.map((p) => [
-            p.id,
-            resourceIdToString(p.rid),
-            p.label,
-            formatDate(p.created),
-            formatDate(p.lastModified),
-          ]),
-        ),
-      );
-      outputText(`\n${projects.length} project(s)`);
+        outputText(
+          formatTable(
+            ["ID", "RID", "LABEL", "CREATED", "LAST MODIFIED"],
+            projects.map((p) => [
+              p.id,
+              resourceIdToString(p.rid),
+              p.label,
+              formatDate(p.created),
+              formatDate(p.lastModified),
+            ]),
+          ),
+        );
+        outputText(`\n${projects.length} project(s)`);
+      }
+    } finally {
+      await pl.close();
     }
-  }
+  });
+
+  return cmd;
 }