@superblocksteam/cli 1.10.0 → 1.12.0

package/dist/commands/{push.js → push.mjs}

@@ -1,22 +1,42 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const core_1 = require("@oclif/core");
-const sdk_1 = require("@superblocksteam/sdk");
-const util_1 = require("@superblocksteam/util");
-const listr2_1 = require("listr2");
-const lodash_1 = require("lodash");
-const authenticated_command_1 = require("../common/authenticated-command");
-const version_control_1 = require("../common/version-control");
-class Push extends authenticated_command_1.AuthenticatedCommand {
+import path from "node:path";
+import { Args, Flags } from "@oclif/core";
+import { BranchNotCheckedOutError, CommitAlreadyExistsError, ValidateGitSetupError, } from "@superblocksteam/sdk";
+import { getSuperblocksMonorepoConfigJson, getSuperblocksResourceConfigIfExists, NotFoundError, ComponentEvent, } from "@superblocksteam/util";
+import { Listr } from "listr2";
+import { isEmpty } from "lodash-es";
+import { AuthenticatedCommand } from "../common/authenticated-command.mjs";
+import { DEFAULT_BRANCH, FileStructureType, MULTI_SELECT_PROMPT_HELP, atLeastOneSelection, deleteResourcesAndUpdateRootConfig, extractApiName, getCurrentGitBranchIfGit, getFileStructureType, getHeadCommit, isCI, getLocalGitRepoState, isGitRepoDirty, readApiFromDisk, readMultiPageApplicationFromDisk, validateLocalResource, } from "../common/version-control.mjs";
+export default class Push extends AuthenticatedCommand {
+    static description = "Import objects from local filesystem to Superblocks";
+    static examples = [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %>  apps/my-app",
+        "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
+        "<%= config.bin %> <%= command.id %>  apps/my-app --skip-commit",
+    ];
+    static flags = {
+        branch: Flags.string({
+            char: "b",
+            description: "Superblocks branch to push to, the current git branch will be used by default",
+        }),
+        "skip-commit": Flags.boolean({
+            char: "s",
+            default: false,
+            description: "If true, push command will only update live edit state along with signature without creating a commit.",
+        }),
+    };
+    static args = {
+        resource_path: Args.string({
+            description: "Superblocks resource location to push (e.g. apps/my-app)",
+        }),
+    };
     async run() {
         const { flags, args } = await this.parse(Push);
         const tasks = this.createTasks(args.resource_path, flags.branch, flags["skip-commit"]);
         await tasks.run();
     }
     createTasks(resourceName, branch, skipCommit) {
-        const tasks = new listr2_1.Listr([
+        const tasks = new Listr([
             {
                 title: "Checking for existing Superblocks project...",
                 task: async (ctx) => {
@@ -26,10 +46,10 @@ class Push extends authenticated_command_1.AuthenticatedCommand {
                         [
                             ctx.existingSuperblocksRootConfig,
                             ctx.superblocksRootConfigPath,
-                        ] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
+                        ] = await getSuperblocksMonorepoConfigJson(true);
                         ctx.existingSuperblocksResourceConfig =
-                            await (0, util_1.getSuperblocksResourceConfigIfExists)();
-                        ctx.superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
+                            await getSuperblocksResourceConfigIfExists();
+                        ctx.superblocksRootPath = path.resolve(path.dirname(ctx.superblocksRootConfigPath), "..");
                     }
                     catch {
                         // no existing superblocks config
@@ -42,27 +62,27 @@ class Push extends authenticated_command_1.AuthenticatedCommand {
                 task: async (ctx) => {
                     ctx.branchToPushTo = new Map();
                     if (skipCommit) {
-                        const repoState = await (0, version_control_1.getLocalGitRepoState)();
+                        const repoState = await getLocalGitRepoState();
                         if (repoState.status === "NO_GIT") {
                             if (!branch) {
                                 this.error(`No git repository found in the current folder hierarchy. Please make sure to pass branch name. E.g. superblocks push --branch feature-branch. 
 If resource is not connected to git repository, pass "main" as branch name.`);
                             }
-                            ctx.localBranchName = branch || version_control_1.DEFAULT_BRANCH;
+                            ctx.localBranchName = branch || DEFAULT_BRANCH;
                             return;
                         }
                     }
                     try {
                         ctx.localBranchName =
-                            branch || (await (0, version_control_1.getCurrentGitBranchIfGit)()) || version_control_1.DEFAULT_BRANCH;
+                            branch || (await getCurrentGitBranchIfGit()) || DEFAULT_BRANCH;
                         if (!skipCommit) {
-                            [ctx.headCommitId, ctx.headCommitMessage] = await (0, version_control_1.getHeadCommit)(ctx.localBranchName);
+                            [ctx.headCommitId, ctx.headCommitMessage] = await getHeadCommit(ctx.localBranchName);
                         }
                     }
                     catch (e) {
                         this.error(`Failed to check for existing git repository: ${e.message}. Please make sure to clone or initialize a git repository.`);
                     }
-                    const isDirtyRepo = await (0, version_control_1.isGitRepoDirty)();
+                    const isDirtyRepo = await isGitRepoDirty();
                     if (isDirtyRepo && !skipCommit) {
                         this.error(`Your git repository is dirty. Please commit or stash your changes before pushing to Superblocks.`);
                     }
@@ -71,14 +91,13 @@ If resource is not connected to git repository, pass "main" as branch name.`);
             {
                 title: "Checking for deleted Superblocks resources...",
                 task: async (ctx, task) => {
-                    var _a, _b;
-                    if ((0, version_control_1.isCI)()) {
+                    if (isCI()) {
                         this.log("Skipping check for deleted Superblocks resources in CI environment.");
                         return;
                     }
                     try {
-                        for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
-                            switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
+                        for (const [resourceId, resource] of Object.entries(ctx.existingSuperblocksRootConfig?.resources ?? {})) {
+                            switch (resource?.resourceType) {
                                 case "APPLICATION": {
                                     try {
                                         await this.getSdk().fetchApplication({
@@ -88,7 +107,7 @@ If resource is not connected to git repository, pass "main" as branch name.`);
                                         });
                                     }
                                     catch (error) {
-                                        if (error instanceof util_1.NotFoundError) {
+                                        if (error instanceof NotFoundError) {
                                             ctx.removedResourceIds.push(resourceId);
                                         }
                                         else {
@@ -106,7 +125,7 @@ If resource is not connected to git repository, pass "main" as branch name.`);
                                         });
                                     }
                                     catch (error) {
-                                        if (error instanceof util_1.NotFoundError) {
+                                        if (error instanceof NotFoundError) {
                                             ctx.removedResourceIds.push(resourceId);
                                         }
                                         else {
@@ -139,7 +158,7 @@ Would you like to also delete these resources from your filesystem?`,
                             },
                         ]);
                         if (removeResourcesFromDisk) {
-                            await (0, version_control_1.deleteResourcesAndUpdateRootConfig)(ctx.removedResourceIds, ctx.existingSuperblocksRootConfig, ctx.superblocksRootPath, ctx.superblocksRootConfigPath);
+                            await deleteResourcesAndUpdateRootConfig(ctx.removedResourceIds, ctx.existingSuperblocksRootConfig, ctx.superblocksRootPath, ctx.superblocksRootConfigPath);
                         }
                     }
                     catch (e) {
@@ -155,7 +174,6 @@ Would you like to also delete these resources from your filesystem?`,
             },
             {
                 task: async (ctx, task) => {
-                    var _a, _b;
                     if (skipCommit) {
                         this.log("Skipping git validation as --skip-commit flag is set");
                         return;
@@ -164,18 +182,18 @@ Would you like to also delete these resources from your filesystem?`,
                     const subtasks = [];
                     ctx.resourceIdsToSkip = new Set();
                     for (const resourceId of ctx.resourceIdsToPush) {
-                        const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
+                        const resource = ctx.existingSuperblocksRootConfig?.resources[resourceId];
                         // for user messages:
-                        const resourceTitle = `${((_b = resource.resourceType) !== null && _b !== void 0 ? _b : "").toLowerCase()} ${resourceId}`;
+                        const resourceTitle = `${(resource.resourceType ?? "").toLowerCase()} ${resourceId}`;
                         subtasks.push({
                             title: `Checking ${resourceTitle}...`,
                             task: async () => {
                                 try {
-                                    const { branchName } = await this.validateGitSetup(resource === null || resource === void 0 ? void 0 : resource.resourceType, resourceId, util_1.ComponentEvent.PUSH, ctx.localBranchName);
+                                    const { branchName } = await this.validateGitSetup(resource?.resourceType, resourceId, ComponentEvent.PUSH, ctx.localBranchName);
                                     ctx.branchToPushTo.set(resourceId, branchName);
                                 }
                                 catch (error) {
-                                    if ((0, version_control_1.isCI)() && error instanceof sdk_1.ValidateGitSetupError) {
+                                    if (isCI() && error instanceof ValidateGitSetupError) {
                                         this.log(`WARN: Failed to validate git setup for ${resourceTitle}. Skipping push.\n\n${error.message}.`);
                                         ctx.resourceIdsToSkip.add(resourceId);
                                     }
@@ -210,17 +228,16 @@ Would you like to also delete these resources from your filesystem?`,
             },
             {
                 task: async (ctx, task) => {
-                    var _a, _b;
                     task.title = `Validating project structure...`;
                     const subtasks = [];
-                    const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
+                    const superblocksRootPath = path.resolve(path.dirname(ctx.superblocksRootConfigPath), "..");
                     for (const resourceId of ctx.resourceIdsToPush) {
-                        const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
-                        const resourceTitle = `${((_b = resource.resourceType) !== null && _b !== void 0 ? _b : "").toLowerCase()} at ${resource.location}`;
+                        const resource = ctx.existingSuperblocksRootConfig?.resources[resourceId];
+                        const resourceTitle = `${(resource.resourceType ?? "").toLowerCase()} at ${resource.location}`;
                         subtasks.push({
                             title: `Validating ${resourceTitle}...`,
                             task: async () => {
-                                const validationError = await (0, version_control_1.validateLocalResource)(superblocksRootPath, resource);
+                                const validationError = await validateLocalResource(superblocksRootPath, resource);
                                 if (validationError) {
                                     this.error(`Push failed for resource '${resource.location}' (id: ${resourceId}). ${validationError}`);
                                 }
@@ -234,25 +251,23 @@ Would you like to also delete these resources from your filesystem?`,
             },
             {
                 task: async (ctx, task) => {
-                    var _a;
                     task.title = `Pushing resources to branch ${ctx.localBranchName}...`;
                     const subtasks = [];
-                    const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
+                    const superblocksRootPath = path.resolve(path.dirname(ctx.superblocksRootConfigPath), "..");
                     for (const resourceId of ctx.resourceIdsToPush) {
-                        const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
-                        switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
+                        const resource = ctx.existingSuperblocksRootConfig?.resources[resourceId];
+                        switch (resource?.resourceType) {
                             case "APPLICATION": {
                                 subtasks.push({
                                     title: `Pushing application ${resource.location}...`,
                                     task: async (_ctx, task) => {
-                                        var _a;
-                                        const fileStructureType = await (0, version_control_1.getFileStructureType)(superblocksRootPath, resource.location);
-                                        if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE) {
+                                        const fileStructureType = await getFileStructureType(superblocksRootPath, resource.location);
+                                        if (fileStructureType === FileStructureType.SINGLE_PAGE) {
                                             this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account. To resolve this issue, you can make a commit to this branch from Superblocks to convert the file structure to multi-page format (See docs: https://docs.superblocks.com/applications/multi-page/converting-single-page-to-multi-page#handling-outstanding-branches-created-before-multi-page). Alternatively, you can run \`superblocks migrate\` to convert your file structure and commit the changes before pushing.`);
                                         }
-                                        const localGitRepoState = await (0, version_control_1.getLocalGitRepoState)(ctx.localBranchName);
+                                        const localGitRepoState = await getLocalGitRepoState(ctx.localBranchName);
                                         const applicationConfig = {
-                                            ...(await (0, version_control_1.readMultiPageApplicationFromDisk)(superblocksRootPath, resource.location)),
+                                            ...(await readMultiPageApplicationFromDisk(superblocksRootPath, resource.location)),
                                             commitId: ctx.headCommitId,
                                             commitMessage: ctx.headCommitMessage,
                                             gitState: localGitRepoState,
@@ -260,7 +275,8 @@ Would you like to also delete these resources from your filesystem?`,
                                         };
                                         task.title += `: read from disk`;
                                         try {
-                                            const branch = (_a = ctx.branchToPushTo.get(resourceId)) !== null && _a !== void 0 ? _a : ctx.localBranchName;
+                                            const branch = ctx.branchToPushTo.get(resourceId) ??
+                                                ctx.localBranchName;
                                             if (skipCommit) {
                                                 task.title += `: going to push update live edits on branch ${branch}`;
                                             }
@@ -274,10 +290,10 @@ Would you like to also delete these resources from your filesystem?`,
                                             });
                                         }
                                         catch (error) {
-                                            if (error instanceof sdk_1.BranchNotCheckedOutError) {
+                                            if (error instanceof BranchNotCheckedOutError) {
                                                 this.log(`WARN: Application ${applicationConfig.application.name} failed to push, please check branch out in the Superblocks UI first in order to check this branch out for this resource.`);
                                             }
-                                            else if (error instanceof sdk_1.CommitAlreadyExistsError) {
+                                            else if (error instanceof CommitAlreadyExistsError) {
                                                 this.log(`WARN: Application ${applicationConfig.application.name} failed to push as the commit already exists in Superblocks.`);
                                             }
                                             else {
@@ -294,10 +310,9 @@ Would you like to also delete these resources from your filesystem?`,
                                 subtasks.push({
                                     title: `Pushing workflow/scheduled job ${resource.location}...`,
                                     task: async (_ctx, task) => {
-                                        var _a;
-                                        const localGitRepoState = await (0, version_control_1.getLocalGitRepoState)(ctx.localBranchName);
+                                        const localGitRepoState = await getLocalGitRepoState(ctx.localBranchName);
                                         const apiConfig = {
-                                            ...(await (0, version_control_1.readApiFromDisk)(superblocksRootPath, resource.location)),
+                                            ...(await readApiFromDisk(superblocksRootPath, resource.location)),
                                             commitId: ctx.headCommitId,
                                             commitMessage: ctx.headCommitMessage,
                                             gitState: localGitRepoState,
@@ -305,7 +320,8 @@ Would you like to also delete these resources from your filesystem?`,
                                         };
                                         task.title += `: read from disk`;
                                         try {
-                                            const branch = (_a = ctx.branchToPushTo.get(resourceId)) !== null && _a !== void 0 ? _a : ctx.localBranchName;
+                                            const branch = ctx.branchToPushTo.get(resourceId) ??
+                                                ctx.localBranchName;
                                             if (skipCommit) {
                                                 task.title += `: going to push update live edits on branch ${branch}`;
                                             }
@@ -319,11 +335,11 @@ Would you like to also delete these resources from your filesystem?`,
                                             });
                                         }
                                         catch (error) {
-                                            if (error instanceof sdk_1.BranchNotCheckedOutError) {
-                                                this.log(`WARN: Workflow/Scheduled Job ${(0, version_control_1.extractApiName)(apiConfig)} failed to push, please check branch out in the Superblocks UI first in order to check this branch out for this resource.`);
+                                            if (error instanceof BranchNotCheckedOutError) {
+                                                this.log(`WARN: Workflow/Scheduled Job ${extractApiName(apiConfig)} failed to push, please check branch out in the Superblocks UI first in order to check this branch out for this resource.`);
                                             }
-                                            else if (error instanceof sdk_1.CommitAlreadyExistsError) {
-                                                this.log(`WARN: Workflow/Scheduled Job ${(0, version_control_1.extractApiName)(apiConfig)} failed to push as the commit already exists in Superblocks.`);
+                                            else if (error instanceof CommitAlreadyExistsError) {
+                                                this.log(`WARN: Workflow/Scheduled Job ${extractApiName(apiConfig)} failed to push as the commit already exists in Superblocks.`);
                                             }
                                             else {
                                                 throw error;
@@ -352,23 +368,22 @@ Would you like to also delete these resources from your filesystem?`,
         return tasks;
     }
     async getResourceIdsToPush(ctx, task, resourcePath, supportedResourceTypes = ["APPLICATION", "BACKEND"]) {
-        var _a, _b, _c;
-        const resources = Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {}).filter(([, resource]) => {
+        const resources = Object.entries(ctx.existingSuperblocksRootConfig?.resources ?? {}).filter(([, resource]) => {
             return supportedResourceTypes.includes(resource.resourceType);
         });
         // If there are no resources, or if the user has specified a resource name
         // that doesn't exist, we should throw an error.
-        if ((0, lodash_1.isEmpty)(resources)) {
+        if (isEmpty(resources)) {
             throw new Error("No resources found in the current project");
         }
-        else if (!(0, lodash_1.isEmpty)(resourcePath)) {
+        else if (!isEmpty(resourcePath)) {
             const resource = resources.find(([, resource]) => resource.location === resourcePath);
             if (resource) {
                 return [resource[0]];
             }
             throw new Error(`No resource found with the given location: ${resourcePath}`);
         }
-        const resourceConfig = await (0, util_1.getSuperblocksResourceConfigIfExists)();
+        const resourceConfig = await getSuperblocksResourceConfigIfExists();
         if (resourceConfig) {
             return [resourceConfig.id];
         }
@@ -380,7 +395,7 @@ Would you like to also delete these resources from your filesystem?`,
                 name: resourceId,
                 message: resource.location,
             });
-            if (((_c = ctx.existingSuperblocksResourceConfig) === null || _c === void 0 ? void 0 : _c.id) === resourceId) {
+            if (ctx.existingSuperblocksResourceConfig?.id === resourceId) {
                 initialSelections.push(counter);
             }
             counter++;
@@ -391,11 +406,11 @@ Would you like to also delete these resources from your filesystem?`,
                 {
                     type: "AutoComplete",
                     name: "resourceIdsToPush",
-                    message: `Select resources to push (${version_control_1.MULTI_SELECT_PROMPT_HELP})`,
+                    message: `Select resources to push (${MULTI_SELECT_PROMPT_HELP})`,
                     choices: choices,
                     initial: initialSelections,
                     multiple: true,
-                    validate: version_control_1.atLeastOneSelection,
+                    validate: atLeastOneSelection,
                     prefix: "▸",
                     indicator: "◉",
                 },
@@ -403,27 +418,3 @@ Would you like to also delete these resources from your filesystem?`,
         return resourceIdsToPush;
     }
 }
-Push.description = "Import objects from local filesystem to Superblocks";
-Push.examples = [
-    "<%= config.bin %> <%= command.id %>",
-    "<%= config.bin %> <%= command.id %>  apps/my-app",
-    "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
-    "<%= config.bin %> <%= command.id %>  apps/my-app --skip-commit",
-];
-Push.flags = {
-    branch: core_1.Flags.string({
-        char: "b",
-        description: "Superblocks branch to push to, the current git branch will be used by default",
-    }),
-    "skip-commit": core_1.Flags.boolean({
-        char: "s",
-        default: false,
-        description: "If true, push command will only update live edit state along with signature without creating a commit.",
-    }),
-};
-Push.args = {
-    resource_path: core_1.Args.string({
-        description: "Superblocks resource location to push (e.g. apps/my-app)",
-    }),
-};
-exports.default = Push;

package/dist/commands/{rm.d.ts → rm.d.mts}

@@ -1,9 +1,9 @@
-import { AuthenticatedCommand } from "../common/authenticated-command";
+import { AuthenticatedCommand } from "../common/authenticated-command.mjs";
 export default class Remove extends AuthenticatedCommand {
     static description: string;
     static examples: string[];
     static args: {
-        resource_path: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        resource_path: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
     private createTasks;

package/dist/commands/{rm.js → rm.mjs}

@@ -1,15 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const core_1 = require("@oclif/core");
-const util_1 = require("@superblocksteam/util");
-const fs = tslib_1.__importStar(require("fs-extra"));
-const listr2_1 = require("listr2");
-const lodash_1 = require("lodash");
-const authenticated_command_1 = require("../common/authenticated-command");
-const version_control_1 = require("../common/version-control");
-class Remove extends authenticated_command_1.AuthenticatedCommand {
+import path from "path";
+import { Args } from "@oclif/core";
+import { getSuperblocksMonorepoConfigJson, } from "@superblocksteam/util";
+import fs from "fs-extra";
+import { Listr } from "listr2";
+import { isEmpty } from "lodash-es";
+import { AuthenticatedCommand } from "../common/authenticated-command.mjs";
+import { atLeastOneSelection, extractApiName, MULTI_SELECT_PROMPT_HELP, removeResourceFromDisk, sortByKey, } from "../common/version-control.mjs";
+export default class Remove extends AuthenticatedCommand {
+    static description = "Remove a Superblocks resource from the local Superblocks project and delete the resource folder directory locally (if it exists)";
+    static examples = [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> apps/my-spectacular-app",
+    ];
+    static args = {
+        resource_path: Args.string({
+            description: "Superblocks resource location (i.e. apps/my-spectacular-app)",
+        }),
+    };
     async run() {
         const { args } = await this.parse(Remove);
         const tasks = this.createTasks(args);
@@ -21,7 +28,7 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
         }
     }
     createTasks(args) {
-        const tasks = new listr2_1.Listr([
+        const tasks = new Listr([
             {
                 title: "Checking for existing Superblocks project...",
                 task: async (ctx) => {
@@ -31,8 +38,8 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
                         [
                             ctx.existingSuperblocksRootConfig,
                             ctx.superblocksRootConfigPath,
-                        ] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
-                        ctx.superblocksRootPath = path_1.default.resolve(path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
+                        ] = await getSuperblocksMonorepoConfigJson(true);
+                        ctx.superblocksRootPath = path.resolve(path.dirname(ctx.superblocksRootConfigPath), "..");
                     }
                     catch {
                         // no existing superblocks config
@@ -67,7 +74,7 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
                             for (const api of apis) {
                                 ctx.fetchedResources[api.id] = {
                                     resourceType: "BACKEND",
-                                    name: (0, version_control_1.extractApiName)(api),
+                                    name: extractApiName(api),
                                 };
                             }
                             task.title += `: completed`;
@@ -85,17 +92,17 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
             {
                 title: "Removing resources...",
                 task: async (ctx, task) => {
-                    var _a;
                     const subtasks = [];
                     for (const resourceId of ctx.resourceIdsToRemove) {
-                        const resourceLocation = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId].location;
+                        const resourceLocation = ctx.existingSuperblocksRootConfig?.resources[resourceId]
+                            .location;
                         if (!resourceLocation) {
                             this.error(`Resource location not found for resource with id ${resourceId}`);
                         }
                         subtasks.push({
                             title: `Removing ${resourceId} from ${resourceLocation}...`,
                             task: async (_ctx, task) => {
-                                await (0, version_control_1.removeResourceFromDisk)(ctx.superblocksRootPath, resourceLocation);
+                                await removeResourceFromDisk(ctx.superblocksRootPath, resourceLocation);
                                 ctx.removedResourceIds.push(resourceId);
                                 task.title += `: done`;
                             },
@@ -109,12 +116,12 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
             {
                 title: "Updating Superblocks project file...",
                 task: async (ctx) => {
-                    const [superblocksRootConfig, rootConfigPath] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
+                    const [superblocksRootConfig, rootConfigPath] = await getSuperblocksMonorepoConfigJson(true);
                     for (const removedResourceId of ctx.removedResourceIds) {
                         delete superblocksRootConfig.resources[removedResourceId];
                     }
                     // update superblocks.json file
-                    await fs.writeFile(rootConfigPath, JSON.stringify((0, version_control_1.sortByKey)(superblocksRootConfig), null, 2));
+                    await fs.writeFile(rootConfigPath, JSON.stringify(sortByKey(superblocksRootConfig), null, 2));
                 },
             },
         ], {
@@ -123,7 +130,6 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
         return tasks;
     }
     async getResourcesToRemove(ctx, task, args) {
-        var _a;
         if (args.resource_path) {
             const [resourceId] = getResourceIdFromLocation(ctx, args.resource_path);
             return [resourceId];
@@ -131,30 +137,30 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
         else {
             const choices = [];
             for (const [resourceId, resource] of Object.entries(ctx.fetchedResources)) {
-                if ((_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId]) {
+                if (ctx.existingSuperblocksRootConfig?.resources[resourceId]) {
                     choices.push({
                         name: resourceId,
                         message: `${resource.name} (${resource.resourceType})`,
                     });
                 }
             }
-            if ((0, lodash_1.isEmpty)(choices)) {
+            if (isEmpty(choices)) {
                 this.error(`No resources found in your project. Please make sure you have at least one application, workflow or scheduled job in your project.`);
             }
             const resourceIdsToRemove = await task.prompt([
                 {
                     type: "AutoComplete",
                     name: "resourceIdsToRemove",
-                    message: `Select resources to remove (${version_control_1.MULTI_SELECT_PROMPT_HELP})`,
+                    message: `Select resources to remove (${MULTI_SELECT_PROMPT_HELP})`,
                     choices: choices,
                     multiple: true,
-                    validate: version_control_1.atLeastOneSelection,
+                    validate: atLeastOneSelection,
                     prefix: "▸",
                     indicator: "◉",
                 },
             ]);
             const duplicates = await this.findDuplicates(resourceIdsToRemove, ctx.fetchedResources);
-            if (!(0, lodash_1.isEmpty)(duplicates)) {
+            if (!isEmpty(duplicates)) {
                 this.error(`Duplicate resources selected: ${duplicates
                     .map((duplicate) => `${duplicate.name} (${duplicate.resourceType}) id: ${duplicate.id}`)
                     .join(", ")}. Please make sure to select unique resources or rename them so that they have unique names.`);
@@ -183,20 +189,8 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
         return selectedResources.filter((resource) => countResourceNamesByType[resource.resourceType][resource.name] > 1);
     }
 }
-Remove.description = "Remove a Superblocks resource from the local Superblocks project and delete the resource folder directory locally (if it exists)";
-Remove.examples = [
-    "<%= config.bin %> <%= command.id %>",
-    "<%= config.bin %> <%= command.id %> apps/my-spectacular-app",
-];
-Remove.args = {
-    resource_path: core_1.Args.string({
-        description: "Superblocks resource location (i.e. apps/my-spectacular-app)",
-    }),
-};
-exports.default = Remove;
 function getResourceIdFromLocation(ctx, resourceLocation) {
-    var _a, _b;
-    for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
+    for (const [resourceId, resource] of Object.entries(ctx.existingSuperblocksRootConfig?.resources ?? {})) {
         if (resource.location === resourceLocation) {
             return [resourceId, resource.resourceType];
         }