@superblocksteam/cli 1.9.3 → 1.12.0

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

@@ -1,34 +1,67 @@
-"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 authenticated_command_1 = require("../common/authenticated-command");
-const version_control_1 = require("../common/version-control");
-class Pull extends authenticated_command_1.AuthenticatedCommand {
+import path from "node:path";
+import { Args, Flags } from "@oclif/core";
+import { ValidateGitSetupError, } from "@superblocksteam/sdk";
+import { getSuperblocksMonorepoConfigJson, getSuperblocksResourceConfigIfExists, ComponentEvent, COMPONENT_EVENT_HEADER, NotFoundError, } from "@superblocksteam/util";
+import { Listr } from "listr2";
+import { AuthenticatedCommand } from "../common/authenticated-command.mjs";
+import { DEFAULT_BRANCH, FileStructureType, LATEST_EDITS_MODE, MULTI_SELECT_PROMPT_HELP, atLeastOneSelection, deleteResourcesAndUpdateRootConfig, getCurrentGitBranchIfGit, getFileStructureType, getMode, isCI, modeFlagValuesMap, writeMultiPageApplicationToDisk, writeResourceToDisk, } from "../common/version-control.mjs";
+export default class Pull extends AuthenticatedCommand {
+    static description = "Download objects from Superblocks and save them locally";
+    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 -c commit-id",
+    ];
+    static flags = {
+        mode: Flags.string({
+            char: "m",
+            description: "Pull mode",
+            options: Object.keys(modeFlagValuesMap),
+            default: LATEST_EDITS_MODE,
+        }),
+        branch: Flags.string({
+            char: "b",
+            description: "Superblocks branch to pull from, the current git branch will be used by default",
+        }),
+        "commit-id": Flags.string({
+            char: "c",
+            description: "Superblocks commit id to pull, the live edit will be used by default",
+        }),
+        "skip-signing-verification": Flags.boolean({
+            char: "s",
+            description: "If true, signature verification for signing enabled organizations will be skipped.",
+            default: false,
+        }),
+    };
+    static args = {
+        resource_path: Args.string({
+            description: "Superblocks resource location to pull (i.e. apps/my-app)",
+            required: false,
+        }),
+    };
     async run() {
         const { flags, args } = await this.parse(Pull);
         const tasks = this.createTasks(args.resource_path, flags.mode, flags.branch, flags["skip-signing-verification"], flags["commit-id"]);
         await tasks.run();
     }
     createTasks(resourcePath, mode, branch, skipSigningVerification = false, commitId) {
-        const tasks = new listr2_1.Listr([
+        const tasks = new Listr([
             {
                 title: "Checking for existing Superblocks project...",
                 task: async (ctx) => {
                     ctx.writtenResources = {};
                     ctx.removedResourceIds = [];
+                    ctx.featureFlags =
+                        await this.getSdk().getFeatureFlagsForCurrentUser();
                     try {
                         [
                             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,7 +75,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                     ctx.branchToPullFrom = new Map();
                     try {
                         ctx.localBranchName =
-                            branch || (await (0, version_control_1.getCurrentGitBranchIfGit)()) || version_control_1.DEFAULT_BRANCH;
+                            branch || (await getCurrentGitBranchIfGit()) || 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.`);
@@ -52,10 +85,9 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
             {
                 title: "Checking for deleted Superblocks resources...",
                 task: async (ctx, task) => {
-                    var _a, _b;
                     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({
@@ -65,7 +97,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                                         });
                                     }
                                     catch (error) {
-                                        if (error instanceof util_1.NotFoundError) {
+                                        if (error instanceof NotFoundError) {
                                             ctx.removedResourceIds.push(resourceId);
                                         }
                                         else {
@@ -83,7 +115,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                                         });
                                     }
                                     catch (error) {
-                                        if (error instanceof util_1.NotFoundError) {
+                                        if (error instanceof NotFoundError) {
                                             ctx.removedResourceIds.push(resourceId);
                                         }
                                         else {
@@ -116,7 +148,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) {
@@ -132,22 +164,21 @@ Would you like to also delete these resources from your filesystem?`,
             },
             {
                 task: async (ctx, task) => {
-                    var _a, _b;
                     task.title = `Validating git configuration...`;
                     const subtasks = [];
                     ctx.resourceIdsToSkip = new Set();
                     for (const resourceId of ctx.resourceIdsToPull) {
-                        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()} ${resourceId}`;
+                        const resource = ctx.existingSuperblocksRootConfig?.resources[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.PULL, ctx.localBranchName);
+                                    const { branchName } = await this.validateGitSetup(resource?.resourceType, resourceId, ComponentEvent.PULL, ctx.localBranchName);
                                     ctx.branchToPullFrom.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 pull.\n\n${error.message}.`);
                                         ctx.resourceIdsToSkip.add(resourceId);
                                     }
@@ -179,31 +210,30 @@ Would you like to also delete these resources from your filesystem?`,
             },
             {
                 task: async (ctx, task) => {
-                    var _a, _b;
                     task.title = `Pulling resources from branch ${ctx.localBranchName}...`;
                     let viewMode;
                     if (commitId) {
                         viewMode = "export-commit";
                     }
                     else {
-                        viewMode = await (0, version_control_1.getMode)(task, mode);
+                        viewMode = await getMode(task, mode);
                     }
                     const subtasks = [];
                     for (const resourceId of ctx.resourceIdsToPull) {
-                        const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
-                        const branchName = (_b = ctx.branchToPullFrom.get(resourceId)) !== null && _b !== void 0 ? _b : ctx.localBranchName;
-                        switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
+                        const resource = ctx.existingSuperblocksRootConfig?.resources[resourceId];
+                        const branchName = ctx.branchToPullFrom.get(resourceId) ?? ctx.localBranchName;
+                        switch (resource?.resourceType) {
                             case "APPLICATION": {
                                 subtasks.push({
                                     title: `Pulling application ${resource.location} from branch ${branchName}...`,
                                     task: async (_ctx, task) => {
                                         const headers = {
-                                            [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.PULL,
+                                            [COMPONENT_EVENT_HEADER]: ComponentEvent.PULL,
                                         };
                                         try {
                                             task.title += `: fetched`;
-                                            const fileStructureType = await (0, version_control_1.getFileStructureType)(ctx.superblocksRootPath, resource.location);
-                                            if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE) {
+                                            const fileStructureType = await getFileStructureType(ctx.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. Please run superblocks migrate to convert your application to multi-page format and commit the changes before pulling.`);
                                             }
                                             else {
@@ -219,12 +249,12 @@ Would you like to also delete these resources from your filesystem?`,
                                                     return;
                                                 }
                                                 ctx.writtenResources[resourceId] =
-                                                    await (0, version_control_1.writeMultiPageApplicationToDisk)(application, ctx.superblocksRootPath, resource.location, false);
+                                                    await writeMultiPageApplicationToDisk(application, ctx.superblocksRootPath, ctx.featureFlags, resource.location, false);
                                             }
                                             task.title += `: done`;
                                         }
                                         catch (e) {
-                                            if (e instanceof util_1.NotFoundError) {
+                                            if (e instanceof 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`;
@@ -250,7 +280,7 @@ Would you like to also delete these resources from your filesystem?`,
                                         });
                                         task.title += `: fetched`;
                                         ctx.writtenResources[resourceId] =
-                                            await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, ctx.superblocksRootPath, resource.location);
+                                            await writeResourceToDisk("BACKEND", resourceId, backend, ctx.superblocksRootPath, ctx.featureFlags, resource.location);
                                         task.title += `: done`;
                                     },
                                 });
@@ -273,23 +303,22 @@ Would you like to also delete these resources from your filesystem?`,
         return tasks;
     }
     async getResourceIdsToPull(ctx, task, resourcePath) {
-        var _a, _b, _c, _d, _e;
         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 : {})) {
+            for (const [resourceId, resource] of Object.entries(ctx.existingSuperblocksRootConfig?.resources ?? {})) {
                 if (resource.location === resourcePath) {
                     return [resourceId];
                 }
             }
             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];
         }
         const choices = [];
         const initialSelections = [];
         let counter = 0;
-        for (const [resourceId, resource] of Object.entries((_d = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources) !== null && _d !== void 0 ? _d : {})) {
+        for (const [resourceId, resource] of Object.entries(ctx.existingSuperblocksRootConfig?.resources ?? {})) {
             if (ctx.removedResourceIds.includes(resourceId)) {
                 continue;
             }
@@ -297,7 +326,7 @@ Would you like to also delete these resources from your filesystem?`,
                 name: resourceId,
                 message: resource.location,
             });
-            if (((_e = ctx.existingSuperblocksResourceConfig) === null || _e === void 0 ? void 0 : _e.id) === resourceId) {
+            if (ctx.existingSuperblocksResourceConfig?.id === resourceId) {
                 initialSelections.push(counter);
             }
             counter++;
@@ -308,10 +337,10 @@ Would you like to also delete these resources from your filesystem?`,
                 {
                     type: "MultiSelect",
                     name: "resourceIdsToPull",
-                    message: `Select resources to pull (${version_control_1.MULTI_SELECT_PROMPT_HELP})`,
+                    message: `Select resources to pull (${MULTI_SELECT_PROMPT_HELP})`,
                     choices: choices,
                     initial: initialSelections,
-                    validate: version_control_1.atLeastOneSelection,
+                    validate: atLeastOneSelection,
                     prefix: "▸",
                     indicator: "◉",
                 },
@@ -319,38 +348,3 @@ Would you like to also delete these resources from your filesystem?`,
         return resourceIdsToPull;
     }
 }
-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 %>  apps/my-app -b feature-branch",
-    "<%= config.bin %> <%= command.id %>  apps/my-app -c commit-id",
-];
-Pull.flags = {
-    mode: core_1.Flags.string({
-        char: "m",
-        description: "Pull mode",
-        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",
-    }),
-    "commit-id": core_1.Flags.string({
-        char: "c",
-        description: "Superblocks commit id to pull, the live edit will be used by default",
-    }),
-    "skip-signing-verification": core_1.Flags.boolean({
-        char: "s",
-        description: "If true, signature verification for signing enabled organizations will be skipped.",
-        default: false,
-    }),
-};
-Pull.args = {
-    resource_path: core_1.Args.string({
-        description: "Superblocks resource location to pull (i.e. apps/my-app)",
-        required: false,
-    }),
-};
-exports.default = Pull;

package/dist/commands/push.d.mts

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