@superblocksteam/cli 1.5.1 → 1.6.0

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/1.5.1 linux-x64 node-v18.19.1
+@superblocksteam/cli/1.6.0 linux-x64 node-v18.20.2
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND
@@ -147,8 +147,8 @@ USAGE
   $ superblocks init [RESOURCE_URL] [-m latest-edits|most-recent-commit|deployed]
 
 ARGUMENTS
-  RESOURCE_URL  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> or
+                https://app.superblocks.com/applications/edit/<application_id>)
 
 FLAGS
   -m, --mode=<option>  Pull mode

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

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

package/dist/commands/init.js

@@ -138,15 +138,17 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                         const headers = {
                                             [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.INIT,
                                         };
-                                        const application = await this.getSdk().fetchApplicationWithComponents({
+                                        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, superblocksRootPath !== null && superblocksRootPath !== void 0 ? superblocksRootPath : process.cwd());
+                                        if (application) {
+                                            ctx.writtenResources[resourceId] =
+                                                await (0, version_control_1.writeMultiPageApplicationToDisk)(application, superblocksRootPath !== null && superblocksRootPath !== void 0 ? superblocksRootPath : process.cwd());
+                                        }
                                         task.title += `: done`;
                                     },
                                 });
@@ -293,7 +295,7 @@ Initialize.flags = {
 };
 Initialize.args = {
     resource_url: core_1.Args.string({
-        description: "Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id>/pages/<page_id>)",
+        description: "Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id> or https://app.superblocks.com/applications/edit/<application_id>)",
         required: false,
     }),
 };
