@superblocksteam/cli 0.0.23 → 1.0.2

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/0.0.23 linux-x64 node-v18.17.1
+@superblocksteam/cli/1.0.2 linux-x64 node-v18.18.0
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND
@@ -31,6 +31,7 @@ USAGE
 * [`superblocks login`](#superblocks-login)
 * [`superblocks migrate`](#superblocks-migrate)
 * [`superblocks pull [ONLY]`](#superblocks-pull-only)
+* [`superblocks rm [RESOURCELOCATION]`](#superblocks-rm-resourcelocation)
 
 ## `superblocks components create`
 
@@ -213,4 +214,25 @@ EXAMPLES
 
   $ superblocks pull  backends/my-scheduled-job
 ```
+
+## `superblocks rm [RESOURCELOCATION]`
+
+Remove a Superblocks resource from the local Superblocks project and delete the resource folder directory locally (if it exists)
+
+```
+USAGE
+  $ superblocks rm [RESOURCELOCATION]
+
+ARGUMENTS
+  RESOURCELOCATION  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
+  it exists)
+
+EXAMPLES
+  $ superblocks rm
+
+  $ superblocks rm apps/my-spectacular-app
+```
 <!-- commandsstop -->

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

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

package/dist/commands/components/create.js

@@ -14,7 +14,6 @@ const fs = tslib_1.__importStar(require("fs-extra"));
 const lodash_1 = require("lodash");
 const authenticated_command_1 = require("../../common/authenticated-command");
 const create_component_defaults_1 = require("../../common/defaults/create-component-defaults");
-const identifiers_1 = require("../../util/identifiers");
 // eslint-disable-next-line unicorn/prefer-module
 const rootDirectory = node_path_1.default.resolve(__dirname, "../../../");
 const DEFAULT_PACKAGE_JSON_TEMPLATE_PATH = node_path_1.default.resolve(rootDirectory, "assets/custom-components/setup");
@@ -53,8 +52,8 @@ class CreateComponent extends authenticated_command_1.AuthenticatedApplicationCo
             type: "input",
             name: "name",
             message: "What is the machine readable name of the component you want to create?",
-            validate: (response) => (0, identifiers_1.isValidIdentifier)(response) || "Invalid identifier",
-            initial: (0, identifiers_1.suggestIdentifier)(displayName, true) || "ToDoList",
+            validate: (response) => (0, util_1.isValidIdentifier)(response) || "Invalid identifier",
+            initial: (0, util_1.suggestIdentifier)(displayName, true) || "ToDoList",
         })).name;
         this.log();
         this.log(`${(0, colorette_1.cyanBright)("ℹ")}  Properties represent the state of the component. You will define how each property is made available to the rest of your App and whether each property is displayed in the Properties Panel. Read more about properties here: ${(0, colorette_1.magenta)("https://docs.superblocks.com/applications/custom-components/#properties--events")}`);
@@ -73,10 +72,12 @@ class CreateComponent extends authenticated_command_1.AuthenticatedApplicationCo
                     name: "path",
                     message: "What is the path of the property? This will be used to access the property in your code (e.g. currentTasks)",
                     validate: (response) => {
-                        if (!(0, identifiers_1.isValidIdentifier)(response))
+                        if (!(0, util_1.isValidIdentifier)(response))
                             return "Invalid identifier";
+                        if ((0, util_1.isReservedPropertyName)(response))
+                            return "Reserved property path (see https://docs.superblocks.com/applications/custom-components/faq#what-is-a-reserved-property)";
                         if (properties.some((v) => v.path === response))
-                            return "Duplicate property name";
+                            return "Duplicate property path";
                         return true;
                     },
                 })).path;
@@ -155,12 +156,14 @@ class CreateComponent extends authenticated_command_1.AuthenticatedApplicationCo
                     name: "value",
                     message: "What is the path of the event? This will be used to trigger the event in your code (e.g. onChange)",
                     type: "input",
-                    initial: (0, identifiers_1.suggestIdentifier)(eventHandlerName) || "onChange",
+                    initial: (0, util_1.suggestIdentifier)(eventHandlerName) || "onChange",
                     validate: (response) => {
-                        if (!(0, identifiers_1.isValidIdentifier)(response))
+                        if (!(0, util_1.isValidIdentifier)(response))
                             return "Invalid identifier";
+                        if ((0, util_1.isReservedPropertyName)(response))
+                            return "Reserved property path (see https://docs.superblocks.com/applications/custom-components/faq#what-is-a-reserved-property)";
                         if (events.some((v) => v.path === response))
-                            return "Duplicate property name";
+                            return "Duplicate property path";
                         return true;
                     },
                 })).value;

package/dist/commands/components/watch.js

@@ -60,6 +60,9 @@ class Watch extends authenticated_command_1.AuthenticatedApplicationCommand {
                 server: {
                     port,
                 },
+                resolve: {
+                    preserveSymlinks: true,
+                },
                 customLogger: viteLogger,
                 plugins: [
                     healthEndpointMiddleware(),

package/dist/commands/init.js

@@ -26,7 +26,6 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 task: async (ctx) => {
                     ctx.fetchedResources = {};
                     ctx.writtenResources = {};
-                    ctx.now = new Date().toISOString();
                     try {
                         ctx.existingSuperblocksConfig = (await (0, util_1.getSuperblocksMonorepoConfigJson)(true))[0];
                     }
@@ -36,7 +35,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 },
             },
             {
-                title: "Fetching applications, workflows and scheduled jobs...",
+                title: "Fetching applications...",
                 task: (ctx, task) => task.newListr([
                     {
                         title: "Fetching applications...",
@@ -46,7 +45,6 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                             const applications = await this.getSdk().fetchApplications();
                             for (const app of applications) {
                                 if (app.isEditable) {
-                                    0;
                                     ctx.fetchedResources[app.id] = {
                                         resourceType: "APPLICATION",
                                         name: app.name,
@@ -65,10 +63,13 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                 const headers = {
                                     [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.INIT,
                                 };
-                                const application = await this.getSdk().fetchApplication({
+                                const application = await this.getSdk().fetchApplicationWithComponents({
                                     applicationId: resourceId,
                                     headers,
                                 });
+                                if (!application) {
+                                    throw new util_1.NotFoundError(`Application ${resourceId} was not found`);
+                                }
                                 ctx.fetchedResources[application.application.id] = {
                                     resourceType,
                                     name: application.application.name,
@@ -99,7 +100,6 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 title: "Writing resources to a disk...",
                 task: async (ctx, task) => {
                     const subtasks = [];
-                    const now = new Date().toISOString();
                     for (const resourceId of ctx.resourceIdsToInitialize) {
                         const resource = ctx.fetchedResources[resourceId];
                         if (!resource) {
@@ -113,14 +113,14 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                         const headers = {
                                             [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.INIT,
                                         };
-                                        const application = await this.getSdk().fetchApplication({
+                                        const application = await this.getSdk().fetchApplicationWithComponents({
                                             applicationId: resourceId,
                                             viewMode: ctx.viewMode,
                                             headers,
                                         });
                                         task.title += `: fetched`;
                                         ctx.writtenResources[resourceId] =
-                                            await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, now, process.cwd());
+                                            await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, process.cwd());
                                         task.title += `: done`;
                                     },
                                 });
@@ -133,7 +133,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                         const backend = await this.getSdk().fetchApi(resourceId, ctx.viewMode);
                                         task.title += `: fetched`;
                                         ctx.writtenResources[resourceId] =
-                                            await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, now, process.cwd());
+                                            await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, process.cwd());
                                         task.title += `: done`;
                                     },
                                 });

package/dist/commands/pull.js

@@ -20,7 +20,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                 title: "Checking for existing Superblocks project...",
                 task: async (ctx) => {
                     ctx.writtenResources = {};
-                    ctx.now = new Date().toISOString();
+                    ctx.removedResourceIds = [];
                     try {
                         [
                             ctx.existingSuperblocksRootConfig,
@@ -35,6 +35,78 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                     }
                 },
             },
+            {
+                title: "Checking for deleted Superblocks resources...",
+                task: async (ctx, task) => {
+                    var _a, _b, _c;
+                    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) {
+                                case "APPLICATION": {
+                                    try {
+                                        await this.getSdk().fetchApplication({
+                                            applicationId: resourceId,
+                                        });
+                                    }
+                                    catch (error) {
+                                        if (error instanceof util_1.NotFoundError) {
+                                            ctx.removedResourceIds.push(resourceId);
+                                        }
+                                        else {
+                                            throw error;
+                                        }
+                                    }
+                                    break;
+                                }
+                                case "BACKEND": {
+                                    try {
+                                        await this.getSdk().fetchApi(resourceId);
+                                    }
+                                    catch (error) {
+                                        if (error instanceof util_1.NotFoundError) {
+                                            ctx.removedResourceIds.push(resourceId);
+                                        }
+                                        else {
+                                            throw error;
+                                        }
+                                    }
+                                    break;
+                                }
+                                default: {
+                                    this.warn(`Unsupported resource type, resource: ${JSON.stringify(resource)}`);
+                                }
+                            }
+                        }
+                        if (ctx.removedResourceIds.length === 0) {
+                            return;
+                        }
+                        const listOfDeletedResources = ctx.removedResourceIds
+                            .map((id) => `- ${ctx.existingSuperblocksRootConfig.resources[id].location}`)
+                            .join("\n");
+                        const removeResourcesFromDisk = await task.prompt([
+                            {
+                                name: "removeResourcesFromDisk",
+                                type: "confirm",
+                                message: `Warning: The following resources could not be found in Superblocks.
+${listOfDeletedResources}
+
+Automatically removing resources from your local Superblocks project.
+
+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);
+                            }
+                        }
+                    }
+                    catch (e) {
+                        this.warn(`Could not check for deleted Superblocks resources. Continuing...: ${e.message}`);
+                    }
+                },
+            },
             {
                 title: "Pulling resources...",
                 task: async (ctx, task) => {
@@ -42,7 +114,6 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                     const viewMode = await (0, version_control_1.getMode)(task, mode);
                     const resourceIdsToPull = await this.getResourceIdsToPull(ctx, task, only);
                     const subtasks = [];
-                    const now = new Date().toISOString();
                     const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     for (const resourceId of resourceIdsToPull) {
                         const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
@@ -54,14 +125,14 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                                         const headers = {
                                             [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.PULL,
                                         };
-                                        const application = await this.getSdk().fetchApplication({
+                                        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, now, superblocksRootPath, resource.location);
+                                            await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, superblocksRootPath, resource.location);
                                         task.title += `: done`;
                                     },
                                 });
@@ -74,7 +145,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                                         const backend = await this.getSdk().fetchApi(resourceId, viewMode);
                                         task.title += `: fetched`;
                                         ctx.writtenResources[resourceId] =
-                                            await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, now, superblocksRootPath, resource.location);
+                                            await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, superblocksRootPath, resource.location);
                                         task.title += `: done`;
                                     },
                                 });
