@botpress/cli 0.0.13 → 0.0.15

package/dist/utils/prompt-utils.js

@@ -38,7 +38,7 @@ class CLIPrompt {
       this._logger.debug(`Confirming automatically: ${message}`);
       return true;
     }
-    const { confirm } = await (0, import_prompts.default)({
+    const { confirm } = await this._prompts({
       type: "confirm",
       name: "confirm",
       message,
@@ -50,7 +50,7 @@ class CLIPrompt {
     return true;
   }
   async password(message, opts) {
-    const { prompted } = await (0, import_prompts.default)({
+    const { prompted } = await this._prompts({
       type: "password",
       name: "prompted",
       message,
@@ -59,7 +59,7 @@ class CLIPrompt {
     return prompted ? prompted : void 0;
   }
   async select(message, opts) {
-    const { prompted } = await (0, import_prompts.default)({
+    const { prompted } = await this._prompts({
       type: "autocomplete",
       name: "prompted",
       message,
@@ -69,7 +69,7 @@ class CLIPrompt {
     return prompted ? prompted : void 0;
   }
   async text(message, opts) {
-    const { prompted } = await (0, import_prompts.default)({
+    const { prompted } = await this._prompts({
       type: "text",
       name: "prompted",
       message,
@@ -77,6 +77,10 @@ class CLIPrompt {
     });
     return prompted ? prompted : void 0;
   }
+  _prompts = (...args) => {
+    this._logger.cleanup();
+    return (0, import_prompts.default)(...args);
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run type-check && pnpm run bundle && pnpm run template:gen && pnpm run template:type-check",
@@ -20,7 +20,7 @@
   "main": "dist/index.js",
   "dependencies": {
     "@botpress/client": "0.0.11",
-    "@bpinternal/yargs-extra": "^0.0.2",
+    "@bpinternal/yargs-extra": "^0.0.3",
     "@parcel/watcher": "^2.1.0",
     "@types/lodash": "^4.14.191",
     "@types/node": "^18.11.17",
@@ -45,7 +45,7 @@
     "zod-to-json-schema": "^3.20.1"
   },
   "devDependencies": {
-    "@botpress/sdk": "0.0.9",
+    "@botpress/sdk": "0.0.11",
     "@types/bluebird": "^3.5.38",
     "@types/prompts": "^2.0.14",
     "@types/semver": "^7.3.11",

package/templates/echo-bot/package.json

@@ -1,6 +1,5 @@
 {
   "name": "echo-bot",
-  "version": "0.1.0",
   "scripts": {
     "type-check": "tsc --noEmit"
   },
@@ -10,7 +9,7 @@
   "license": "MIT",
   "dependencies": {
     "@botpress/client": "0.0.11",
-    "@botpress/sdk": "0.0.9",
+    "@botpress/sdk": "0.0.11",
     "zod": "^3.20.6"
   },
   "devDependencies": {

package/templates/empty-integration/.botpress/index.ts

@@ -1 +1,2 @@
-export * from './implementation'
+export * from './implementation'
+export * from './secrets'

package/templates/empty-integration/.botpress/secrets/index.ts

@@ -0,0 +1,7 @@
+/* tslint:disable */
+// This file is generated
+// Do not edit this file
+
+class Secrets {
+}
+export const secrets = new Secrets()

package/templates/empty-integration/integration.definition.ts

@@ -1,9 +1,9 @@
 import { IntegrationDefinition, messages } from '@botpress/sdk'
-import { version, name } from './package.json'
+import { name } from './package.json'
 
 export default new IntegrationDefinition({
   name,
-  version,
+  version: '0.0.1',
   public: false,
   channels: {
     channel: {

package/templates/empty-integration/package.json

@@ -1,6 +1,5 @@
 {
   "name": "empty-integration",
-  "version": "0.1.0",
   "scripts": {
     "type-check": "tsc --noEmit"
   },
@@ -10,7 +9,7 @@
   "license": "MIT",
   "dependencies": {
     "@botpress/client": "0.0.11",
-    "@botpress/sdk": "0.0.9",
+    "@botpress/sdk": "0.0.11",
     "zod": "^3.20.6"
   },
   "devDependencies": {

package/dist/app/api-utils.js

@@ -1,112 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var api_utils_exports = {};
-__export(api_utils_exports, {
-  ApiUtils: () => ApiUtils
-});
-module.exports = __toCommonJS(api_utils_exports);
-var import_client = require("@botpress/client");
-var import_lodash = __toESM(require("lodash"));
-var errors = __toESM(require("./errors"));
-var import_integration_ref = require("./integration-ref");
-class ApiUtils {
-  constructor(props, _logger) {
-    this._logger = _logger;
-    const { host, token, workspaceId } = props;
-    this.client = new import_client.Client({ host, token, workspaceId });
-    this.host = host;
-    this.token = token;
-    this.workspaceId = workspaceId;
-  }
-  client;
-  host;
-  token;
-  workspaceId;
-  async findIntegration(ref) {
-    const formatted = (0, import_integration_ref.formatIntegrationRef)(ref);
-    const privateIntegration = await this.findPrivateIntegration(ref);
-    if (privateIntegration) {
-      this._logger.debug(`Found integration "${formatted}" in workspace`);
-      return privateIntegration;
-    }
-    const publicIntegration = await this.findPublicIntegration(ref);
-    if (publicIntegration) {
-      this._logger.debug(`Found integration "${formatted}" in hub`);
-      return publicIntegration;
-    }
-    return;
-  }
-  async findPrivateIntegration(ref) {
-    if (ref.type === "id") {
-      return this.validateStatus(() => this.client.getIntegration(ref).then((r) => r.integration), [404, 500]);
-    }
-    return this.validateStatus(() => this.client.getIntegrationByName(ref).then((r) => r.integration), [404, 500]);
-  }
-  async findPublicIntegration(ref) {
-    if (ref.type === "id") {
-      return this.validateStatus(() => this.client.getPublicIntegrationById(ref).then((r) => r.integration), [404, 500]);
-    }
-    return this.validateStatus(() => this.client.getPublicIntegration(ref).then((r) => r.integration), [404, 500]);
-  }
-  async testLogin() {
-    try {
-      await this.client.listBots({});
-    } catch (thrown) {
-      throw errors.BotpressCLIError.wrap(thrown, "Authentication failed. Please check your credentials");
-    }
-  }
-  async listAllPages(lister, map) {
-    let nextToken;
-    const all = [];
-    do {
-      const { meta, ...r } = await lister({ nextToken });
-      all.push(r);
-      nextToken = meta.nextToken;
-    } while (nextToken);
-    if (!map) {
-      return all;
-    }
-    const mapped = all.flatMap((r) => map(r));
-    return mapped;
-  }
-  async validateStatus(fn, allowedStatuses) {
-    try {
-      const v = await fn();
-      return v;
-    } catch (thrown) {
-      const err = errors.BotpressCLIError.map(thrown);
-      const allowedStatusesArray = import_lodash.default.isArray(allowedStatuses) ? allowedStatuses : [allowedStatuses];
-      const isAllowed = err instanceof errors.HTTPError && err.status && allowedStatusesArray.includes(err.status);
-      if (isAllowed) {
-        return;
-      }
-      throw err;
-    }
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ApiUtils
-});

package/dist/app/base.js

@@ -1,71 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var base_exports = {};
-__export(base_exports, {
-  BaseCommands: () => BaseCommands
-});
-module.exports = __toCommonJS(base_exports);
-var import_prompts = __toESM(require("prompts"));
-var import_api_utils = require("./api-utils");
-var errors = __toESM(require("./errors"));
-class BaseCommands {
-  constructor(_props, _userCache, _logger) {
-    this._props = _props;
-    this._userCache = _userCache;
-    this._logger = _logger;
-  }
-  teardown() {
-    this._logger.cleanup();
-  }
-  async _ensureLoginAndCreateClient(argv) {
-    const token = await this._userCache.get("token");
-    const workspaceId = argv.workspaceId ?? await this._userCache.get("workspaceId");
-    const host = argv.host ?? await this._userCache.get("host");
-    if (!(token && workspaceId && host)) {
-      throw new errors.NotLoggedInError();
-    }
-    return new import_api_utils.ApiUtils({ host, token, workspaceId }, this._logger);
-  }
-  async _confirm(message) {
-    if (this._props.confirm) {
-      this._logger.debug(`Confirming automatically: ${message}`);
-      return true;
-    }
-    const { confirm } = await (0, import_prompts.default)({
-      type: "confirm",
-      name: "confirm",
-      message,
-      initial: false
-    });
-    if (!confirm) {
-      return false;
-    }
-    return true;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BaseCommands
-});

package/dist/app/cache.js

@@ -1,95 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var cache_exports = {};
-__export(cache_exports, {
-  FSConfigCache: () => FSConfigCache
-});
-module.exports = __toCommonJS(cache_exports);
-var import_fs = __toESM(require("fs"));
-var import_path = __toESM(require("path"));
-class FSConfigCache {
-  constructor(_filepath) {
-    this._filepath = _filepath;
-  }
-  static async loadFrom(filepath) {
-    const dirname = import_path.default.dirname(filepath);
-    if (!import_fs.default.existsSync(dirname)) {
-      await import_fs.default.promises.mkdir(dirname, { recursive: true });
-    }
-    if (!import_fs.default.existsSync(filepath)) {
-      await this._writeJSON(filepath, {});
-    }
-    return new FSConfigCache(filepath);
-  }
-  static _writeJSON = (filepath, data) => {
-    const fileContent = JSON.stringify(data, null, 2);
-    return import_fs.default.promises.writeFile(filepath, fileContent);
-  };
-  static _readJSON = async (filepath) => {
-    const fileContent = await import_fs.default.promises.readFile(filepath, "utf8");
-    return JSON.parse(fileContent);
-  };
-  async sync(key, value, prompt) {
-    if (value) {
-      await this.set(key, value);
-      return value;
-    }
-    const data = await this.get(key);
-    const newValue = await prompt(data);
-    await this.set(key, newValue);
-    return newValue;
-  }
-  async has(key) {
-    const data = await FSConfigCache._readJSON(this._filepath);
-    return data[key] !== void 0;
-  }
-  async get(key) {
-    const data = await FSConfigCache._readJSON(this._filepath);
-    return data[key];
-  }
-  async set(key, value) {
-    const data = await FSConfigCache._readJSON(this._filepath);
-    data[key] = value;
-    return FSConfigCache._writeJSON(this._filepath, data);
-  }
-  async rm(key) {
-    const data = await FSConfigCache._readJSON(this._filepath);
-    delete data[key];
-    return FSConfigCache._writeJSON(this._filepath, data);
-  }
-  async clear() {
-    return FSConfigCache._writeJSON(this._filepath, {});
-  }
-  async nuke() {
-    if (!import_fs.default.existsSync(this._filepath)) {
-      return;
-    }
-    import_fs.default.unlinkSync(this._filepath);
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  FSConfigCache
-});

package/dist/app/errors.js

@@ -1,156 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var errors_exports = {};
-__export(errors_exports, {
-  BotpressCLIError: () => BotpressCLIError,
-  ExclusiveBotFeatureError: () => ExclusiveBotFeatureError,
-  ExclusiveIntegrationFeatureError: () => ExclusiveIntegrationFeatureError,
-  HTTPError: () => HTTPError,
-  InvalidIntegrationReferenceError: () => InvalidIntegrationReferenceError,
-  NoBotsFoundError: () => NoBotsFoundError,
-  NoBundleFoundError: () => NoBundleFoundError,
-  NoWorkspacesFoundError: () => NoWorkspacesFoundError,
-  NotLoggedInError: () => NotLoggedInError,
-  ParamRequiredError: () => ParamRequiredError
-});
-module.exports = __toCommonJS(errors_exports);
-var import_client = require("@botpress/client");
-var import_axios = __toESM(require("axios"));
-var import_verror = require("verror");
-var consts = __toESM(require("../consts"));
-const isKnownApiError = (e) => (0, import_client.isApiError)(e) && !(e instanceof import_client.UnknownError);
-class BotpressCLIError extends import_verror.VError {
-  static wrap(thrown, message) {
-    const err = BotpressCLIError.map(thrown);
-    return new BotpressCLIError(err, message ?? "");
-  }
-  static map(thrown) {
-    if (thrown instanceof import_client.UnknownError) {
-      return new HTTPError(500, "An unknown error has occurred.");
-    }
-    if (isKnownApiError(thrown)) {
-      return HTTPError.fromApi(thrown);
-    }
-    if (import_axios.default.isAxiosError(thrown)) {
-      return HTTPError.fromAxios(thrown);
-    }
-    if (thrown instanceof Error) {
-      const { message } = thrown;
-      return new BotpressCLIError(message);
-    }
-    return new BotpressCLIError(`${thrown}`);
-  }
-}
-class ExclusiveBotFeatureError extends BotpressCLIError {
-  constructor() {
-    const message = "This feature is only available for bots. This project is an integration";
-    super(message);
-  }
-}
-class ExclusiveIntegrationFeatureError extends BotpressCLIError {
-  constructor() {
-    const message = "This feature is only available for integration. This project is a bot";
-    super(message);
-  }
-}
-class HTTPError extends BotpressCLIError {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-  static fromAxios(e) {
-    const message = this._axiosMsg(e);
-    return new HTTPError(e.response?.status, message);
-  }
-  static fromApi(e) {
-    const { message, code } = e;
-    return new HTTPError(code, message);
-  }
-  static _axiosMsg(e) {
-    let message = e.message;
-    if (e.response?.statusText) {
-      message += `
-  ${e.response?.statusText}`;
-    }
-    if (e.response?.status && e.request?.method && e.request?.path) {
-      message += `
-  (${e.response?.status}) ${e.request.method} ${e.request.path}`;
-    }
-    if (e.response?.data?.message) {
-      message += `
-  ${e.response?.data?.message}`;
-    }
-    return message;
-  }
-}
-class NoBundleFoundError extends BotpressCLIError {
-  constructor() {
-    const message = "No bundle found. Please run `bp bundle` first.";
-    super(message);
-  }
-}
-class NoBotsFoundError extends BotpressCLIError {
-  constructor() {
-    const message = `No Bot found in your Workspace. Please create one first at ${consts.defaultBotpressApp}.`;
-    super(message);
-  }
-}
-class NoWorkspacesFoundError extends BotpressCLIError {
-  constructor() {
-    const message = "No Workspace found. Please create one first.";
-    super(message);
-  }
-}
-class NotLoggedInError extends BotpressCLIError {
-  constructor() {
-    const message = "Not logged in. Please run `bp login` first.";
-    super(message);
-  }
-}
-class ParamRequiredError extends BotpressCLIError {
-  constructor(param) {
-    const message = `${param} is required.`;
-    super(message);
-  }
-}
-class InvalidIntegrationReferenceError extends BotpressCLIError {
-  constructor(ref) {
-    const message = `Invalid integration reference "${ref}".`;
-    super(message);
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BotpressCLIError,
-  ExclusiveBotFeatureError,
-  ExclusiveIntegrationFeatureError,
-  HTTPError,
-  InvalidIntegrationReferenceError,
-  NoBotsFoundError,
-  NoBundleFoundError,
-  NoWorkspacesFoundError,
-  NotLoggedInError,
-  ParamRequiredError
-});

package/dist/app/file-paths.js

@@ -1,79 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var file_paths_exports = {};
-__export(file_paths_exports, {
-  ProjectPaths: () => ProjectPaths,
-  UserPaths: () => UserPaths
-});
-module.exports = __toCommonJS(file_paths_exports);
-var import_lodash = __toESM(require("lodash"));
-var consts = __toESM(require("../consts"));
-var pathutils = __toESM(require("../path-utils"));
-class ProjectPaths {
-  abs;
-  constructor({ workDir, entryPoint, outDir }) {
-    const absWorkDir = pathutils.absoluteFrom(pathutils.cwd(), workDir);
-    const absEntrypoint = pathutils.absoluteFrom(absWorkDir, entryPoint);
-    const absOutDir = pathutils.absoluteFrom(absWorkDir, outDir);
-    this.abs = {
-      workDir: absWorkDir,
-      entryPoint: absEntrypoint,
-      outDir: absOutDir,
-      ...import_lodash.default.mapValues(consts.fromOutDir, (p) => pathutils.absoluteFrom(absOutDir, p)),
-      ...import_lodash.default.mapValues(consts.fromWorkDir, (p) => pathutils.absoluteFrom(absWorkDir, p))
-    };
-  }
-  get rel() {
-    return this.relFrom("workDir");
-  }
-  relFrom(dir) {
-    const from = this.abs[dir];
-    return import_lodash.default.mapValues(this.abs, (to) => pathutils.relativeFrom(from, to));
-  }
-}
-class UserPaths {
-  abs;
-  constructor({ botpressHomeDir, cliRootDir: absCliRootDir }) {
-    const absBotpressHome = pathutils.absoluteFrom(pathutils.cwd(), botpressHomeDir);
-    this.abs = {
-      cliRootDir: absCliRootDir,
-      botpressHomeDir: absBotpressHome,
-      ...import_lodash.default.mapValues(consts.fromHomeDir, (p) => pathutils.absoluteFrom(absBotpressHome, p)),
-      ...import_lodash.default.mapValues(consts.fromCliRootDir, (p) => pathutils.absoluteFrom(absCliRootDir, p))
-    };
-  }
-  get rel() {
-    return this.relFrom("botpressHomeDir");
-  }
-  relFrom(dir) {
-    const from = this.abs[dir];
-    return import_lodash.default.mapValues(this.abs, (to) => pathutils.relativeFrom(from, to));
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ProjectPaths,
-  UserPaths
-});