@@ -301,7 +303,16 @@ exports.default = Initialize;
 function getResourceIdFromUrl(resourceUrl) {
     const url = new URL(resourceUrl);
     if (url.pathname.startsWith("/applications")) {
-        return [url.pathname.split("/")[2], "APPLICATION"];
+        const tokens = url.pathname.split("/");
+        if (tokens.length < 2) {
+            throw new Error(`Failed to parse resource URL: ${resourceUrl}`);
+        }
+        if (tokens[2] === "edit") {
+            return [tokens[3], "APPLICATION"];
+        }
+        else {
+            return [tokens[2], "APPLICATION"];
+        }
     }
     else if (url.pathname.startsWith("/workflows") ||
         url.pathname.startsWith("/scheduled_jobs")) {

package/dist/commands/migrate.d.ts

@@ -5,5 +5,7 @@ export default class Migrate extends AuthenticatedCommand {
     run(): Promise<void>;
     private createTasks;
     private getResourceIdsToMigrate;
+    private migrateSinglePageApplicationToMultiPage;
+    private migrateCustomComponentVersion;
     private migrateApplication;
 }

package/dist/commands/migrate.js

@@ -119,11 +119,39 @@ class Migrate extends authenticated_command_1.AuthenticatedCommand {
         }
         return resourceIdsToMigrate;
     }
-    async migrateApplication(applicationResource, superblocksRootPath) {
+    async migrateSinglePageApplicationToMultiPage(applicationResource, superblocksRootPath) {
+        const fileStructure = await (0, version_control_1.getFileStructureType)(superblocksRootPath, applicationResource.location);
+        if (fileStructure == version_control_1.FileStructureType.SINGLE_PAGE &&
+            (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"]) {
+            this.log(`Migrating single page application at ${applicationResource.location} to multi-page application...`);
+            const singlePageApplication = await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, applicationResource.location);
+            const multiPageApplication = {
+                application: {
+                    id: singlePageApplication.application.id,
+                    name: singlePageApplication.application.name,
+                    organizationId: singlePageApplication.application.organizationId,
+                    settings: singlePageApplication.application.settings,
+                    configuration: {},
+                },
+                apis: [],
+                pages: [
+                    {
+                        ...singlePageApplication.page,
+                        apis: singlePageApplication.apis,
+                    },
+                ],
+                componentFiles: [],
+            };
+            await (0, version_control_1.writeMultiPageApplicationToDisk)(multiPageApplication, superblocksRootPath, applicationResource.location, true);
+            this.log(`Successfully migrated single page application at ${applicationResource.location} to multi-page application.`);
+        }
+    }
+    async migrateCustomComponentVersion(applicationResource, superblocksRootPath) {
         var _a;
-        this.log("Checking CLI version compatibility...");
-        try {
-            const packageJson = await fs.readJson(node_path_1.default.join(superblocksRootPath, applicationResource.location, "package.json"));
+        const packageJsonPath = node_path_1.default.join(superblocksRootPath, applicationResource.location, "package.json");
+        if (await fs.pathExists(packageJsonPath)) {
+            this.log("Checking CLI version compatibility...");
+            const packageJson = await fs.readJson(packageJsonPath);
             const versionStr = (_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a["@superblocksteam/custom-components"];
             if (!semver_1.default.satisfies(this.config.version, versionStr)) {
                 this.log("Migrating application dependencies...");
@@ -135,6 +163,15 @@ class Migrate extends authenticated_command_1.AuthenticatedCommand {
                 this.log("CLI version matches package.json version");
             }
         }
+        else {
+            this.log(`No package.json found in ${applicationResource.location}. Skipping migration of dependencies.`);
+        }
+    }
+    async migrateApplication(applicationResource, superblocksRootPath) {
+        try {
+            await this.migrateCustomComponentVersion(applicationResource, superblocksRootPath);
+            await this.migrateSinglePageApplicationToMultiPage(applicationResource, superblocksRootPath);
+        }
         catch (e) {
             this.error(e.message, {
                 exit: 1,

package/dist/commands/pull.js

@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node: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 authenticated_command_1 = require("../common/authenticated-command");
 const version_control_1 = require("../common/version-control");
@@ -28,6 +27,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                         ] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
                         ctx.existingSuperblocksResourceConfig =
                             await (0, util_1.getSuperblocksResourceConfigIfExists)();
+                        ctx.superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     }
                     catch {
                         // no existing superblocks config
@@ -51,7 +51,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
             {
                 title: "Checking for deleted Superblocks resources...",
                 task: async (ctx, task) => {
-                    var _a, _b, _c;
+                    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) {
@@ -109,10 +109,7 @@ Would you like to also delete these resources from your filesystem?`,
                             },
                         ]);
                         if (removeResourcesFromDisk) {
-                            for (const resourceId of ctx.removedResourceIds) {
-                                const resource = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources[resourceId];
-                                await (0, version_control_1.removeResourceFromDisk)(resource.location);
-                            }
+                            await (0, version_control_1.deleteResourcesAndUpdateRootConfig)(ctx.removedResourceIds, ctx.existingSuperblocksRootConfig, ctx.superblocksRootPath, ctx.superblocksRootConfigPath);
                         }
                     }
                     catch (e) {
@@ -153,7 +150,6 @@ Would you like to also delete these resources from your filesystem?`,
                     task.title = `Pulling resources from branch ${ctx.localBranchName}...`;
                     const viewMode = await (0, version_control_1.getMode)(task, mode);
                     const subtasks = [];
-                    const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     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;
@@ -166,15 +162,39 @@ Would you like to also delete these resources from your filesystem?`,
                                             [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.PULL,
                                         };
                                         try {
-                                            const application = await this.getSdk().fetchApplicationWithComponents({
-                                                applicationId: resourceId,
-                                                branch: branchName,
-                                                viewMode,
-                                                headers,
-                                            });
                                             task.title += `: fetched`;
-                                            ctx.writtenResources[resourceId] =
-                                                await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, superblocksRootPath, resource.location);
+                                            const fileStructureType = await (0, version_control_1.getFileStructureType)(ctx.superblocksRootPath, resource.location);
+                                            if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE) {
+                                                const multiPageEnabled = (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"];
+                                                if (multiPageEnabled) {
+                                                    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.`);
+                                                }
+                                                const application = await this.getSdk().fetchApplicationWithComponents({
+                                                    applicationId: resourceId,
+                                                    branch: branchName,
+                                                    viewMode,
+                                                    headers,
+                                                    fetchSinglePageApplication: true,
+                                                });
+                                                if (!application) {
+                                                    return;
+                                                }
+                                                ctx.writtenResources[resourceId] =
+                                                    await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, ctx.superblocksRootPath, resource.location);
+                                            }
+                                            else {
+                                                const application = (await this.getSdk().fetchApplicationWithComponents({
+                                                    applicationId: resourceId,
+                                                    branch: branchName,
+                                                    viewMode,
+                                                    headers,
+                                                }));
+                                                if (!application) {
+                                                    return;
+                                                }
+                                                ctx.writtenResources[resourceId] =
+                                                    await (0, version_control_1.writeMultiPageApplicationToDisk)(application, ctx.superblocksRootPath, resource.location, false);
+                                            }
                                             task.title += `: done`;
                                         }
                                         catch (e) {
@@ -198,7 +218,7 @@ Would you like to also delete these resources from your filesystem?`,
                                         const backend = await this.getSdk().fetchApi(resourceId, viewMode, branchName);
                                         task.title += `: fetched`;
                                         ctx.writtenResources[resourceId] =
-                                            await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, superblocksRootPath, resource.location);
+                                            await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, ctx.superblocksRootPath, resource.location);
                                         task.title += `: done`;
                                     },
                                 });
@@ -215,17 +235,6 @@ Would you like to also delete these resources from your filesystem?`,
                     });
                 },
             },
-            {
-                title: "Updating Superblocks project file...",
-                task: async (ctx) => {
-                    const [superblocksRootConfig, rootConfigPath] = await (0, util_1.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));
-                },
-            },
         ], {
             concurrent: false,
         });