@@ -95,8 +166,8 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                 title: "Updating Superblocks project file...",
                 task: async (ctx) => {
                     const [superblocksRootConfig, rootConfigPath] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
-                    for (const [resourceId, resource] of Object.entries(ctx.writtenResources)) {
-                        superblocksRootConfig.resources[resourceId] = resource;
+                    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));
@@ -125,6 +196,9 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
         const initialSelections = [];
         let counter = 0;
         for (const [resourceId, resource] of Object.entries((_f = (_e = ctx.existingSuperblocksRootConfig) === null || _e === void 0 ? void 0 : _e.resources) !== null && _f !== void 0 ? _f : {})) {
+            if (ctx.removedResourceIds.includes(resourceId)) {
+                continue;
+            }
             choices.push({
                 name: resourceId,
                 message: resource.location,

package/dist/commands/rm.d.ts

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

package/dist/commands/rm.js

@@ -0,0 +1,185 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const util_1 = require("@superblocksteam/util");
+const fs = tslib_1.__importStar(require("fs-extra"));
+const listr2_1 = require("listr2");
+const lodash_1 = require("lodash");
+const authenticated_command_1 = require("../common/authenticated-command");
+const version_control_1 = require("../common/version-control");
+class Remove extends authenticated_command_1.AuthenticatedCommand {
+    async run() {
+        const { args } = await this.parse(Remove);
+        const tasks = this.createTasks(args);
+        try {
+            await tasks.run();
+        }
+        catch (error) {
+            this.error(error.message);
+        }
+    }
+    createTasks(args) {
+        const tasks = new listr2_1.Listr([
+            {
+                title: "Checking for existing Superblocks project...",
+                task: async (ctx) => {
+                    ctx.fetchedResources = {};
+                    ctx.removedResourceIds = [];
+                    try {
+                        ctx.existingSuperblocksConfig = (await (0, util_1.getSuperblocksMonorepoConfigJson)(true))[0];
+                    }
+                    catch {
+                        // no existing superblocks config
+                        this.error(`No Superblocks project found in the current folder hierarchy.`);
+                    }
+                },
+            },
+            {
+                title: "Fetching applications...",
+                task: (ctx, task) => task.newListr([
+                    {
+                        title: "Fetching applications...",
+                        enabled: () => !args.resourceLocation,
+                        task: async (ctx, task) => {
+                            // applications choices
+                            const applications = await this.getSdk().fetchApplications();
+                            for (const app of applications) {
+                                ctx.fetchedResources[app.id] = {
+                                    resourceType: "APPLICATION",
+                                    name: app.name,
+                                };
+                            }
+                            task.title += `: completed`;
+                        },
+                    },
+                ]),
+            },
+            {
+                title: "Selecting resources to remove...",
+                task: async (ctx, task) => {
+                    const resourceIdsToRemove = await this.getResourcesToRemove(ctx, task, args);
+                    ctx.resourceIdsToRemove = resourceIdsToRemove;
+                },
+            },
+            {
+                title: "Removing resources...",
+                task: async (ctx, task) => {
+                    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;
+                        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);
+                                ctx.removedResourceIds.push(resourceId);
+                                task.title += `: done`;
+                            },
+                        });
+                    }
+                    return task.newListr(subtasks, {
+                        concurrent: true,
+                    });
+                },
+            },
+            {
+                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,
+        });
+        return tasks;
+    }
+    async getResourcesToRemove(ctx, task, args) {
+        var _a;
+        if (args.resourceLocation) {
+            const [resourceId] = getResourceIdFromLocation(ctx, args.resourceLocation);
+            return [resourceId];
+        }
+        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]) {
+                    choices.push({
+                        name: resourceId,
+                        message: `${resource.name} (${resource.resourceType})`,
+                    });
+                }
+            }
+            if ((0, lodash_1.isEmpty)(choices)) {
+                this.error(`No resources found in your project. Please make sure you have at least one application, workflow or scheduled job in your project.`);
+            }
+            const resourceIdsToRemove = await task.prompt([
+                {
+                    type: "AutoComplete",
+                    name: "resourceIdsToRemove",
+                    message: `Select resources to remove (${version_control_1.MULTI_SELECT_PROMPT_HELP})`,
+                    choices: choices,
+                    multiple: true,
+                    validate: version_control_1.atLeastOneSelection,
+                    prefix: "▸",
+                    indicator: "◉",
+                },
+            ]);
+            const duplicates = await this.findDuplicates(resourceIdsToRemove, ctx.fetchedResources);
+            if (!(0, lodash_1.isEmpty)(duplicates)) {
+                this.error(`Duplicate resources selected: ${duplicates
+                    .map((duplicate) => `${duplicate.name} (${duplicate.resourceType}) id: ${duplicate.id}`)
+                    .join(", ")}. Please make sure to select unique resources or rename them so that they have unique names.`);
+            }
+            return resourceIdsToRemove;
+        }
+    }
+    async findDuplicates(selectedResourcesIds, resources) {
+        const selectedResources = selectedResourcesIds
+            .map((id) => {
+            return { ...resources[id], id };
+        })
+            .filter((resource) => resource !== undefined);
+        const countResourceNamesByType = {};
+        for (const resource of selectedResources) {
+            if (!countResourceNamesByType[resource.resourceType]) {
+                countResourceNamesByType[resource.resourceType] = {};
+            }
+            if (countResourceNamesByType[resource.resourceType][resource.name]) {
+                countResourceNamesByType[resource.resourceType][resource.name] += 1;
+            }
+            else {
+                countResourceNamesByType[resource.resourceType][resource.name] = 1;
+            }
+        }
+        return selectedResources.filter((resource) => countResourceNamesByType[resource.resourceType][resource.name] > 1);
+    }
+}
+Remove.description = "Remove a Superblocks resource from the local Superblocks project and delete the resource folder directory locally (if it exists)";
+Remove.examples = [
+    "<%= config.bin %> <%= command.id %>",
+    "<%= config.bin %> <%= command.id %> apps/my-spectacular-app",
+];
+Remove.args = {
+    resourceLocation: core_1.Args.string({
+        description: "Superblocks resource location (i.e. apps/my-spectacular-app)",
+    }),
+};
+exports.default = Remove;
+function getResourceIdFromLocation(ctx, resourceLocation) {
+    var _a, _b;
+    for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
+        if (resource.location === resourceLocation) {
+            return [resourceId, resource.resourceType];
+        }
+    }
+    throw new Error(`No resource found with the given location: ${resourceLocation}`);
+}

