@superblocksteam/cli 1.0.2 → 1.1.1

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/1.0.2 linux-x64 node-v18.18.0
+@superblocksteam/cli/1.1.1 linux-x64 node-v18.18.2
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND
@@ -27,11 +27,12 @@ USAGE
 * [`superblocks components watch`](#superblocks-components-watch)
 * [`superblocks config set PROPERTY VALUE`](#superblocks-config-set-property-value)
 * [`superblocks help [COMMANDS]`](#superblocks-help-commands)
-* [`superblocks init [RESOURCEURL]`](#superblocks-init-resourceurl)
+* [`superblocks init [RESOURCE_URL]`](#superblocks-init-resource_url)
 * [`superblocks login`](#superblocks-login)
 * [`superblocks migrate`](#superblocks-migrate)
-* [`superblocks pull [ONLY]`](#superblocks-pull-only)
-* [`superblocks rm [RESOURCELOCATION]`](#superblocks-rm-resourcelocation)
+* [`superblocks pull [RESOURCE_PATH]`](#superblocks-pull-resource_path)
+* [`superblocks push [RESOURCE_PATH]`](#superblocks-push-resource_path)
+* [`superblocks rm [RESOURCE_PATH]`](#superblocks-rm-resource_path)
 
 ## `superblocks components create`
 
@@ -69,13 +70,18 @@ Upload creates a production-ready bundle and saves the files for use outside of
 
 ```
 USAGE
-  $ superblocks components upload
+  $ superblocks components upload [-b <value>]
+
+FLAGS
+  -b, --branch=<value>  Superblocks branch to push to, the current (local) git branch will be used by default
 
 DESCRIPTION
   Upload creates a production-ready bundle and saves the files for use outside of Local Development mode.
 
 EXAMPLES
   $ superblocks components upload
+
+  $ superblocks components upload -b feature-branch
 ```
 
 ## `superblocks components watch`
@@ -132,16 +138,17 @@ DESCRIPTION
 
 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.16/src/commands/help.ts)_
 
-## `superblocks init [RESOURCEURL]`
+## `superblocks init [RESOURCE_URL]`
 
 Interactively configure the current directory as a Superblocks project or initialize new services in an already configured Superblocks project directory
 
 ```
 USAGE
-  $ superblocks init [RESOURCEURL] [-m latest-edits|most-recent-commit|deployed]
+  $ superblocks init [RESOURCE_URL] [-m latest-edits|most-recent-commit|deployed]
 
 ARGUMENTS
-  RESOURCEURL  Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id>/pages/<page_id>)
+  RESOURCE_URL  Superblocks resource URL (i.e.
+                https://app.superblocks.com/applications/<application_id>/pages/<page_id>)
 
 FLAGS
   -m, --mode=<option>  Pull mode
@@ -187,20 +194,21 @@ EXAMPLES
   $ superblocks migrate
 ```
 
-## `superblocks pull [ONLY]`
+## `superblocks pull [RESOURCE_PATH]`
 
 Download objects from Superblocks and save them locally
 
 ```
 USAGE
-  $ superblocks pull [ONLY] [-m latest-edits|most-recent-commit|deployed]
+  $ superblocks pull [RESOURCE_PATH] [-m latest-edits|most-recent-commit|deployed] [-b <value>]
 
 ARGUMENTS
-  ONLY  Superblocks resource location to pull (i.e. apps/my-app or backends/my-workflow)
+  RESOURCE_PATH  Superblocks resource location to pull (i.e. apps/my-app)
 
 FLAGS
-  -m, --mode=<option>  [default: latest-edits] Pull mode
-                       <options: latest-edits|most-recent-commit|deployed>
+  -b, --branch=<value>  Superblocks branch to pull from, the current git branch will be used by default
+  -m, --mode=<option>   [default: latest-edits] Pull mode
+                        <options: latest-edits|most-recent-commit|deployed>
 
 DESCRIPTION
   Download objects from Superblocks and save them locally
@@ -210,21 +218,44 @@ EXAMPLES
 
   $ superblocks pull  apps/my-app
 
-  $ superblocks pull  backends/my-workflow
+  $ superblocks pull  apps/my-app -b feature-branch
+```
+
+## `superblocks push [RESOURCE_PATH]`
+
+Import objects from local filesystem to Superblocks
+
+```
+USAGE
+  $ superblocks push [RESOURCE_PATH] [-b <value>]
+
+ARGUMENTS
+  RESOURCE_PATH  Superblocks resource location to push (e.g. apps/my-app)
+
+FLAGS
+  -b, --branch=<value>  Superblocks branch to push to, the current git branch will be used by default
+
+DESCRIPTION
+  Import objects from local filesystem to Superblocks
+
+EXAMPLES
+  $ superblocks push
+
+  $ superblocks push  apps/my-app
 
-  $ superblocks pull  backends/my-scheduled-job
+  $ superblocks push  apps/my-app -b feature-branch
 ```
 
-## `superblocks rm [RESOURCELOCATION]`
+## `superblocks rm [RESOURCE_PATH]`
 
 Remove a Superblocks resource from the local Superblocks project and delete the resource folder directory locally (if it exists)
 
 ```
 USAGE
-  $ superblocks rm [RESOURCELOCATION]
+  $ superblocks rm [RESOURCE_PATH]
 
 ARGUMENTS
-  RESOURCELOCATION  Superblocks resource location (i.e. apps/my-spectacular-app)
+  RESOURCE_PATH  Superblocks resource location (i.e. apps/my-spectacular-app)
 
 DESCRIPTION
   Remove a Superblocks resource from the local Superblocks project and delete the resource folder directory locally (if

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

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

package/dist/commands/components/upload.d.ts

@@ -2,5 +2,8 @@ import { AuthenticatedApplicationCommand } from "../../common/authenticated-comm
 export default class Upload extends AuthenticatedApplicationCommand {
     static description: string;
     static examples: string[];
+    static flags: {
+        branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/components/upload.js

@@ -7,11 +7,14 @@ const css_plugin_1 = require("@superblocksteam/css-plugin");
 const react_shim_1 = require("@superblocksteam/react-shim");
 const util_1 = require("@superblocksteam/util");
 const plugin_react_1 = tslib_1.__importDefault(require("@vitejs/plugin-react"));
+const colorette_1 = require("colorette");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const vite_1 = require("vite");
 const authenticated_command_1 = require("../../common/authenticated-command");
+const version_control_1 = require("../../common/version-control");
 class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
     async run() {
+        const { flags } = await this.parse(Upload);
         core_1.ux.action.start("Scanning for Superblocks components...");
         const exists = await fs.pathExists(util_1.CUSTOM_COMPONENTS_PATH);
         if (!exists) {
@@ -20,6 +23,7 @@ class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
                 exit: 1,
             });
         }
+        const branch = flags.branch || (await (0, version_control_1.getCurrentGitBranchIfGit)());
         const headers = {
             [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.REGISTER,
         };
@@ -89,7 +93,7 @@ class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
             ];
             await walkThroughDirectory(".", fileRelativePaths, excluded);
             this.log(fileRelativePaths.join("\n"));
-            await this.getSdk().uploadComponents(this.applicationConfig.id, configs, fileRelativePaths);
+            await this.getSdk().uploadComponents(this.applicationConfig.id, configs, fileRelativePaths, branch);
             core_1.ux.action.stop();
         }
         catch (e) {
@@ -97,10 +101,20 @@ class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
             this.error(`Failed to upload components - ${e.message}`, { exit: 1 });
         }
         this.log("You can now disable local dev mode and test your production assets");
+        this.log((0, colorette_1.bold)((0, colorette_1.green)("Once you are done developing please remember to commit your changes in the Superblocks UI.")));
     }
 }
 Upload.description = "Upload creates a production-ready bundle and saves the files for use outside of Local Development mode.";
-Upload.examples = ["<%= config.bin %> components upload"];
+Upload.examples = [
+    "<%= config.bin %> components upload",
+    "<%= config.bin %> components upload -b feature-branch",
+];
+Upload.flags = {
+    branch: core_1.Flags.string({
+        char: "b",
+        description: "Superblocks branch to push to, the current (local) git branch will be used by default",
+    }),
+};
 exports.default = Upload;
 async function walkThroughDirectory(directory, mutableFiles, excluded) {
     const files = await fs.readdir(directory);

package/dist/commands/components/watch.js

@@ -9,17 +9,29 @@ const plugin_react_1 = tslib_1.__importDefault(require("@vitejs/plugin-react"));
 const colorette_1 = require("colorette");
 const vite_1 = require("vite");
 const authenticated_command_1 = require("../../common/authenticated-command");
+const version_control_1 = require("../../common/version-control");
 function healthEndpointMiddleware() {
     return {
         name: "health-endpoint-middleware",
         configureServer: (server) => {
-            server.middlewares.use("/health", (req, res) => {
+            server.middlewares.use("/health", async (req, res) => {
+                let branch;
+                try {
+                    branch = await (0, version_control_1.getCurrentGitBranchIfGit)();
+                }
+                catch (e) {
+                    branch = null;
+                }
+                const gitState = branch
+                    ? { active: true, branch }
+                    : { active: false };
                 res.setHeader("Cache-Control", "no-cache");
                 res.setHeader("Content-Type", "application/json");
                 res.setHeader("Access-Control-Allow-Origin", "*");
                 const response = {
                     status: "up",
                     uptime: Math.floor(process.uptime()),
+                    git: gitState,
                 };
                 res.write(JSON.stringify(response) + "\n");
                 res.end();
@@ -36,8 +48,13 @@ class Watch extends authenticated_command_1.AuthenticatedApplicationCommand {
         await this.registerComponents(headers);
         this.log((0, colorette_1.yellow)("Remember to refresh your application to see any newly registered components."));
         this.log();
+        const editModeUrl = new URL(await this.getEditModeUrl());
+        editModeUrl.searchParams.set("devMode", "true");
+        const branch = await (0, version_control_1.getCurrentGitBranchIfGit)();
+        if (branch) {
+            editModeUrl.searchParams.set("branch", branch);
+        }
         const port = 3002;
-        const editModeUrl = await this.getEditModeUrl();
         const viteLogger = (0, vite_1.createLogger)();
         viteLogger.info = (message) => {
             this.log(message);
@@ -67,7 +84,7 @@ class Watch extends authenticated_command_1.AuthenticatedApplicationCommand {
                 plugins: [
                     healthEndpointMiddleware(),
                     (0, plugin_react_1.default)(),
-                    (0, vite_custom_component_reload_plugin_1.appendHotReloadEventPlugin)(),
+                    (0, vite_custom_component_reload_plugin_1.appendHotReloadEventPlugin)(version_control_1.getCurrentGitBranchIfGit),
                     (0, react_shim_1.injectReactVersionsPlugin)(),
                 ],
             });
@@ -75,7 +92,7 @@ class Watch extends authenticated_command_1.AuthenticatedApplicationCommand {
             this.log((0, colorette_1.green)(`Local server started at port ${port}`));
             this.log((0, colorette_1.green)(`Visit your application at:`));
             this.log();
-            this.log((0, colorette_1.bold)((0, colorette_1.magenta)(`${editModeUrl}?devMode=true`)));
+            this.log((0, colorette_1.bold)((0, colorette_1.magenta)(editModeUrl.href)));
             this.log();
             this.log((0, colorette_1.yellow)(`Please ensure that Local Dev Mode is enabled in your Application so that the component is fetched from your local dev server. Learn more about Local Dev Mode here: ${(0, colorette_1.magenta)("https://docs.superblocks.com/applications/custom-components/development-lifecycle#local-development-mode")}`));
         })();

package/dist/commands/init.d.ts

@@ -6,7 +6,7 @@ export default class Initialize extends AuthenticatedCommand {
         mode: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static args: {
-        resourceUrl: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        resource_url: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
     private createTasks;

package/dist/commands/init.js

@@ -1,6 +1,7 @@
 "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"));
@@ -27,7 +28,10 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                     ctx.fetchedResources = {};
                     ctx.writtenResources = {};
                     try {
-                        ctx.existingSuperblocksConfig = (await (0, util_1.getSuperblocksMonorepoConfigJson)(true))[0];
+                        [
+                            ctx.existingSuperblocksRootConfig,
+                            ctx.superblocksRootConfigPath,
+                        ] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
                     }
                     catch {
                         // no existing superblocks config
@@ -39,7 +43,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 task: (ctx, task) => task.newListr([
                     {
                         title: "Fetching applications...",
-                        enabled: () => !args.resourceUrl,
+                        enabled: () => !args.resource_url,
                         task: async (ctx, task) => {
                             // applications choices
                             const applications = await this.getSdk().fetchApplications();
@@ -56,15 +60,16 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                     },
                     {
                         title: "Fetching resource by resourceUrl...",
-                        enabled: () => args.resourceUrl,
+                        enabled: () => !(0, lodash_1.isEmpty)(args.resource_url),
                         task: async (ctx, task) => {
-                            const [resourceId, resourceType] = getResourceIdFromUrl(args.resourceUrl);
+                            const [resourceId, resourceType] = getResourceIdFromUrl(args.resource_url);
                             if (resourceType === "APPLICATION") {
                                 const headers = {
                                     [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.INIT,
                                 };
                                 const application = await this.getSdk().fetchApplicationWithComponents({
                                     applicationId: resourceId,
+                                    branch: version_control_1.DEFAULT_BRANCH,
                                     headers,
                                 });
                                 if (!application) {
@@ -100,6 +105,11 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 title: "Writing resources to a disk...",
                 task: async (ctx, task) => {
                     const subtasks = [];
+                    // if ctx.superblocksRootConfigPath is defined, we are initializing a new resource in an existing Superblocks project
+                    // otherwise, we are initializing a new Superblocks project
+                    const superblocksRootPath = ctx.superblocksRootConfigPath
+                        ? path_1.default.resolve(path_1.default.dirname(ctx.superblocksRootConfigPath), "..")
+                        : undefined;
                     for (const resourceId of ctx.resourceIdsToInitialize) {
                         const resource = ctx.fetchedResources[resourceId];
                         if (!resource) {
@@ -115,12 +125,13 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                         };
                                         const application = await this.getSdk().fetchApplicationWithComponents({
                                             applicationId: resourceId,
+                                            branch: version_control_1.DEFAULT_BRANCH,
                                             viewMode: ctx.viewMode,
                                             headers,
                                         });
                                         task.title += `: fetched`;
                                         ctx.writtenResources[resourceId] =
-                                            await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, process.cwd());
+                                            await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, superblocksRootPath !== null && superblocksRootPath !== void 0 ? superblocksRootPath : process.cwd());
                                         task.title += `: done`;
                                     },
                                 });
@@ -152,7 +163,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
             {
                 title: "Updating Superblocks project file...",
                 task: async (ctx) => {
-                    var _a, _b;
+                    var _a, _b, _c;
                     const superblocksConfig = {
                         configType: "ROOT",
                         resources: {},
@@ -165,14 +176,14 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                         superblocksConfig.resources[resourceId] = resource;
                     }
                     // existing resources
-                    for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _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 : {})) {
                         superblocksConfig.resources[resourceId] = resource;
                     }
                     if (!(await fs.exists(util_1.SUPERBLOCKS_HOME_FOLDER_NAME))) {
                         await fs.mkdir(util_1.SUPERBLOCKS_HOME_FOLDER_NAME);
                     }
                     // create superblocks.json file
-                    await fs.writeFile(util_1.RESOURCE_CONFIG_PATH, JSON.stringify((0, version_control_1.sortByKey)(superblocksConfig), null, 2));
+                    await fs.writeFile((_c = ctx.superblocksRootConfigPath) !== null && _c !== void 0 ? _c : util_1.RESOURCE_CONFIG_PATH, JSON.stringify((0, version_control_1.sortByKey)(superblocksConfig), null, 2));
                 },
             },
         ], {
@@ -182,13 +193,13 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
     }
     async getResourcesToInitialize(ctx, task, args) {
         var _a, _b;
-        if (args.resourceUrl) {
+        if (args.resource_url) {
             try {
-                const [resourceId] = getResourceIdFromUrl(args.resourceUrl);
+                const [resourceId] = getResourceIdFromUrl(args.resource_url);
                 return [resourceId];
             }
             catch {
-                throw new Error(`Invalid resource URL: ${args.resourceUrl}`);
+                throw new Error(`Invalid resource URL: ${args.resource_url}`);
             }
         }
         else {
@@ -199,9 +210,9 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 choices.push({
                     name: resourceId,
                     message: `${resource.name} (${resource.resourceType})`,
-                    disabled: (_a = ctx.existingSuperblocksConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId],
+                    disabled: (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId],
                 });
-                if ((_b = ctx.existingSuperblocksConfig) === null || _b === void 0 ? void 0 : _b.resources[resourceId]) {
+                if ((_b = ctx.existingSuperblocksRootConfig) === null || _b === void 0 ? void 0 : _b.resources[resourceId]) {
                     initialSelections.push(counter);
                 }
                 counter++;
@@ -229,7 +240,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                     .join(", ")}. Please make sure to select unique resources or rename them so that they have unique names.`);
             }
             // filter out disabled resources
-            return resourceIdsToInitialize.filter((resourceId) => { var _a; return !((_a = ctx.existingSuperblocksConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId]); });
+            return resourceIdsToInitialize.filter((resourceId) => { var _a; return !((_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId]); });
         }
     }
     async findDuplicates(selectedResourcesIds, resources) {
@@ -266,7 +277,7 @@ Initialize.flags = {
     }),
 };
 Initialize.args = {
-    resourceUrl: core_1.Args.string({
+    resource_url: core_1.Args.string({
         description: "Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id>/pages/<page_id>)",
         required: false,
     }),

package/dist/commands/login.js

@@ -15,15 +15,13 @@ class Login extends core_1.Command {
         var _a;
         const { flags } = await this.parse(Login);
         let token = flags.token;
-        let superblocksBaseUrl = "";
+        const result = await (0, util_1.getLocalTokenWithUrlIfExists)();
+        const superblocksBaseUrl = (_a = result === null || result === void 0 ? void 0 : result.superblocksBaseUrl) !== null && _a !== void 0 ? _a : this.DEFAULT_BASE_URL;
         if (!token) {
-            const result = await (0, util_1.getLocalTokenWithUrlIfExists)();
             if (result && "token" in result) {
-                ({ token, superblocksBaseUrl } = result);
+                token = result.token;
             }
             else {
-                superblocksBaseUrl =
-                    (_a = result === null || result === void 0 ? void 0 : result.superblocksBaseUrl) !== null && _a !== void 0 ? _a : this.DEFAULT_BASE_URL;
                 const tokenPageUrl = new URL("personal-settings#apiKey", superblocksBaseUrl).href;
                 token = (await (0, enquirer_1.prompt)({
                     type: "password",

package/dist/commands/pull.d.ts

@@ -4,9 +4,10 @@ export default class Pull extends AuthenticatedCommand {
     static examples: string[];
     static flags: {
         mode: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static args: {
-        only: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        resource_path: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
     private createTasks;

package/dist/commands/pull.js

@@ -11,10 +11,10 @@ const version_control_1 = require("../common/version-control");
 class Pull extends authenticated_command_1.AuthenticatedCommand {
     async run() {
         const { flags, args } = await this.parse(Pull);
-        const tasks = this.createTasks(args.only, flags.mode);
+        const tasks = this.createTasks(args.resource_path, flags.mode, flags.branch);
         await tasks.run();
     }
-    createTasks(only, mode) {
+    createTasks(resourcePath, mode, branch) {
         const tasks = new listr2_1.Listr([
             {
                 title: "Checking for existing Superblocks project...",
@@ -35,6 +35,18 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                     }
                 },
             },
+            {
+                title: "Checking for existing git repository...",
+                task: async (ctx) => {
+                    try {
+                        ctx.pullFromBranchName =
+                            branch || (await (0, version_control_1.getCurrentGitBranchIfGit)()) || version_control_1.DEFAULT_BRANCH;
+                    }
+                    catch (e) {
+                        this.error(`Failed to check for existing git repository: ${e.message}. Please make sure to clone or initialize a git repository.`);
+                    }
+                },
+            },
             {
                 title: "Checking for deleted Superblocks resources...",
                 task: async (ctx, task) => {
@@ -46,6 +58,8 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                                     try {
                                         await this.getSdk().fetchApplication({
                                             applicationId: resourceId,
+                                            //NOTE(alex): using default branch since we assume that the resource is deleted if it's deleted from the default branch
+                                            branch: version_control_1.DEFAULT_BRANCH,
                                         });
                                     }
                                     catch (error) {
@@ -108,11 +122,11 @@ Would you like to also delete these resources from your filesystem?`,
                 },
             },
             {
-                title: "Pulling resources...",
                 task: async (ctx, task) => {
                     var _a;
+                    task.title = `Pulling resources from branch ${ctx.pullFromBranchName}...`;
                     const viewMode = await (0, version_control_1.getMode)(task, mode);
-                    const resourceIdsToPull = await this.getResourceIdsToPull(ctx, task, only);
+                    const resourceIdsToPull = await this.getResourceIdsToPull(ctx, task, resourcePath);
                     const subtasks = [];
                     const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     for (const resourceId of resourceIdsToPull) {
@@ -120,20 +134,33 @@ Would you like to also delete these resources from your filesystem?`,
                         switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
                             case "APPLICATION": {
                                 subtasks.push({
-                                    title: `Pulling application ${resource.location}...`,
+                                    title: `Pulling application ${resource.location} from branch ${ctx.pullFromBranchName}...`,
                                     task: async (_ctx, task) => {
                                         const headers = {
                                             [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.PULL,
                                         };
-                                        const application = await this.getSdk().fetchApplicationWithComponents({
-                                            applicationId: resourceId,
-                                            viewMode,
-                                            headers,
-                                        });
-                                        task.title += `: fetched`;
-                                        ctx.writtenResources[resourceId] =
-                                            await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, superblocksRootPath, resource.location);
-                                        task.title += `: done`;
+                                        try {
+                                            const application = await this.getSdk().fetchApplicationWithComponents({
+                                                applicationId: resourceId,
+                                                branch: ctx.pullFromBranchName,
+                                                viewMode,
+                                                headers,
+                                            });
+                                            task.title += `: fetched`;
+                                            ctx.writtenResources[resourceId] =
+                                                await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, superblocksRootPath, resource.location);
+                                            task.title += `: done`;
+                                        }
+                                        catch (e) {
+                                            if (e instanceof util_1.NotFoundError) {
+                                                //NOTE(alex): today, branches are not shared between applications, so we can't pull from a branch that doesn't exist in the current application
+                                                //once we have shared branches, we can remove this catch block
+                                                task.title += `: not found in this branch. skipped`;
+                                            }
+                                            else {
+                                                throw e;
+                                            }
+                                        }
                                     },
                                 });
                                 break;
@@ -178,19 +205,19 @@ Would you like to also delete these resources from your filesystem?`,
         });
         return tasks;
     }
-    async getResourceIdsToPull(ctx, task, only) {
+    async getResourceIdsToPull(ctx, task, resourcePath) {
         var _a, _b, _c, _d, _e, _f, _g;
-        if (only) {
+        if (resourcePath) {
             for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
-                if (resource.location === only) {
+                if (resource.location === resourcePath) {
                     return [resourceId];
                 }
             }
-            const resource = Object.entries((_d = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources) !== null && _d !== void 0 ? _d : {}).find(([, resource]) => resource.location === only);
+            const resource = Object.entries((_d = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources) !== null && _d !== void 0 ? _d : {}).find(([, resource]) => resource.location === resourcePath);
             if (resource) {
                 return [resource[0]];
             }
-            throw new Error(`No resource found with the given location: ${only}`);
+            throw new Error(`No resource found with the given location: ${resourcePath}`);
         }
         const choices = [];
         const initialSelections = [];
@@ -229,8 +256,7 @@ Pull.description = "Download objects from Superblocks and save them locally";
 Pull.examples = [
     "<%= config.bin %> <%= command.id %>",
     "<%= config.bin %> <%= command.id %>  apps/my-app",
-    "<%= config.bin %> <%= command.id %>  backends/my-workflow",
-    "<%= config.bin %> <%= command.id %>  backends/my-scheduled-job",
+    "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
 ];
 Pull.flags = {
     mode: core_1.Flags.string({
@@ -239,10 +265,14 @@ Pull.flags = {
         options: Object.keys(version_control_1.modeFlagValuesMap),
         default: version_control_1.LATEST_EDITS_MODE,
     }),
+    branch: core_1.Flags.string({
+        char: "b",
+        description: "Superblocks branch to pull from, the current git branch will be used by default",
+    }),
 };
 Pull.args = {
-    only: core_1.Args.string({
-        description: "Superblocks resource location to pull (i.e. apps/my-app or backends/my-workflow)",
+    resource_path: core_1.Args.string({
+        description: "Superblocks resource location to pull (i.e. apps/my-app)",
         required: false,
     }),
 };

package/dist/commands/push.d.ts

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