@superblocksteam/cli 1.3.0 → 1.4.1

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/1.3.0 linux-x64 node-v18.18.2
+@superblocksteam/cli/1.4.1 linux-x64 node-v18.18.2
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND

package/assets/custom-components/setup/package.json

@@ -7,7 +7,7 @@
     "lint:fix": "npx eslint . --fix"
   },
   "dependencies": {
-    "@superblocksteam/custom-components": "1.3.0",
+    "@superblocksteam/custom-components": "1.4.1",
     "react": "^18",
     "react-dom": "^18"
   },

package/dist/commands/init.js

@@ -39,7 +39,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 },
             },
             {
-                title: "Fetching applications...",
+                title: "Fetching applications, workflows and scheduled jobs...",
                 task: (ctx, task) => task.newListr([
                     {
                         title: "Fetching applications...",
@@ -58,6 +58,21 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                             task.title += `: completed`;
                         },
                     },
+                    {
+                        title: "Fetching workflows and scheduled jobs...",
+                        enabled: () => !args.resource_url,
+                        task: async (ctx, task) => {
+                            // jobs and workflows choices
+                            const apis = await this.getSdk().fetchApis();
+                            for (const api of apis) {
+                                ctx.fetchedResources[api.id] = {
+                                    resourceType: "BACKEND",
+                                    name: (0, version_control_1.extractApiName)(api),
+                                };
+                            }
+                            task.title += `: completed`;
+                        },
+                    },
                     {
                         title: "Fetching resource by resourceUrl...",
                         enabled: () => !(0, lodash_1.isEmpty)(args.resource_url),
@@ -84,7 +99,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                 const api = await this.getSdk().fetchApi(resourceId);
                                 ctx.fetchedResources[api.id] = {
                                     resourceType,
-                                    name: api.actions.name,
+                                    name: (0, version_control_1.extractApiName)(api),
                                 };
                             }
                             task.title += `: completed`;

package/dist/commands/push.js

@@ -198,6 +198,41 @@ Would you like to also delete these resources from your filesystem?`,
                                 });
                                 break;
                             }
+                            case "BACKEND": {
+                                subtasks.push({
+                                    title: `Pushing workflow/scheduled job ${resource.location}...`,
+                                    task: async (_ctx, task) => {
+                                        var _a;
+                                        const apiConfig = {
+                                            ...(await (0, version_control_1.readApiFromDisk)(superblocksRootPath, resource.location)),
+                                            commitId: ctx.headCommitId,
+                                            commitMessage: ctx.headCommitMessage,
+                                        };
+                                        task.title += `: read from disk`;
+                                        try {
+                                            await this.getSdk().pushApi({
+                                                apiId: resourceId,
+                                                apiConfig,
+                                                branch: (_a = ctx.branchToPushTo.get(resourceId)) !== null && _a !== void 0 ? _a : ctx.localBranchName,
+                                            });
+                                        }
+                                        catch (error) {
+                                            if ((error === null || error === void 0 ? void 0 : error.name) === "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.`);
+                                            }
+                                            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 {
+                                                throw error;
+                                            }
+                                        }
+                                        task.title += `: pushed to Superblocks`;
+                                        ctx.pushedResources[resourceId] = resource;
+                                    },
+                                });
+                                break;
+                            }
                             default: {
                                 this.error(`Unsupported resource type, resource: ${JSON.stringify(resource)}
                       `);
@@ -214,7 +249,7 @@ Would you like to also delete these resources from your filesystem?`,
         });
         return tasks;
     }
-    async getResourceIdsToPush(ctx, task, resourcePath, supportedResourceTypes = ["APPLICATION"]) {
+    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]) => {
             return supportedResourceTypes.includes(resource.resourceType);

package/dist/commands/rm.js

@@ -36,7 +36,7 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
                 },
             },
             {
-                title: "Fetching applications...",
+                title: "Fetching applications, workflows and scheduled jobs...",
                 task: (ctx, task) => task.newListr([
                     {
                         title: "Fetching applications...",
@@ -53,6 +53,21 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
                             task.title += `: completed`;
                         },
                     },
+                    {
+                        title: "Fetching workflows and scheduled jobs...",
+                        enabled: () => !args.resource_path,
+                        task: async (ctx, task) => {
+                            // jobs and workflows choices
+                            const apis = await this.getSdk().fetchApis();
+                            for (const api of apis) {
+                                ctx.fetchedResources[api.id] = {
+                                    resourceType: "BACKEND",
+                                    name: (0, version_control_1.extractApiName)(api),
+                                };
+                            }
+                            task.title += `: completed`;
+                        },
+                    },
                 ]),
             },
             {

package/dist/common/authenticated-command.js

@@ -31,15 +31,7 @@ class AuthenticatedCommand extends core_1.Command {
     }
     async validateGitSetup(resourceType, resourceId, event, overrideLocalBranch, injectedHeaders) {
         const localGitRepoState = await (0, version_control_1.getLocalGitRepoState)(overrideLocalBranch);
-        let branchName;
-        switch (resourceType) {
-            case "APPLICATION": {
-                ({ branchName } = await this.getSdk().validateGitSetup(resourceId, resourceType, event, localGitRepoState, injectedHeaders));
-                break;
-            }
-            default:
-                throw new Error(`Unsupported resource type: ${resourceType}`);
-        }
+        const { branchName } = await this.getSdk().validateGitSetup(resourceId, resourceType, event, localGitRepoState, injectedHeaders);
         return {
             branchName,
             localBranchName: localGitRepoState.status === "IN_A_BRANCH"

package/dist/common/version-control.d.ts

@@ -1,4 +1,4 @@
-import { ApplicationWrapper, ViewMode } from "@superblocksteam/sdk";
+import { ApiWrapper, ApplicationWrapper, ViewMode } from "@superblocksteam/sdk";
 import { LocalGitRepoState } from "@superblocksteam/util";
 import { VersionedResourceConfig } from "@superblocksteam/util";
 export declare const LATEST_EDITS_MODE = "latest-edits";
@@ -12,6 +12,7 @@ export declare const SELECT_PROMPT_HELP = "Use \u2191/\u2193 arrow keys, Enter t
 export declare const MULTI_SELECT_PROMPT_HELP = "Type to filter, Use \u2191/\u2193 arrow keys, Space to select, Enter to confirm";
 export declare const atLeastOneSelection: (value: string[]) => string | true;
 export declare function readApplicationFromDisk(rootPath: string, existingRelativeLocation: string): Promise<ApplicationWrapper>;
+export declare function readApiFromDisk(rootPath: string, existingRelativeLocation: string): Promise<ApiWrapper>;
 export declare function writeResourceToDisk(resourceType: string, resourceId: string, resource: any, rootPath: string, existingRelativeLocation?: string): Promise<VersionedResourceConfig>;
 export declare function removeResourceFromDisk(resourceLocation: string): Promise<void>;
 export declare function getMode(task: any, mode: ModeFlag): Promise<ViewMode>;
@@ -27,3 +28,4 @@ export declare function getCurrentGitBranchIfGit(): Promise<string | null>;
 export declare function getCurrentGitBranch(): Promise<string>;
 export declare function getHeadCommit(branch: string): Promise<[string, string]>;
 export declare function isGitRepoDirty(): Promise<boolean>;
+export declare function extractApiName(api: ApiWrapper): string;

package/dist/common/version-control.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGitRepoDirty = exports.getHeadCommit = exports.getCurrentGitBranch = exports.getCurrentGitBranchIfGit = exports.getLocalGitRepoState = exports.sortByKey = exports.getMode = exports.removeResourceFromDisk = exports.writeResourceToDisk = exports.readApplicationFromDisk = exports.atLeastOneSelection = exports.MULTI_SELECT_PROMPT_HELP = exports.SELECT_PROMPT_HELP = exports.modeFlagToViewMode = exports.modeFlagValuesMap = exports.DEFAULT_BRANCH = exports.DEPLOYED_MODE = exports.MOST_RECENT_COMMIT_MODE = exports.LATEST_EDITS_MODE = void 0;
+exports.extractApiName = exports.isGitRepoDirty = exports.getHeadCommit = exports.getCurrentGitBranch = exports.getCurrentGitBranchIfGit = exports.getLocalGitRepoState = exports.sortByKey = exports.getMode = exports.removeResourceFromDisk = exports.writeResourceToDisk = exports.readApiFromDisk = exports.readApplicationFromDisk = exports.atLeastOneSelection = exports.MULTI_SELECT_PROMPT_HELP = exports.SELECT_PROMPT_HELP = exports.modeFlagToViewMode = exports.modeFlagValuesMap = exports.DEFAULT_BRANCH = exports.DEPLOYED_MODE = exports.MOST_RECENT_COMMIT_MODE = exports.LATEST_EDITS_MODE = void 0;
 const tslib_1 = require("tslib");
 const https = tslib_1.__importStar(require("https"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
@@ -118,10 +118,16 @@ async function readApplicationFromDisk(rootPath, existingRelativeLocation) {
     };
 }
 exports.readApplicationFromDisk = readApplicationFromDisk;
+async function readApiFromDisk(rootPath, existingRelativeLocation) {
+    return {
+        apiPb: await readYamlFile(`${rootPath}/${existingRelativeLocation}/api.yaml`),
+    };
+}
+exports.readApiFromDisk = readApiFromDisk;
 // NOTE: If a change is made to how applications are written to disk, please update
 // logic to read applications from disk in the "readApplicationFromDisk" function accordingly.
 async function writeResourceToDisk(resourceType, resourceId, resource, rootPath, existingRelativeLocation) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c;
     switch (resourceType) {
         case "APPLICATION": {
             const parentDirName = "apps";
@@ -153,7 +159,7 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
             };
             if (resource.apis) {
                 for (const api of resource.apis) {
-                    const originalApiName = api.apiPb.metadata.name;
+                    const originalApiName = extractApiName(api);
                     const apiName = slugifyName(originalApiName);
                     const apiContent = (0, yaml_1.stringify)(api.apiPb, {
                         sortMapEntries: true,
@@ -196,7 +202,7 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
         }
         case "BACKEND": {
             const parentDirName = "backends";
-            const apiName = slugifyName((_f = (_e = (_d = resource.apiPb) === null || _d === void 0 ? void 0 : _d.metadata) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : resource.actions.name);
+            const apiName = slugifyName(extractApiName(resource));
             const newRelativeLocation = `${parentDirName}/${apiName}`;
             const relativeLocation = existingRelativeLocation !== null && existingRelativeLocation !== void 0 ? existingRelativeLocation : newRelativeLocation;
             const backendDirName = node_path_1.default.resolve(rootPath, relativeLocation);
@@ -269,7 +275,8 @@ async function getLocalGitRepoState(overrideLocalBranch) {
     const git = (0, simple_git_1.simpleGit)();
     let status;
     try {
-        status = await git.status();
+        // do not return untracked files which can be slow, we only care about the branch info
+        status = await git.status(["--untracked-files=no"]);
     }
     catch {
         return { status: "NO_GIT" };
@@ -320,7 +327,8 @@ exports.getLocalGitRepoState = getLocalGitRepoState;
 async function getCurrentGitBranchIfGit() {
     const git = (0, simple_git_1.simpleGit)();
     try {
-        const status = await git.status();
+        // do not return untracked files which can be slow, we only care about the branch info
+        const status = await git.status(["--untracked-files=no"]);
         const currentBranch = status.current;
         return currentBranch;
     }
@@ -367,3 +375,8 @@ async function isGitRepoDirty() {
     return !status.isClean();
 }
 exports.isGitRepoDirty = isGitRepoDirty;
+function extractApiName(api) {
+    var _a, _b, _c, _d;
+    return (_d = (_c = (_b = (_a = api.apiPb) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : api === null || api === void 0 ? void 0 : api.name) !== null && _d !== void 0 ? _d : "Unknown";
+}
+exports.extractApiName = extractApiName;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0",
+  "version": "1.4.1",
   "commands": {
     "init": {
       "id": "init",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Official Superblocks CLI",
   "bin": {
     "superblocks": "bin/run"
@@ -18,11 +18,11 @@
     "@oclif/core": "^2.11.7",
     "@oclif/plugin-help": "^5.2.16",
     "@oclif/plugin-plugins": "^3.1.10",
-    "@superblocksteam/css-plugin": "1.3.0",
-    "@superblocksteam/react-shim": "1.3.0",
-    "@superblocksteam/sdk": "1.3.0",
-    "@superblocksteam/util": "1.3.0",
-    "@superblocksteam/vite-custom-component-reload-plugin": "1.3.0",
+    "@superblocksteam/css-plugin": "1.4.1",
+    "@superblocksteam/react-shim": "1.4.1",
+    "@superblocksteam/sdk": "1.4.1",
+    "@superblocksteam/util": "1.4.1",
+    "@superblocksteam/vite-custom-component-reload-plugin": "1.4.1",
     "@vitejs/plugin-react": "^4.1.0",
     "colorette": "^2.0.19",
     "enquirer": "^2.3.6",