package/dist/common/authenticated-command.js

@@ -9,7 +9,6 @@ const util_1 = require("@superblocksteam/util");
 const colorette_1 = require("colorette");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
-const yaml_1 = require("yaml");
 const migrationWarningsForApplications_1 = require("../util/migrationWarningsForApplications");
 const migrationsForDotfiles_1 = require("../util/migrationsForDotfiles");
 const version_control_1 = require("./version-control");
@@ -115,7 +114,7 @@ class AuthenticatedApplicationCommand extends AuthenticatedCommand {
         return new URL(`/applications/${this.applicationConfig.id}/pages/${this.applicationConfig.defaultPageId}/edit`, baseUrl).toString();
     }
     async init() {
-        var _a;
+        var _a, _b;
         await super.init();
         try {
             this.applicationConfig = await (0, util_1.getSuperblocksApplicationConfigJson)();
@@ -125,18 +124,22 @@ class AuthenticatedApplicationCommand extends AuthenticatedCommand {
                 exit: 1,
             });
         }
+        core_1.ux.action.start("Checking application...");
         try {
-            const appYaml = await fs_extra_1.default.readFile("application.yaml", "utf-8");
-            const appJson = await (0, yaml_1.parse)(appYaml);
-            if ((_a = appJson === null || appJson === void 0 ? void 0 : appJson.settings) === null || _a === void 0 ? void 0 : _a.cliVersion) {
-                const warningMessage = (0, migrationWarningsForApplications_1.getWarningsForApplicationMigration)(appJson.settings.cliVersion, this.config.version);
+            const application = await this.getSdk().fetchApplication({
+                applicationId: this.applicationConfig.id,
+            });
+            core_1.ux.action.stop();
+            if ((_b = (_a = application === null || application === void 0 ? void 0 : application.application) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.cliVersion) {
+                const warningMessage = (0, migrationWarningsForApplications_1.getWarningsForApplicationMigration)(application.application.settings.cliVersion, this.config.version);
                 if (warningMessage) {
                     this.log(warningMessage);
                 }
             }
         }
         catch (e) {
-            this.warn(`Could not read page.yaml to determine version compatibility: ${e.message}`);
+            core_1.ux.action.stop();
+            this.warn(`Could not read the application from Superblocks: ${e.message}`);
         }
     }
     async registerComponents(injectedHeaders) {

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

@@ -9,6 +9,7 @@ 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 writeResourceToDisk(resourceType: string, resourceId: string, resource: any, now: string, rootPath: string, existingRelativeLocation?: string): Promise<VersionedResourceConfig>;
+export declare function writeResourceToDisk(resourceType: string, resourceId: string, resource: any, rootPath: string, existingRelativeLocation?: string): Promise<VersionedResourceConfig>;
+export declare function removeResourceFromDisk(resourceLocation: string): Promise<void>;
 export declare function getMode(task: any, mode: ModeFlag): Promise<ViewMode>;
 export declare function sortByKey(obj: unknown): unknown;

package/dist/common/version-control.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByKey = exports.getMode = exports.writeResourceToDisk = exports.atLeastOneSelection = exports.MULTI_SELECT_PROMPT_HELP = exports.SELECT_PROMPT_HELP = exports.modeFlagToViewMode = exports.modeFlagValuesMap = exports.DEPLOYED_MODE = exports.MOST_RECENT_COMMIT_MODE = exports.LATEST_EDITS_MODE = void 0;
+exports.sortByKey = exports.getMode = exports.removeResourceFromDisk = exports.writeResourceToDisk = exports.atLeastOneSelection = exports.MULTI_SELECT_PROMPT_HELP = exports.SELECT_PROMPT_HELP = exports.modeFlagToViewMode = exports.modeFlagValuesMap = 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"));
@@ -87,7 +87,7 @@ async function downloadFile(rootDirectory, filepath, url) {
     }
     return Promise.resolve("");
 }
-async function writeResourceToDisk(resourceType, resourceId, resource, now, rootPath, existingRelativeLocation) {
+async function writeResourceToDisk(resourceType, resourceId, resource, rootPath, existingRelativeLocation) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     switch (resourceType) {
         case "APPLICATION": {
@@ -119,17 +119,16 @@ async function writeResourceToDisk(resourceType, resourceId, resource, now, root
             };
             if (resource.apis) {
                 for (const api of resource.apis) {
-                    const apiName = slugifyName((_d = (_c = (_b = api.apiPb) === null || _b === void 0 ? void 0 : _b.metadata) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : api.actions.name);
-                    // server is still sending actions for a backwards compatibility
-                    delete api.actions;
-                    const apiContent = (0, yaml_1.stringify)(api, {
+                    const originalApiName = (_d = (_c = (_b = api.apiPb) === null || _b === void 0 ? void 0 : _b.metadata) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : api.actions.name;
+                    const apiName = slugifyName(originalApiName);
+                    const apiContent = (0, yaml_1.stringify)(api.apiPb, {
                         sortMapEntries: true,
                     });
                     const handleApi = async () => {
                         await fs.outputFile(`${apisDirName}/${apiName}.yaml`, apiContent);
                     };
                     apiPromises.push(handleApi());
-                    applicationConfig.apis[api.id] = apiName;
+                    applicationConfig.apis[api.id] = originalApiName;
                 }
                 await Promise.all(apiPromises);
             }
@@ -152,15 +151,13 @@ async function writeResourceToDisk(resourceType, resourceId, resource, now, root
         case "BACKEND": {
             const parentDirName = "backends";
             const apiName = slugifyName((_j = (_h = (_g = resource.apiPb) === null || _g === void 0 ? void 0 : _g.metadata) === null || _h === void 0 ? void 0 : _h.name) !== null && _j !== void 0 ? _j : resource.actions.name);
-            // server is still sending actions for a backwards compatibility
-            delete resource.actions;
             const newRelativeLocation = `${parentDirName}/${apiName}`;
             const relativeLocation = existingRelativeLocation !== null && existingRelativeLocation !== void 0 ? existingRelativeLocation : newRelativeLocation;
             const backendDirName = node_path_1.default.resolve(rootPath, relativeLocation);
             if (!(await fs.pathExists(backendDirName))) {
                 await fs.mkdir(backendDirName, { recursive: true });
             }
-            const backendContent = (0, yaml_1.stringify)(resource, {
+            const backendContent = (0, yaml_1.stringify)(resource.apiPb, {
                 sortMapEntries: true,
             });
             await fs.outputFile(`${backendDirName}/api.yaml`, backendContent);
@@ -181,6 +178,10 @@ async function writeResourceToDisk(resourceType, resourceId, resource, now, root
     }
 }
 exports.writeResourceToDisk = writeResourceToDisk;
+async function removeResourceFromDisk(resourceLocation) {
+    await fs.remove(resourceLocation);
+}
+exports.removeResourceFromDisk = removeResourceFromDisk;
 async function getMode(task, mode) {
     if (mode) {
         return modeFlagToViewMode(mode);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.23",
+  "version": "1.0.2",
   "commands": {
     "init": {
       "id": "init",
@@ -105,6 +105,26 @@
         }
       }
     },
+    "rm": {
+      "id": "rm",
+      "description": "Remove a Superblocks resource from the local Superblocks project and delete the resource folder directory locally (if it exists)",
+      "strict": true,
+      "pluginName": "@superblocksteam/cli",
+      "pluginAlias": "@superblocksteam/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> apps/my-spectacular-app"
+      ],
+      "flags": {},
+      "args": {
+        "resourceLocation": {
+          "name": "resourceLocation",
+          "description": "Superblocks resource location (i.e. apps/my-spectacular-app)"
+        }
+      }
+    },
     "components:create": {
       "id": "components:create",
       "description": "Creates a new Superblocks component in the current application folder",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "0.0.23",
+  "version": "1.0.2",
   "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": "0.0.23",
-    "@superblocksteam/react-shim": "0.0.23",
-    "@superblocksteam/sdk": "0.0.23",
-    "@superblocksteam/util": "0.0.23",
-    "@superblocksteam/vite-custom-component-reload-plugin": "0.0.23",
+    "@superblocksteam/css-plugin": "1.0.2",
+    "@superblocksteam/react-shim": "1.0.2",
+    "@superblocksteam/sdk": "1.0.2",
+    "@superblocksteam/util": "1.0.2",
+    "@superblocksteam/vite-custom-component-reload-plugin": "1.0.2",
     "@vitejs/plugin-react": "^4.0.4",
     "colorette": "^2.0.19",
     "enquirer": "^2.3.6",
@@ -45,7 +45,7 @@
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
     "chai": "^4",
-    "eslint": "^8.45.0",
+    "eslint": "^8.48.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-prettier": "4.2.1",
@@ -59,6 +59,7 @@
     "typescript": "^5.1.6"
   },
   "scripts": {
+    "preinstall": "node -e 'if (process.versions.node.split(`.`)[0] < 16) { console.error(`Incompatible Node version: Please use Node.js v16 or higher`); process.exit(1);}'",
     "build": "tsc --build",
     "clean": "npm run clean:build && rm -rf node_modules",
     "clean:build": "tsc --build --clean && rm -rf dist tsconfig.tsbuildinfo",

package/dist/util/identifiers.d.ts

@@ -1,7 +0,0 @@
-/**
- * Suggest an identifier based on a label, e.g. `My Component` -> `myComponent`.
- * @param label The label to suggest an identifier for.
- * @param capitalizeFirst Whether to capitalize the first letter of the identifier.
- */
-export declare function suggestIdentifier(label: string, capitalizeFirst?: boolean): string;
-export declare function isValidIdentifier(str: string): boolean;

package/dist/util/identifiers.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidIdentifier = exports.suggestIdentifier = void 0;
-// convert a string to upper camel case, e.g. "123 & this is my component, foo-bar" -> "123ThisIsMyComponentFooBar"
-function wordsToUpperCamelCase(str) {
-    return str
-        .split(/[^A-Za-z0-9_]+/)
-        .filter(Boolean)
-        .map((word) => word[0].toUpperCase() + word.slice(1))
-        .join("");
-}
-const digits = "Zero One Two Three Four Five Six Seven Eight Nine".split(" ");
-// convert digits to words, e.g. "123" -> "OneTwoThree"
-function digitsToWords(str) {
-    return str.replace(/\d/g, (char) => { var _a; return (_a = digits[parseInt(char, 10)]) !== null && _a !== void 0 ? _a : char; });
-}
-/**
- * Suggest an identifier based on a label, e.g. `My Component` -> `myComponent`.
- * @param label The label to suggest an identifier for.
- * @param capitalizeFirst Whether to capitalize the first letter of the identifier.
- */
-function suggestIdentifier(label, capitalizeFirst = false) {
-    const upperCamelCase = wordsToUpperCamelCase(label)
-        // convert any digits at the start of the string to words as these are not valid in identifiers
-        .replace(/^\d+/, digitsToWords);
-    if (capitalizeFirst) {
-        return upperCamelCase;
-    }
-    else {
-        return upperCamelCase[0].toLowerCase() + upperCamelCase.slice(1);
-    }
-}
-exports.suggestIdentifier = suggestIdentifier;
-function isValidIdentifier(str) {
-    return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(str);
-}
-exports.isValidIdentifier = isValidIdentifier;