@superblocksteam/cli 1.10.0 → 1.12.0

package/dist/common/{authenticated-command.js → authenticated-command.mjs}

@@ -1,27 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthenticatedApplicationCommand = exports.AuthenticatedCommand = void 0;
-const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const core_1 = require("@oclif/core");
-const sdk_1 = require("@superblocksteam/sdk");
-const util_1 = require("@superblocksteam/util");
-const colorette_1 = require("colorette");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const semver_1 = tslib_1.__importDefault(require("semver"));
-const migrationWarningsForApplications_1 = require("../util/migrationWarningsForApplications");
-const migrationsForDotfiles_1 = require("../util/migrationsForDotfiles");
-const version_control_1 = require("./version-control");
-class AuthenticatedCommand extends core_1.Command {
+import path from "node:path";
+import { Command, ux } from "@oclif/core";
+import { SuperblocksSdk } from "@superblocksteam/sdk";
+import { ComponentEvent, CUSTOM_COMPONENTS_PATH, getComponentConfigs, getLocalTokenWithUrl, getLocalTokenWithUrlIfExists, getSuperblocksApplicationConfigJson, getSuperblocksMonorepoConfigJson, } from "@superblocksteam/util";
+import { cyan } from "colorette";
+import fs from "fs-extra";
+import semver from "semver";
+import { getWarningsForApplicationMigration } from "../util/migrationWarningsForApplications.mjs";
+import { isDotfileMigrationNeeded, migrateSuperblocksEntityConfig, migrateSuperblocksMonorepoConfig, } from "../util/migrationsForDotfiles.mjs";
+import { DEFAULT_BRANCH, getLocalGitRepoState, sortByKey, } from "./version-control.mjs";
+export class AuthenticatedCommand extends Command {
+    sdk;
     async init() {
         await super.init();
         try {
-            const result = await (0, util_1.getLocalTokenWithUrl)();
+            const result = await getLocalTokenWithUrl();
             if (!("token" in result)) {
                 throw new Error();
             }
             const { token, superblocksBaseUrl } = result;
-            this.sdk = new sdk_1.SuperblocksSdk(token, superblocksBaseUrl, this.config.version);
+            this.sdk = new SuperblocksSdk(token, superblocksBaseUrl, this.config.version);
             await this.runAutomatedDotfileUpdates();
         }
         catch (e) {
@@ -30,7 +27,7 @@ class AuthenticatedCommand extends core_1.Command {
         }
     }
     async validateGitSetup(resourceType, resourceId, event, overrideLocalBranch, injectedHeaders) {
-        const localGitRepoState = await (0, version_control_1.getLocalGitRepoState)(overrideLocalBranch);
+        const localGitRepoState = await getLocalGitRepoState(overrideLocalBranch);
         const { branchName } = await this.getSdk().validateGitSetup(resourceId, resourceType, event, localGitRepoState, injectedHeaders);
         return {
             branchName,
@@ -40,9 +37,8 @@ class AuthenticatedCommand extends core_1.Command {
         };
     }
     async getBaseUrl() {
-        var _a;
-        const result = await (0, util_1.getLocalTokenWithUrlIfExists)();
-        return (_a = result === null || result === void 0 ? void 0 : result.superblocksBaseUrl) !== null && _a !== void 0 ? _a : "";
+        const result = await getLocalTokenWithUrlIfExists();
+        return result?.superblocksBaseUrl ?? "";
     }
     getSdk() {
         if (!this.sdk) {
@@ -54,7 +50,8 @@ class AuthenticatedCommand extends core_1.Command {
         let previousConfig;
         let rootConfigPath;
         try {
-            [previousConfig, rootConfigPath] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
+            [previousConfig, rootConfigPath] =
+                await getSuperblocksMonorepoConfigJson(true);
         }
         catch {
             // This might fail for a brand-new project folder, which is deliberately ignored
@@ -62,25 +59,25 @@ class AuthenticatedCommand extends core_1.Command {
         }
         if (previousConfig &&
             rootConfigPath &&
-            (0, migrationsForDotfiles_1.isDotfileMigrationNeeded)(previousConfig.metadata.cliVersion, this.config.version)) {
+            isDotfileMigrationNeeded(previousConfig.metadata.cliVersion, this.config.version)) {
             this.log(`Migrating Superblocks settings from ${previousConfig.metadata.cliVersion} to ${this.config.version}...`);
             try {
-                const newConfig = await (0, migrationsForDotfiles_1.migrateSuperblocksMonorepoConfig)(previousConfig, {
+                const newConfig = await migrateSuperblocksMonorepoConfig(previousConfig, {
                     previousVersion: previousConfig.metadata.cliVersion,
                     currentVersion: this.config.version,
                 });
-                await fs_extra_1.default.writeFile(rootConfigPath, JSON.stringify((0, version_control_1.sortByKey)(newConfig), null, 2));
+                await fs.writeFile(rootConfigPath, JSON.stringify(sortByKey(newConfig), null, 2));
                 await Promise.all(Object.entries(newConfig.resources).map(async ([, resource]) => {
                     this.log(`Migrating ${resource.location}`);
                     try {
-                        const resourcePath = node_path_1.default.join(rootConfigPath, "../..", resource.location, ".superblocks/superblocks.json");
-                        const resourceConfig = await fs_extra_1.default.readJSON(resourcePath);
-                        const newConfig = await (0, migrationsForDotfiles_1.migrateSuperblocksEntityConfig)(resourceConfig, {
+                        const resourcePath = path.join(rootConfigPath, "../..", resource.location, ".superblocks/superblocks.json");
+                        const resourceConfig = await fs.readJSON(resourcePath);
+                        const newConfig = await migrateSuperblocksEntityConfig(resourceConfig, {
                             previousVersion: previousConfig
                                 .metadata.cliVersion,
                             currentVersion: this.config.version,
                         });
-                        await fs_extra_1.default.writeFile(resourcePath, JSON.stringify((0, version_control_1.sortByKey)(newConfig), null, 2));
+                        await fs.writeFile(resourcePath, JSON.stringify(sortByKey(newConfig), null, 2));
                     }
                     catch (e) {
                         this.error(e);
@@ -88,14 +85,14 @@ class AuthenticatedCommand extends core_1.Command {
                 }));
                 this.log(`Finalizing migration`);
                 this.log(`After upgrading the CLI version, you may need to perform additional migrations using
-${(0, colorette_1.cyan)("superblocks migrate")}`);
+${cyan("superblocks migrate")}`);
             }
             catch (e) {
                 this.error(e);
             }
         }
         if (previousConfig.metadata.cliVersion) {
-            const warningMessage = (0, migrationWarningsForApplications_1.getWarningsForApplicationMigration)(previousConfig.metadata.cliVersion, this.config.version);
+            const warningMessage = getWarningsForApplicationMigration(previousConfig.metadata.cliVersion, this.config.version);
             if (warningMessage) {
                 this.log(warningMessage);
             }
@@ -103,54 +100,49 @@ ${(0, colorette_1.cyan)("superblocks migrate")}`);
         // Always upgrade the root config even if there's no migration
         if (rootConfigPath) {
             previousConfig.metadata.cliVersion = this.config.version;
-            await fs_extra_1.default.writeFile(rootConfigPath, JSON.stringify((0, version_control_1.sortByKey)(previousConfig), null, 2));
+            await fs.writeFile(rootConfigPath, JSON.stringify(sortByKey(previousConfig), null, 2));
         }
     }
 }
-exports.AuthenticatedCommand = AuthenticatedCommand;
-class AuthenticatedApplicationCommand extends AuthenticatedCommand {
-    constructor() {
-        super(...arguments);
-        this.applicationConfig = {
-            configType: "APPLICATION",
-            id: "",
-            defaultPageId: "",
-            apis: {},
-        };
-    }
+export class AuthenticatedApplicationCommand extends AuthenticatedCommand {
+    applicationConfig = {
+        configType: "APPLICATION",
+        id: "",
+        defaultPageId: "",
+        apis: {},
+    };
     async getEditModeUrl() {
-        const result = await (0, util_1.getLocalTokenWithUrlIfExists)();
-        const baseUrl = typeof result === "string" ? result : result === null || result === void 0 ? void 0 : result.superblocksBaseUrl;
+        const result = await getLocalTokenWithUrlIfExists();
+        const baseUrl = typeof result === "string" ? result : result?.superblocksBaseUrl;
         return new URL(`/applications/edit/${this.applicationConfig.id}`, baseUrl).toString();
     }
     async init() {
-        var _a, _b;
         await super.init();
         try {
-            this.applicationConfig = await (0, util_1.getSuperblocksApplicationConfigJson)();
+            this.applicationConfig = await getSuperblocksApplicationConfigJson();
         }
         catch (error) {
             this.error(error.message, {
                 exit: 1,
             });
         }
-        const { branchName } = await this.validateApplicationGitSetup(util_1.ComponentEvent.INIT);
-        core_1.ux.action.start("Checking application...");
+        const { branchName } = await this.validateApplicationGitSetup(ComponentEvent.INIT);
+        ux.action.start("Checking application...");
         try {
             const application = await this.getSdk().fetchApplication({
                 applicationId: this.applicationConfig.id,
-                branch: branchName !== null && branchName !== void 0 ? branchName : version_control_1.DEFAULT_BRANCH,
+                branch: branchName ?? DEFAULT_BRANCH,
             });
-            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);
+            ux.action.stop();
+            if (application?.application?.settings?.cliVersion) {
+                const warningMessage = getWarningsForApplicationMigration(application.application.settings.cliVersion, this.config.version);
                 if (warningMessage) {
                     this.log(warningMessage);
                 }
             }
         }
         catch (e) {
-            core_1.ux.action.stop();
+            ux.action.stop();
             this.warn(`Could not read the application from Superblocks: ${e.message}`);
         }
     }
@@ -158,64 +150,62 @@ class AuthenticatedApplicationCommand extends AuthenticatedCommand {
         return this.validateGitSetup("APPLICATION", this.applicationConfig.id, event, overrideLocalBranch, injectedHeaders);
     }
     async registerComponents(injectedHeaders) {
-        var _a;
-        core_1.ux.action.start("Checking CLI version compatibility...");
+        ux.action.start("Checking CLI version compatibility...");
         try {
-            const packageJson = await fs_extra_1.default.readJson("package.json");
-            const versionStr = (_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a["@superblocksteam/custom-components"];
+            const packageJson = await fs.readJson("package.json");
+            const versionStr = packageJson.dependencies?.["@superblocksteam/custom-components"];
             if (!versionStr) {
                 throw new Error(`You must install the @superblocksteam/custom-components library as a dependency in your package.json file. Run:
 
-${(0, colorette_1.cyan)("superblocks migrate")}`);
+${cyan("superblocks migrate")}`);
             }
             if (versionStr.startsWith("file:")) {
                 this.warn(`You are using a local version of the @superblocksteam/custom-components library. It is not possible to check its version compatibility with the CLI.`);
             }
-            else if (!semver_1.default.satisfies(this.config.version, versionStr)) {
+            else if (!semver.satisfies(this.config.version, versionStr)) {
                 throw new Error(`You must upgrade the @superblocksteam/custom-components library. You are using ${versionStr} but the CLI is ${this.config.version}. Run:
 
-${(0, colorette_1.cyan)("superblocks migrate")}`);
+${cyan("superblocks migrate")}`);
             }
         }
         catch (e) {
-            core_1.ux.action.stop();
+            ux.action.stop();
             this.error(e.message, {
                 exit: 1,
             });
         }
-        core_1.ux.action.stop();
-        core_1.ux.action.start("Scanning for Superblocks components...");
-        const exists = await fs_extra_1.default.pathExists(util_1.CUSTOM_COMPONENTS_PATH);
+        ux.action.stop();
+        ux.action.start("Scanning for Superblocks components...");
+        const exists = await fs.pathExists(CUSTOM_COMPONENTS_PATH);
         if (!exists) {
-            core_1.ux.action.stop();
+            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)(true);
+        const { configs, hasError } = await getComponentConfigs(true);
         if (hasError) {
-            core_1.ux.action.stop();
+            ux.action.stop();
             this.error("Failed to register components", { exit: 1 });
             // Stop immediately
             return;
         }
         if (configs.length === 0) {
-            core_1.ux.action.stop();
+            ux.action.stop();
             this.log("No components found in current components directory, please run 'superblocks components create' first");
         }
-        core_1.ux.action.stop();
+        ux.action.stop();
         try {
-            core_1.ux.action.start("Registering components...");
-            const { branchName } = await this.validateApplicationGitSetup(util_1.ComponentEvent.REGISTER);
+            ux.action.start("Registering components...");
+            const { branchName } = await this.validateApplicationGitSetup(ComponentEvent.REGISTER);
             await this.getSdk().registerComponents(this.applicationConfig.id, configs, branchName, injectedHeaders);
-            core_1.ux.action.stop();
+            ux.action.stop();
         }
         catch (e) {
-            core_1.ux.action.stop();
+            ux.action.stop();
             console.log(e.message);
             this.error("Failed to register components", { exit: 1 });
         }
         return configs;
     }
 }
-exports.AuthenticatedApplicationCommand = AuthenticatedApplicationCommand;

package/dist/common/defaults/{create-component-defaults.js → create-component-defaults.mjs}

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultComponentTsx = exports.getDefaultConfigTs = void 0;
 const indent = (str, spaces) => {
     const spacesString = " ".repeat(spaces);
     return str
@@ -8,7 +5,7 @@ const indent = (str, spaces) => {
         .map((line) => `${spacesString}${line}`)
         .join("\n");
 };
-const getDefaultConfigTs = ({ id, name, displayName, propertiesRendered, eventHandlersRendered, }) => `import { type ComponentConfig } from "@superblocksteam/custom-components";
+export const getDefaultConfigTs = ({ id, name, displayName, propertiesRendered, eventHandlersRendered, }) => `import { type ComponentConfig } from "@superblocksteam/custom-components";
 
 export default {
   // DO NOT CHANGE THE ID ONCE THE COMPONENT HAS BEEN REGISTERED!
@@ -24,8 +21,7 @@ export default {
   },
 } satisfies ComponentConfig;
 `;
-exports.getDefaultConfigTs = getDefaultConfigTs;
-const getDefaultComponentTsx = (properties, eventHandlers) => `import { useSuperblocksContext, useSuperblocksIsLoading } from "@superblocksteam/custom-components";
+export const getDefaultComponentTsx = (properties, eventHandlers) => `import { useSuperblocksContext, useSuperblocksIsLoading } from "@superblocksteam/custom-components";
 import { type Props, type EventTriggers } from "./types";
 
 export default function Component({${properties.length === 0
@@ -55,4 +51,3 @@ export default function Component({${properties.length === 0
   );
 }
 `;
-exports.getDefaultComponentTsx = getDefaultComponentTsx;

package/dist/common/{version-control.d.ts → version-control.d.mts}

@@ -1,5 +1,5 @@
 import { ApiWrapper, ApplicationWrapper, FeatureFlags, MultiPageApplicationWrapper } from "@superblocksteam/sdk";
-import { Api, ViewMode } from "@superblocksteam/sdk/dist/types";
+import { Api, ViewMode } from "@superblocksteam/sdk";
 import { LocalGitRepoState, SuperblocksMonorepoConfig, SuperblocksResourceConfig, VersionedResourceConfig, ApiInfo } from "@superblocksteam/util";
 export declare const LATEST_EDITS_MODE = "latest-edits";
 export declare const MOST_RECENT_COMMIT_MODE = "most-recent-commit";