@superblocksteam/cli 0.0.14 → 0.0.15

package/README.md

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

package/assets/custom-components/package.json

@@ -11,7 +11,7 @@
     "react-dom": "^18"
   },
   "devDependencies": {
-    "@superblocksteam/cli": "0.0.14",
+    "@superblocksteam/cli": "0.0.15",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@typescript-eslint/eslint-plugin": "^5.62.0",

package/dist/commands/components/create.js

@@ -7,7 +7,6 @@ const node_crypto_1 = require("node:crypto");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const node_util_1 = tslib_1.__importDefault(require("node:util"));
 const core_1 = require("@oclif/core");
-const util_1 = require("@superblocksteam/util");
 const colorette_1 = require("colorette");
 const enquirer_1 = require("enquirer");
 const fs = tslib_1.__importStar(require("fs-extra"));
@@ -196,10 +195,7 @@ class CreateComponent extends authenticated_command_1.AuthenticatedApplicationCo
             }
             core_1.ux.action.stop();
         }
-        core_1.ux.action.start("Registering components...");
-        const components = await (0, util_1.getComponentConfigs)();
-        await this.getSdk().registerComponents(this.applicationConfig.id, components);
-        core_1.ux.action.stop();
+        this.registerComponents();
     }
 }
 CreateComponent.description = "Creates a new Superblocks component in the current application folder";

package/dist/commands/components/register.js

@@ -1,36 +1,9 @@
 "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 authenticated_command_1 = require("../../common/authenticated-command");
 class Register extends authenticated_command_1.AuthenticatedApplicationCommand {
     async run() {
-        core_1.ux.action.start("Scanning for Superblocks components...");
-        const exists = await fs.pathExists(util_1.CUSTOM_COMPONENTS_PATH);
-        if (!exists) {
-            core_1.ux.action.stop();
-            this.error("No components folder found in current directory, please run 'superblocks components create' first", {
-                exit: 1,
-            });
-        }
-        const configs = await (0, util_1.getComponentConfigs)();
-        if (configs.length === 0) {
-            core_1.ux.action.stop();
-            this.log("No components found in current components directory, please run 'superblocks components create' first");
-        }
-        core_1.ux.action.stop();
-        this.log(JSON.stringify(configs, null, 2));
-        try {
-            core_1.ux.action.start("Registering components...");
-            await this.getSdk().registerComponents(this.applicationConfig.id, configs);
-            core_1.ux.action.stop();
-        }
-        catch {
-            core_1.ux.action.stop();
-            this.error("Failed to register components", { exit: 1 });
-        }
+        await this.registerComponents();
     }
 }
 Register.description = "Registers all local component config files";

package/dist/commands/components/upload.js

@@ -21,22 +21,9 @@ class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
                 exit: 1,
             });
         }