package/dist/commands/push.js

@@ -29,6 +29,7 @@ class Push extends authenticated_command_1.AuthenticatedCommand {
                         ] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
                         ctx.existingSuperblocksResourceConfig =
                             await (0, util_1.getSuperblocksResourceConfigIfExists)();
+                        ctx.superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     }
                     catch {
                         // no existing superblocks config
@@ -57,7 +58,7 @@ class Push extends authenticated_command_1.AuthenticatedCommand {
             {
                 title: "Checking for deleted Superblocks resources...",
                 task: async (ctx, task) => {
-                    var _a, _b, _c;
+                    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) {
@@ -115,10 +116,7 @@ Would you like to also delete these resources from your filesystem?`,
                             },
                         ]);
                         if (removeResourcesFromDisk) {
-                            for (const resourceId of ctx.removedResourceIds) {
-                                const resource = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources[resourceId];
-                                await (0, version_control_1.removeResourceFromDisk)(resource.location);
-                            }
+                            await (0, version_control_1.deleteResourcesAndUpdateRootConfig)(ctx.removedResourceIds, ctx.existingSuperblocksRootConfig, ctx.superblocksRootPath, ctx.superblocksRootConfigPath);
                         }
                     }
                     catch (e) {
@@ -168,17 +166,31 @@ Would you like to also delete these resources from your filesystem?`,
                                     title: `Pushing application ${resource.location}...`,
                                     task: async (_ctx, task) => {
                                         var _a;
-                                        const applicationConfig = {
-                                            ...(await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, resource.location)),
-                                            commitId: ctx.headCommitId,
-                                            commitMessage: ctx.headCommitMessage,
-                                        };
+                                        const fileStructureType = await (0, version_control_1.getFileStructureType)(superblocksRootPath, resource.location);
+                                        if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE &&
+                                            (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"]) {
+                                            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 pushing.`);
+                                        }
+                                        const applicationConfig = fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE
+                                            ? {
+                                                ...(await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, resource.location)),
+                                                commitId: ctx.headCommitId,
+                                                commitMessage: ctx.headCommitMessage,
+                                            }
+                                            : {
+                                                ...(await (0, version_control_1.readMultiPageApplicationFromDisk)(superblocksRootPath, resource.location)),
+                                                commitId: ctx.headCommitId,
+                                                commitMessage: ctx.headCommitMessage,
+                                            };
                                         task.title += `: read from disk`;
                                         try {
+                                            const branch = (_a = ctx.branchToPushTo.get(resourceId)) !== null && _a !== void 0 ? _a : ctx.localBranchName;
+                                            task.title += `: going to push commit ${applicationConfig.commitId} to branch ${branch}`;
                                             await this.getSdk().pushApplication({
                                                 applicationId: resourceId,
                                                 applicationConfig,
-                                                branch: (_a = ctx.branchToPushTo.get(resourceId)) !== null && _a !== void 0 ? _a : ctx.localBranchName,
+                                                branch,
+                                                multiPage: fileStructureType === version_control_1.FileStructureType.MULTI_PAGE,
                                             });
                                         }
                                         catch (error) {
@@ -210,10 +222,12 @@ 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;
+                                            task.title += `: going to push commit ${apiConfig.commitId} to branch ${branch}`;
                                             await this.getSdk().pushApi({
                                                 apiId: resourceId,
                                                 apiConfig,
-                                                branch: (_a = ctx.branchToPushTo.get(resourceId)) !== null && _a !== void 0 ? _a : ctx.localBranchName,
+                                                branch,
                                             });
                                         }
                                         catch (error) {

package/dist/commands/rm.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,11 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
                     ctx.fetchedResources = {};
                     ctx.removedResourceIds = [];
                     try {
-                        ctx.existingSuperblocksConfig = (await (0, util_1.getSuperblocksMonorepoConfigJson)(true))[0];
+                        [
+                            ctx.existingSuperblocksRootConfig,
+                            ctx.superblocksRootConfigPath,
+                        ] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
+                        ctx.superblocksRootPath = path_1.default.resolve(path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     }
                     catch {
                         // no existing superblocks config
@@ -83,14 +88,14 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
                     var _a;
                     const subtasks = [];
                     for (const resourceId of ctx.resourceIdsToRemove) {
-                        const resourceLocation = (_a = ctx.existingSuperblocksConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId].location;
+                        const resourceLocation = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.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)(resourceLocation);
+                                await (0, version_control_1.removeResourceFromDisk)(ctx.superblocksRootPath, resourceLocation);
                                 ctx.removedResourceIds.push(resourceId);
                                 task.title += `: done`;
                             },
@@ -126,7 +131,7 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
         else {
             const choices = [];
             for (const [resourceId, resource] of Object.entries(ctx.fetchedResources)) {
-                if ((_a = ctx.existingSuperblocksConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId]) {
+                if ((_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId]) {
                     choices.push({
                         name: resourceId,
                         message: `${resource.name} (${resource.resourceType})`,
@@ -191,7 +196,7 @@ Remove.args = {
 exports.default = Remove;
 function getResourceIdFromLocation(ctx, resourceLocation) {
     var _a, _b;
-    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 : {})) {
         if (resource.location === resourceLocation) {
             return [resourceId, resource.resourceType];
         }

package/dist/common/authenticated-command.js

@@ -121,7 +121,7 @@ class AuthenticatedApplicationCommand extends AuthenticatedCommand {
     async getEditModeUrl() {
         const result = await (0, util_1.getLocalTokenWithUrlIfExists)();
         const baseUrl = typeof result === "string" ? result : result === null || result === void 0 ? void 0 : result.superblocksBaseUrl;
-        return new URL(`/applications/${this.applicationConfig.id}/pages/${this.applicationConfig.defaultPageId}/edit`, baseUrl).toString();
+        return new URL(`/applications/edit/${this.applicationConfig.id}`, baseUrl).toString();
     }
     async init() {
         var _a, _b;

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

@@ -1,20 +1,29 @@
-import { ApiWrapper, ApplicationWrapper, ViewMode } from "@superblocksteam/sdk";
-import { LocalGitRepoState } from "@superblocksteam/util";
+import { ApiWrapper, ApplicationWrapper, MultiPageApplicationWrapper, ViewMode } from "@superblocksteam/sdk";
+import { LocalGitRepoState, SuperblocksMonorepoConfig } from "@superblocksteam/util";
 import { VersionedResourceConfig } from "@superblocksteam/util";
 export declare const LATEST_EDITS_MODE = "latest-edits";
 export declare const MOST_RECENT_COMMIT_MODE = "most-recent-commit";
 export declare const DEPLOYED_MODE = "deployed";
 export declare const DEFAULT_BRANCH = "main";
 export declare const modeFlagValuesMap: Record<string, string>;
+export declare enum FileStructureType {
+    SINGLE_PAGE = "single-page",
+    MULTI_PAGE = "multi-page"
+}
 export declare function modeFlagToViewMode(modeFlag: ModeFlag): ViewMode;
 export type ModeFlag = (keyof typeof modeFlagValuesMap)[number];
 export declare const SELECT_PROMPT_HELP = "Use \u2191/\u2193 arrow keys, Enter to confirm";
 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 getFileStructureType(rootPath: string, existingRelativeLocation: string): Promise<FileStructureType>;
 export declare function readApplicationFromDisk(rootPath: string, existingRelativeLocation: string): Promise<ApplicationWrapper>;
+export declare function readMultiPageApplicationFromDisk(rootPath: string, existingRelativeLocation: string): Promise<MultiPageApplicationWrapper>;
 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 writeMultiPageApplicationToDisk(resource: MultiPageApplicationWrapper & {
+    componentFiles: any;
+}, rootPath: string, existingRelativeLocation?: string, migrateFromSinglePage?: boolean): Promise<VersionedResourceConfig>;
+export declare function removeResourceFromDisk(rootPath: string, resourceRelativeLocation: string): Promise<void>;
 export declare function getMode(task: any, mode: ModeFlag): Promise<ViewMode>;
 export declare function sortByKey(obj: unknown): unknown;
 export declare function getLocalGitRepoState(overrideLocalBranch?: string): Promise<LocalGitRepoState>;
@@ -29,3 +38,4 @@ 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;
+export declare function deleteResourcesAndUpdateRootConfig(removedResourceIds: string[], existingSuperblocksRootConfig: SuperblocksMonorepoConfig, superblocksRootPath: string, superblocksRootConfigPath: string): Promise<void>;

package/dist/common/version-control.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.deleteResourcesAndUpdateRootConfig = exports.extractApiName = exports.isGitRepoDirty = exports.getHeadCommit = exports.getCurrentGitBranch = exports.getCurrentGitBranchIfGit = exports.getLocalGitRepoState = exports.sortByKey = exports.getMode = exports.removeResourceFromDisk = exports.writeMultiPageApplicationToDisk = exports.writeResourceToDisk = exports.readApiFromDisk = exports.readMultiPageApplicationFromDisk = exports.readApplicationFromDisk = exports.getFileStructureType = exports.atLeastOneSelection = exports.MULTI_SELECT_PROMPT_HELP = exports.SELECT_PROMPT_HELP = exports.modeFlagToViewMode = exports.FileStructureType = 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"));
@@ -23,6 +23,11 @@ exports.modeFlagValuesMap = {
     [exports.MOST_RECENT_COMMIT_MODE]: "Most recent commit",
     [exports.DEPLOYED_MODE]: "Deployed",
 };
+var FileStructureType;
+(function (FileStructureType) {
+    FileStructureType["SINGLE_PAGE"] = "single-page";
+    FileStructureType["MULTI_PAGE"] = "multi-page";
+})(FileStructureType || (exports.FileStructureType = FileStructureType = {}));
 function modeFlagToViewMode(modeFlag) {
     switch (modeFlag) {
         case exports.LATEST_EDITS_MODE:
@@ -93,8 +98,20 @@ async function downloadFile(rootDirectory, filepath, url) {
 async function readYamlFile(path) {
     return (0, yaml_1.parse)(await fs.readFile(path, "utf8"));
 }
+function getFileStructureTypeFromResourceConfig(superblocksConfig) {
+    if (superblocksConfig.pages) {
+        return FileStructureType.MULTI_PAGE;
+    }
+    return FileStructureType.SINGLE_PAGE;
+}
+async function getFileStructureType(rootPath, existingRelativeLocation) {
+    const superblocksConfig = await (0, util_1.getSuperblocksApplicationConfigJson)(`${rootPath}/${existingRelativeLocation}`);
+    return getFileStructureTypeFromResourceConfig(superblocksConfig);
+}
+exports.getFileStructureType = getFileStructureType;
 // NOTE: If a change is made to how applications are read from disk, please update
 // logic to write applications to disk in the "writeResourceToDisk" function accordingly.
+// @deprecated this can be removed once all customers move to multi page applications
 async function readApplicationFromDisk(rootPath, existingRelativeLocation) {
     const application = await readYamlFile(`${rootPath}/${existingRelativeLocation}/application.yaml`);
     const page = await readYamlFile(`${rootPath}/${existingRelativeLocation}/page.yaml`);
@@ -118,6 +135,59 @@ async function readApplicationFromDisk(rootPath, existingRelativeLocation) {
     };
 }
 exports.readApplicationFromDisk = readApplicationFromDisk;
+// NOTE: If a change is made to how applications are read from disk, please update
+// logic to write applications to disk in the "writeResourceToDisk" function accordingly.
+async function readMultiPageApplicationFromDisk(rootPath, existingRelativeLocation) {
+    var _a;
+    const superblocksApplicationConfig = await (0, util_1.getSuperblocksApplicationConfigJson)(`${rootPath}/${existingRelativeLocation}`);
+    const application = await readYamlFile(`${rootPath}/${existingRelativeLocation}/application.yaml`);
+    const pagesDirName = `${rootPath}/${existingRelativeLocation}/pages`;
+    const pages = [];
+    if (await fs.pathExists(pagesDirName)) {
+        for (const page of Object.values((_a = superblocksApplicationConfig.pages) !== null && _a !== void 0 ? _a : {})) {
+            const pageContent = await readYamlFile(`${pagesDirName}/${slugifyName(page.name)}/page.yaml`);
+            const pageApisDirName = `${pagesDirName}/${slugifyName(page.name)}/apis`;
+            const apis = [];
+            if (await fs.pathExists(pageApisDirName)) {
+                for (const apiName of Object.values(page.apis)) {
+                    const apiContent = await readYamlFile(`${pageApisDirName}/${slugifyName(apiName)}.yaml`);
+                    // This mimics the shape of the ApiV3Dto object
+                    apis.push({
+                        id: apiContent.metadata.id,
+                        pageId: page.id,
+                        apiPb: apiContent,
+                    });
+                }
+            }
+            pages.push({
+                id: pageContent.id,
+                name: pageContent.name,
+                applicationId: pageContent.applicationId,
+                isHidden: pageContent.isHidden,
+                layouts: pageContent.layouts,
+                apis,
+            });
+        }
+    }
+    const appApisDirName = `${rootPath}/${existingRelativeLocation}/apis`;
+    const apis = [];
+    if (await fs.pathExists(appApisDirName)) {
+        for (const apiName of Object.values(superblocksApplicationConfig.apis)) {
+            const apiContent = await readYamlFile(`${appApisDirName}/${slugifyName(apiName)}.yaml`);
+            // This mimics the shape of the ApiV3Dto object
+            apis.push({
+                id: apiContent.metadata.id,
+                apiPb: apiContent,
+            });
+        }
+    }
+    return {
+        application,
+        apis,
+        pages,
+    };
+}
+exports.readMultiPageApplicationFromDisk = readMultiPageApplicationFromDisk;
 async function readApiFromDisk(rootPath, existingRelativeLocation) {
     return {
         apiPb: await readYamlFile(`${rootPath}/${existingRelativeLocation}/api.yaml`),
@@ -179,7 +249,9 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
                 for (const existingApiId of Object.keys(existingApplicationConfig.apis)) {
                     const existingApiName = existingApplicationConfig.apis[existingApiId];
                     const existingApiPath = `${apisDirName}/${slugifyName(existingApiName)}.yaml`;
-                    if (!(existingApiId in newApplicationConfig.apis)) {
+                    const newApiName = newApplicationConfig.apis[existingApiId];
+                    if (!(existingApiId in newApplicationConfig.apis) ||
+                        slugifyName(newApiName) !== slugifyName(existingApiName)) {
                         await fs.remove(existingApiPath);
                     }
                 }
@@ -231,7 +303,144 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
     }
 }
 exports.writeResourceToDisk = writeResourceToDisk;
-async function removeResourceFromDisk(resourceLocation) {
+// NOTE: If a change is made to how applications are written to disk, please update
+// logic to read applications from disk in the "readMultiPageApplicationFromDisk" function accordingly.
+async function writeMultiPageApplicationToDisk(resource, rootPath, existingRelativeLocation, migrateFromSinglePage) {
+    var _a, _b, _c, _d;
+    const parentDirName = "apps";
+    const newRelativeLocation = `${parentDirName}/${slugifyName(resource.application.name)}`;
+    const relativeLocation = existingRelativeLocation !== null && existingRelativeLocation !== void 0 ? existingRelativeLocation : newRelativeLocation;
+    const appDirName = node_path_1.default.resolve(rootPath, relativeLocation);
+    if (!(await fs.pathExists(appDirName))) {
+        await fs.mkdir(appDirName, { recursive: true });
+    }
+    const applicationContent = (0, yaml_1.stringify)(resource.application, {
+        sortMapEntries: true,
+    });
+    await fs.outputFile(`${appDirName}/application.yaml`, applicationContent);
+    const newApplicationConfig = {
+        configType: "APPLICATION",
+        apis: {},
+        id: resource.application.id,
+    };
+    newApplicationConfig.pages = {};
+    const apiPromises = [];
+    for (const page of Object.values(resource.pages)) {
+        const pageId = page.id;
+        const pageDirName = `${appDirName}/pages/${slugifyName(page.name)}`;
+        if (!(await fs.pathExists(pageDirName))) {
+            await fs.mkdir(pageDirName, { recursive: true });
+        }
+        newApplicationConfig.pages[pageId] = {
+            id: page.id,
+            name: page.name,
+            apis: {},
+        };
+        const pageContent = (0, yaml_1.stringify)({
+            id: page.id,
+            name: page.name,
+            applicationId: page.applicationId,
+            isHidden: page.isHidden,
+            layouts: page.layouts,
+        }, {
+            sortMapEntries: true,
+            blockQuote: "literal",
+        });
+        await fs.outputFile(`${pageDirName}/page.yaml`, pageContent);
+        const pageApisDirName = `${pageDirName}/apis`;
+        for (const api of page.apis) {
+            const originalApiName = extractApiName(api);
+            apiPromises.push(writeApi(api, originalApiName, pageApisDirName));
+            newApplicationConfig.pages[pageId].apis[api.id] = originalApiName;
+        }
+    }
+    const apisDirName = `${appDirName}/apis`;
+    if (resource.apis && resource.apis.length) {
+        await fs.ensureDir(apisDirName);
+        for (const api of resource.apis) {
+            const originalApiName = extractApiName(api);
+            apiPromises.push(writeApi(api, originalApiName, apisDirName));
+            newApplicationConfig.apis[api.id] = originalApiName;
+        }
+        await Promise.all(apiPromises);
+    }
+    const existingApplicationConfig = await (0, util_1.getSuperblocksApplicationConfigIfExists)(appDirName);
+    // iterate through existing app-level apis and remove from disk any that are no longer present
+    for (const existingApiId of Object.keys((_a = existingApplicationConfig === null || existingApplicationConfig === void 0 ? void 0 : existingApplicationConfig.apis) !== null && _a !== void 0 ? _a : {})) {
+        const existingApiName = existingApplicationConfig === null || existingApplicationConfig === void 0 ? void 0 : existingApplicationConfig.apis[existingApiId];
+        const existingApiPath = `${apisDirName}/${slugifyName(existingApiName)}.yaml`;
+        const newApiName = newApplicationConfig.apis[existingApiId];
+        if (!(existingApiId in newApplicationConfig.apis) ||
+            slugifyName(newApiName) !== slugifyName(existingApiName)) {
+            await fs.remove(existingApiPath);
+        }
+    }
+    // iterate through existing pages and remove from disk any that are no longer present
+    for (const existingPage of Object.values((_b = existingApplicationConfig === null || existingApplicationConfig === void 0 ? void 0 : existingApplicationConfig.pages) !== null && _b !== void 0 ? _b : {})) {
+        const existingPageId = existingPage.id;
+        const existingPageDir = `${appDirName}/pages/${slugifyName(existingPage.name)}`;
+        if (existingPageId in newApplicationConfig.pages) {
+            // page still exists
+            const currentPage = newApplicationConfig.pages[existingPageId];
+            const newPageName = currentPage.name;
+            if (slugifyName(newPageName) !== slugifyName(existingPage.name)) {
+                // page was renamed
+                await fs.remove(existingPageDir);
+            }
+            // iterate through existing page-level apis and remove from disk any that are no longer present
+            for (const [existingApiId, existingApiName] of Object.entries(existingPage.apis)) {
+                const existingApiPath = `${existingPageDir}/apis/${slugifyName(existingApiName)}.yaml`;
+                if (existingApiId in currentPage.apis) {
+                    // api still exists
+                    const newApiName = newApplicationConfig.pages[existingPageId].apis[existingApiId];
+                    if (slugifyName(newApiName) !== slugifyName(existingApiName)) {
+                        // api was renamed
+                        await fs.remove(existingApiPath);
+                    }
+                }
+                else {
+                    // api was removed
+                    await fs.remove(existingApiPath);
+                }
+            }
+        }
+        else {
+            // page was removed
+            await fs.remove(existingPageDir);
+            // remove all page-level apis
+            for (const existingApiName of Object.values(existingPage.apis)) {
+                const existingApiPath = `${existingPageDir}/apis/${slugifyName(existingApiName)}.yaml`;
+                await fs.remove(existingApiPath);
+            }
+        }
+    }
+    await fs.ensureDir(`${appDirName}/${util_2.SUPERBLOCKS_HOME_FOLDER_NAME}`);
+    await fs.writeFile(`${appDirName}/${util_2.RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(newApplicationConfig), null, 2));
+    const createdFiles = await Promise.resolve(
+    // Defensive check for when application settings are missing componentFiles
+    (_d = (_c = resource.componentFiles) === null || _c === void 0 ? void 0 : _c.map((file) => downloadFile(appDirName, file.filename, file.url))) !== null && _d !== void 0 ? _d : []);
+    // print out failed downloads synchronously here
+    createdFiles
+        .filter((createdFiles) => createdFiles.length)
+        .forEach((createdFile) => {
+        console.log(`Unable to download ${createdFile}`);
+    });
+    // do a post-migration cleanup if necessary
+    if (migrateFromSinglePage) {
+        await fs.remove(`${appDirName}/page.yaml`);
+        // delete app-level apis if they are not present in the new application config
+        if (!resource.apis || !resource.apis.length) {
+            await fs.remove(`${appDirName}/apis`);
+        }
+    }
+    return {
+        location: relativeLocation,
+        resourceType: "APPLICATION",
+    };
+}
+exports.writeMultiPageApplicationToDisk = writeMultiPageApplicationToDisk;
+async function removeResourceFromDisk(rootPath, resourceRelativeLocation) {
+    const resourceLocation = node_path_1.default.resolve(rootPath, resourceRelativeLocation);
     await fs.remove(resourceLocation);
 }
 exports.removeResourceFromDisk = removeResourceFromDisk;
@@ -380,3 +589,26 @@ function extractApiName(api) {
     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;
+function writeApi(api, originalApiName, appDirName) {
+    const apiName = slugifyName(originalApiName);
+    const apiContent = (0, yaml_1.stringify)(api.apiPb, {
+        sortMapEntries: true,
+        blockQuote: "literal",
+    });
+    const handleApi = async () => {
+        await fs.outputFile(`${appDirName}/${apiName}.yaml`, apiContent);
+    };
+    return handleApi();
+}
+async function deleteResourcesAndUpdateRootConfig(removedResourceIds, existingSuperblocksRootConfig, superblocksRootPath, superblocksRootConfigPath) {
+    for (const resourceId of removedResourceIds) {
+        const resource = existingSuperblocksRootConfig === null || existingSuperblocksRootConfig === void 0 ? void 0 : existingSuperblocksRootConfig.resources[resourceId];
+        await removeResourceFromDisk(superblocksRootPath, resource.location);
+    }
+    for (const removedResourceId of removedResourceIds) {
+        delete existingSuperblocksRootConfig.resources[removedResourceId];
+    }
+    // update superblocks.json file with removed resources
+    await fs.writeFile(superblocksRootConfigPath, JSON.stringify(sortByKey(existingSuperblocksRootConfig), null, 2));
+}
+exports.deleteResourcesAndUpdateRootConfig = deleteResourcesAndUpdateRootConfig;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.1",
+  "version": "1.6.0",
   "commands": {
     "init": {
       "id": "init",
@@ -30,7 +30,7 @@
       "args": {
         "resource_url": {
           "name": "resource_url",
-          "description": "Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id>/pages/<page_id>)",
+          "description": "Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id> or https://app.superblocks.com/applications/edit/<application_id>)",
           "required": false
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "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.5.1",
-    "@superblocksteam/react-shim": "1.5.1",
-    "@superblocksteam/sdk": "1.5.1",
-    "@superblocksteam/util": "1.5.1",
-    "@superblocksteam/vite-custom-component-reload-plugin": "1.5.1",
+    "@superblocksteam/css-plugin": "1.6.0",
+    "@superblocksteam/react-shim": "1.6.0",
+    "@superblocksteam/sdk": "1.6.0",
+    "@superblocksteam/util": "1.6.0",
+    "@superblocksteam/vite-custom-component-reload-plugin": "1.6.0",
     "@vitejs/plugin-react": "^4.1.0",
     "colorette": "^2.0.19",
     "enquirer": "^2.3.6",