-        const configs = await (0, util_1.getComponentConfigs)();
-        if (configs.length === 0) {
-            core_1.ux.action.stop();
-            this.log("No components found in current components directory, please run 'superblocks components create' first");
-        }
-        core_1.ux.action.stop();
-        try {
-            core_1.ux.action.start("Registering components...");
-            await this.getSdk().registerComponents(this.applicationConfig.id, configs);
-            core_1.ux.action.stop();
-        }
-        catch (e) {
-            core_1.ux.action.stop();
-            this.log(e.message);
-            this.error("Failed to register components", { exit: 1 });
-        }
+        const configs = await this.registerComponents();
+        if (!configs)
+            return;
         // Map component name to component path- each name is a separate entry point
         const entryFiles = Object.fromEntries(Object.values(configs).map((config) => [
             config.name,

package/dist/commands/components/watch.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.healthEndpointMiddleware = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
 const react_shim_1 = require("@superblocksteam/react-shim");
-const util_1 = require("@superblocksteam/util");
 const vite_custom_component_reload_plugin_1 = require("@superblocksteam/vite-custom-component-reload-plugin");
 const plugin_react_1 = tslib_1.__importDefault(require("@vitejs/plugin-react"));
 const colorette_1 = require("colorette");
@@ -31,10 +29,7 @@ function healthEndpointMiddleware() {
 exports.healthEndpointMiddleware = healthEndpointMiddleware;
 class Watch extends authenticated_command_1.AuthenticatedApplicationCommand {
     async run() {
-        core_1.ux.action.start("Registering components...");
-        const components = await (0, util_1.getComponentConfigs)();
-        await this.getSdk().registerComponents(this.applicationConfig.id, components);
-        core_1.ux.action.stop();
+        await this.registerComponents();
         this.log((0, colorette_1.yellow)("Remember to refresh your application to see any newly registered components."));
         this.log();
         this.log((0, colorette_1.green)(`Visit ${await this.getBaseUrl()} and access your application in edit mode to see your components! 🐨`));
@@ -58,20 +53,6 @@ class Watch extends authenticated_command_1.AuthenticatedApplicationCommand {
         await (async () => {
             const server = await (0, vite_1.createServer)({
                 configFile: false,
-                build: {
-                    rollupOptions: {
-                        input: [
-                        // eslint-disable-next-line no-warning-comments
-                        /* TODO */
-                        ],
-                        preserveEntrySignatures: "strict",
-                        output: {
-                            entryFileNames: "[name].js",
-                        },
-                    },
-                    copyPublicDir: true,
-                    write: true,
-                },
                 base: `http://localhost:${port}`,
                 server: {
                     port,

package/dist/commands/init.js

@@ -40,10 +40,8 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 task: (ctx, task) => task.newListr([
                     {
                         title: "Fetching applications...",
+                        enabled: () => !args.resourceUrl,
                         task: async (ctx, task) => {
-                            if (args.resourceUrl) {
-                                task.skip("Skipping fetching applications");
-                            }
                             // applications choices
                             const applications = await this.getSdk().fetchApplications();
                             for (const app of applications) {
@@ -58,6 +56,28 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                             task.title += `: completed`;
                         },
                     },
+                    {
+                        title: "Fetching resource by resourceUrl...",
+                        enabled: () => args.resourceUrl,
+                        task: async (ctx, task) => {
+                            const [resourceId, resourceType] = getResourceIdFromUrl(args.resourceUrl);
+                            if (resourceType === "APPLICATION") {
+                                const application = await this.getSdk().fetchApplication(resourceId);
+                                ctx.fetchedResources[application.application.id] = {
+                                    resourceType,
+                                    name: application.application.name,
+                                };
+                            }
+                            else if (resourceType === "BACKEND") {
+                                const api = await this.getSdk().fetchApi(resourceId);
+                                ctx.fetchedResources[api.id] = {
+                                    resourceType,
+                                    name: api.actions.name,
+                                };
+                            }
+                            task.title += `: completed`;
+                        },
+                    },
                 ]),
             },
             {
@@ -76,6 +96,9 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                     const now = new Date().toISOString();
                     for (const resourceId of ctx.resourceIdsToInitialize) {
                         const resource = ctx.fetchedResources[resourceId];
+                        if (!resource) {
+                            this.error(`Resource with id ${resourceId} does not exist in fetched resources`);
+                        }
                         switch (resource.resourceType) {
                             case "APPLICATION": {
                                 subtasks.push({
@@ -152,13 +175,8 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
         var _a, _b;
         if (args.resourceUrl) {
             try {
-                const resourceUrl = new URL(args.resourceUrl);
-                if (resourceUrl.pathname.startsWith("/applications") ||
-                    resourceUrl.pathname.startsWith("/workflows") ||
-                    resourceUrl.pathname.startsWith("/scheduled-jobs")) {
-                    return [resourceUrl.pathname.split("/")[2]];
-                }
-                throw new Error(`Failed to parse resource URL: ${args.resourceUrl}`);
+                const [resourceId] = getResourceIdFromUrl(args.resourceUrl);
+                return [resourceId];
             }
             catch {
                 throw new Error(`Invalid resource URL: ${args.resourceUrl}`);
@@ -245,3 +263,14 @@ Initialize.args = {
     }),
 };
 exports.default = Initialize;
+function getResourceIdFromUrl(resourceUrl) {
+    const url = new URL(resourceUrl);
+    if (url.pathname.startsWith("/applications")) {
+        return [url.pathname.split("/")[2], "APPLICATION"];
+    }
+    else if (url.pathname.startsWith("/workflows") ||
+        url.pathname.startsWith("/scheduled-jobs")) {
+        return [url.pathname.split("/")[2], "BACKEND"];
+    }
+    throw new Error(`Failed to parse resource URL: ${resourceUrl}`);
+}

package/dist/common/authenticated-command.d.ts

@@ -11,4 +11,5 @@ export declare abstract class AuthenticatedApplicationCommand extends Authentica
     applicationConfig: SuperblocksApplicationConfig;
     protected getEditModeUrl(): Promise<string>;
     protected init(): Promise<void>;
+    protected registerComponents(): Promise<Record<string, any> | undefined>;
 }

package/dist/common/authenticated-command.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthenticatedApplicationCommand = exports.AuthenticatedCommand = void 0;
+const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const sdk_1 = require("@superblocksteam/sdk");
 const util_1 = require("@superblocksteam/util");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 class AuthenticatedCommand extends core_1.Command {
     async init() {
         await super.init();
@@ -54,5 +56,37 @@ class AuthenticatedApplicationCommand extends AuthenticatedCommand {
             });
         }
     }
+    async registerComponents() {
+        core_1.ux.action.start("Scanning for Superblocks components...");
+        const exists = await fs_extra_1.default.pathExists(util_1.CUSTOM_COMPONENTS_PATH);
+        if (!exists) {
+            core_1.ux.action.stop();
+            this.error("No components folder found in current directory, please run 'superblocks components create' first", {
+                exit: 1,
+            });
+        }
+        const { configs, hasError } = await (0, util_1.getComponentConfigs)();
+        if (hasError) {
+            core_1.ux.action.stop();
+            this.error("Failed to register components", { exit: 1 });
+            // Stop immediately
+            return;
+        }
+        if (configs.length === 0) {
+            core_1.ux.action.stop();
+            this.log("No components found in current components directory, please run 'superblocks components create' first");
+        }
+        core_1.ux.action.stop();
+        try {
+            core_1.ux.action.start("Registering components...");
+            await this.getSdk().registerComponents(this.applicationConfig.id, configs);
+            core_1.ux.action.stop();
+        }
+        catch {
+            core_1.ux.action.stop();
+            this.error("Failed to register components", { exit: 1 });
+        }
+        return configs;
+    }
 }
 exports.AuthenticatedApplicationCommand = AuthenticatedApplicationCommand;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.14",
+  "version": "0.0.15",
   "commands": {
     "init": {
       "id": "init",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "Official Superblocks CLI",
   "bin": {
     "superblocks": "bin/run"
@@ -18,8 +18,8 @@
     "@oclif/core": "^2",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^2.4.4",
-    "@superblocksteam/sdk": "*",
     "@superblocksteam/react-shim": "*",
+    "@superblocksteam/sdk": "*",
     "@superblocksteam/util": "*",
     "@superblocksteam/vite-custom-component-reload-plugin": "*",
     "@vitejs/plugin-react": "^4.0.0",