@botpress/cli 0.2.2 → 0.2.4

package/dist/command-implementations/base-command.js

@@ -55,7 +55,7 @@ class BaseCommand {
         await this.teardown();
       }
     }
-    process.exit(exitCode);
+    return { exitCode };
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/command-implementations/base-command.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/base-command.ts"],
-  "sourcesContent": ["import * as errors from '../errors'\nimport type { Logger } from '../logger'\nimport type { CommandArgv, CommandDefinition } from '../typings'\n\nexport abstract class BaseCommand<C extends CommandDefinition> {\n  public constructor(protected readonly logger: Logger, protected readonly argv: CommandArgv<C>) {}\n\n  protected abstract run(): Promise<void>\n  protected abstract bootstrap?: () => Promise<void>\n  protected abstract teardown?: () => Promise<void>\n\n  public async handler(): Promise<never> {\n    let exitCode = 0\n    try {\n      if (this.bootstrap) {\n        await this.bootstrap()\n      }\n      await this.run()\n    } catch (thrown) {\n      const error = errors.BotpressCLIError.map(thrown)\n\n      if (error.debug) {\n        const msg = error.message + ' (Run with verbose flag (-v) to see more details)'\n        this.logger.error(msg)\n        this.logger.debug(error.debug)\n      } else {\n        this.logger.error(error.message)\n      }\n\n      exitCode = 1\n    } finally {\n      if (this.teardown) {\n        await this.teardown()\n      }\n    }\n\n    process.exit(exitCode)\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,aAAwB;AAIjB,MAAe,YAAyC;AAAA,EACtD,YAA+B,QAAmC,MAAsB;AAAzD;AAAmC;AAAA,EAAuB;AAAA,EAMhG,MAAa,UAA0B;AACrC,QAAI,WAAW;AACf,QAAI;AACF,UAAI,KAAK,WAAW;AAClB,cAAM,KAAK,UAAU;AAAA,MACvB;AACA,YAAM,KAAK,IAAI;AAAA,IACjB,SAAS,QAAP;AACA,YAAM,QAAQ,OAAO,iBAAiB,IAAI,MAAM;AAEhD,UAAI,MAAM,OAAO;AACf,cAAM,MAAM,MAAM,UAAU;AAC5B,aAAK,OAAO,MAAM,GAAG;AACrB,aAAK,OAAO,MAAM,MAAM,KAAK;AAAA,MAC/B,OAAO;AACL,aAAK,OAAO,MAAM,MAAM,OAAO;AAAA,MACjC;AAEA,iBAAW;AAAA,IACb,UAAE;AACA,UAAI,KAAK,UAAU;AACjB,cAAM,KAAK,SAAS;AAAA,MACtB;AAAA,IACF;AAEA,YAAQ,KAAK,QAAQ;AAAA,EACvB;AACF;",
+  "sourcesContent": ["import * as errors from '../errors'\nimport type { Logger } from '../logger'\nimport type { CommandArgv, CommandDefinition } from '../typings'\n\nexport abstract class BaseCommand<C extends CommandDefinition> {\n  public constructor(protected readonly logger: Logger, protected readonly argv: CommandArgv<C>) {}\n\n  protected abstract run(): Promise<void>\n  protected abstract bootstrap?: () => Promise<void>\n  protected abstract teardown?: () => Promise<void>\n\n  public async handler(): Promise<{ exitCode: number }> {\n    let exitCode = 0\n    try {\n      if (this.bootstrap) {\n        await this.bootstrap()\n      }\n      await this.run()\n    } catch (thrown) {\n      const error = errors.BotpressCLIError.map(thrown)\n\n      if (error.debug) {\n        const msg = error.message + ' (Run with verbose flag (-v) to see more details)'\n        this.logger.error(msg)\n        this.logger.debug(error.debug)\n      } else {\n        this.logger.error(error.message)\n      }\n\n      exitCode = 1\n    } finally {\n      if (this.teardown) {\n        await this.teardown()\n      }\n    }\n\n    return { exitCode }\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,aAAwB;AAIjB,MAAe,YAAyC;AAAA,EACtD,YAA+B,QAAmC,MAAsB;AAAzD;AAAmC;AAAA,EAAuB;AAAA,EAMhG,MAAa,UAAyC;AACpD,QAAI,WAAW;AACf,QAAI;AACF,UAAI,KAAK,WAAW;AAClB,cAAM,KAAK,UAAU;AAAA,MACvB;AACA,YAAM,KAAK,IAAI;AAAA,IACjB,SAAS,QAAP;AACA,YAAM,QAAQ,OAAO,iBAAiB,IAAI,MAAM;AAEhD,UAAI,MAAM,OAAO;AACf,cAAM,MAAM,MAAM,UAAU;AAC5B,aAAK,OAAO,MAAM,GAAG;AACrB,aAAK,OAAO,MAAM,MAAM,KAAK;AAAA,MAC/B,OAAO;AACL,aAAK,OAAO,MAAM,MAAM,OAAO;AAAA,MACjC;AAEA,iBAAW;AAAA,IACb,UAAE;AACA,UAAI,KAAK,UAAU;AACjB,cAAM,KAAK,SAAS;AAAA,MACtB;AAAA,IACF;AAEA,WAAO,EAAE,SAAS;AAAA,EACpB;AACF;",
   "names": []
 }

package/dist/command-implementations/dev-command.js

@@ -38,6 +38,7 @@ var import_build_command = require("./build-command");
 var import_project_command = require("./project-command");
 const DEFAULT_BOT_PORT = 8075;
 const DEFAULT_INTEGRATION_PORT = 8076;
+const TUNNEL_HELLO_INTERVAL = 5e3;
 class DevCommand extends import_project_command.ProjectCommand {
   _initialDef = void 0;
   async run() {
@@ -71,6 +72,8 @@ class DevCommand extends import_project_command.ProjectCommand {
     });
     const supervisor = new utils.tunnel.TunnelSupervisor(wsTunnelUrl, tunnelId, this.logger);
     supervisor.events.on("connected", ({ tunnel }) => {
+      const timer = setInterval(() => tunnel.hello(), TUNNEL_HELLO_INTERVAL);
+      tunnel.events.on("close", () => clearInterval(timer));
       tunnel.events.on(
         "request",
         (req) => void this._forwardTunnelRequest(`http://localhost:${port}`, req).then((res) => {
@@ -87,8 +90,8 @@ class DevCommand extends import_project_command.ProjectCommand {
       );
     });
     await supervisor.start();
-    await this._deploy(api, httpTunnelUrl);
     await this._runBuild();
+    await this._deploy(api, httpTunnelUrl);
     const worker = await this._spawnWorker(env, port);
     try {
       const watcher = await utils.filewatcher.FileWatcher.watch(
@@ -120,7 +123,6 @@ class DevCommand extends import_project_command.ProjectCommand {
     }
   }
   _restart = async (api, worker, tunnelUrl) => {
-    await this._deploy(api, tunnelUrl);
     try {
       await this._runBuild();
     } catch (thrown) {
@@ -128,6 +130,7 @@ class DevCommand extends import_project_command.ProjectCommand {
       this.logger.error(error.message);
       return;
     }
+    await this._deploy(api, tunnelUrl);
     await worker.reload();
   };
   _deploy = async (api, tunnelUrl) => {

package/dist/command-implementations/dev-command.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/dev-command.ts"],
-  "sourcesContent": ["import type * as bpclient from '@botpress/client'\nimport type { Bot as BotImpl, IntegrationDefinition } from '@botpress/sdk'\nimport { TunnelRequest, TunnelResponse } from '@bpinternal/tunnel'\nimport axios, { AxiosRequestConfig, AxiosResponse } from 'axios'\nimport chalk from 'chalk'\nimport * as pathlib from 'path'\nimport * as uuid from 'uuid'\nimport type { ApiClient } from '../api-client'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { Worker } from '../worker'\nimport { BuildCommand } from './build-command'\nimport { ProjectCommand } from './project-command'\n\nconst DEFAULT_BOT_PORT = 8075\nconst DEFAULT_INTEGRATION_PORT = 8076\n\nexport type DevCommandDefinition = typeof commandDefinitions.dev\nexport class DevCommand extends ProjectCommand<DevCommandDefinition> {\n  private _initialDef: IntegrationDefinition | undefined = undefined\n\n  public async run(): Promise<void> {\n    this.logger.warn('This command is experimental and subject to breaking changes without notice.')\n\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n\n    this._initialDef = await this.readIntegrationDefinitionFromFS()\n\n    let env: Record<string, string> = {\n      ...process.env,\n      BP_API_URL: api.url,\n      BP_TOKEN: api.token,\n    }\n\n    let defaultPort = DEFAULT_BOT_PORT\n    if (this._initialDef) {\n      defaultPort = DEFAULT_INTEGRATION_PORT\n      const secrets = await this.promptSecrets(this._initialDef, this.argv)\n      env = { ...env, ...secrets }\n    }\n\n    const port = this.argv.port ?? defaultPort\n\n    const urlParseResult = utils.url.parse(this.argv.tunnelUrl)\n    if (urlParseResult.status === 'error') {\n      throw new errors.BotpressCLIError(`Invalid tunnel URL: ${urlParseResult.error}`)\n    }\n\n    const tunnelId = uuid.v4()\n\n    const { url: parsedTunnelUrl } = urlParseResult\n    const isSecured = parsedTunnelUrl.protocol === 'https' || parsedTunnelUrl.protocol === 'wss'\n\n    const wsTunnelUrl: string = utils.url.format({ ...parsedTunnelUrl, protocol: isSecured ? 'wss' : 'ws' })\n    const httpTunnelUrl: string = utils.url.format({\n      ...parsedTunnelUrl,\n      protocol: isSecured ? 'https' : 'http',\n      path: `/${tunnelId}`,\n    })\n\n    const supervisor = new utils.tunnel.TunnelSupervisor(wsTunnelUrl, tunnelId, this.logger)\n    supervisor.events.on('connected', ({ tunnel }) => {\n      tunnel.events.on(\n        'request',\n        (req) =>\n          void this._forwardTunnelRequest(`http://localhost:${port}`, req)\n            .then((res) => {\n              tunnel.send(res)\n            })\n            .catch((thrown) => {\n              const err = errors.BotpressCLIError.wrap(thrown, 'An error occurred while handling request')\n              this.logger.error(err.message)\n              tunnel.send({\n                requestId: req.id,\n                status: 500,\n                body: err.message,\n              })\n            })\n      )\n    })\n    await supervisor.start()\n\n    await this._deploy(api, httpTunnelUrl)\n    await this._runBuild()\n    const worker = await this._spawnWorker(env, port)\n\n    try {\n      const watcher = await utils.filewatcher.FileWatcher.watch(\n        this.argv.workDir,\n        async (events) => {\n          const typescriptEvents = events.filter((e) => pathlib.extname(e.path) === '.ts')\n          if (typescriptEvents.length === 0) {\n            return\n          }\n\n          this.logger.log('Changes detected, rebuilding')\n          await this._restart(api, worker, httpTunnelUrl)\n        },\n        {\n          ignore: [this.projectPaths.abs.outDir],\n        }\n      )\n\n      await Promise.race([worker.wait(), watcher.wait(), supervisor.wait()])\n\n      if (worker.running) {\n        await worker.kill()\n      }\n      await watcher.close()\n      supervisor.close()\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, 'An error occurred while running the dev server')\n    } finally {\n      if (worker.running) {\n        await worker.kill()\n      }\n    }\n  }\n\n  private _restart = async (api: ApiClient, worker: Worker, tunnelUrl: string) => {\n    await this._deploy(api, tunnelUrl)\n\n    try {\n      await this._runBuild()\n    } catch (thrown) {\n      const error = errors.BotpressCLIError.wrap(thrown, 'Build failed')\n      this.logger.error(error.message)\n      return\n    }\n\n    await worker.reload()\n  }\n\n  private _deploy = async (api: ApiClient, tunnelUrl: string) => {\n    const integrationDef = await this.readIntegrationDefinitionFromFS()\n    if (integrationDef) {\n      this._checkSecrets(integrationDef)\n      await this._deployDevIntegration(api, tunnelUrl, integrationDef)\n    } else {\n      await this._deployDevBot(api, tunnelUrl)\n    }\n  }\n\n  private _checkSecrets(integrationDef: IntegrationDefinition) {\n    const initialSecrets = this._initialDef?.secrets ?? []\n    const currentSecrets = integrationDef.secrets ?? []\n    const newSecrets = currentSecrets.filter((s) => !initialSecrets.includes(s))\n    if (newSecrets.length > 0) {\n      throw new errors.BotpressCLIError('Secrets were added while the server was running. A restart is required.')\n    }\n  }\n\n  private _spawnWorker = async (env: Record<string, string>, port: number) => {\n    const outfile = this.projectPaths.abs.outFile\n    const importPath = utils.path.toUnix(outfile)\n    const requireFrom = utils.path.rmExtension(importPath)\n    const code = `require('${requireFrom}').default.start(${port})`\n    const worker = await Worker.spawn(\n      {\n        type: 'code',\n        code,\n        env,\n      },\n      this.logger\n    ).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not start dev worker')\n    })\n\n    return worker\n  }\n\n  private _runBuild() {\n    return new BuildCommand(this.api, this.prompt, this.logger, this.argv).run()\n  }\n\n  private async _deployDevIntegration(\n    api: ApiClient,\n    externalUrl: string,\n    integrationDef: IntegrationDefinition\n  ): Promise<void> {\n    const devId = await this.projectCache.get('devId')\n\n    let integration: bpclient.Integration | undefined = undefined\n\n    if (devId) {\n      const resp = await api.client.getIntegration({ id: devId }).catch(async (thrown) => {\n        const err = errors.BotpressCLIError.wrap(thrown, `Could not find existing dev integration with id \"${devId}\"`)\n        this.logger.warn(err.message)\n        return { integration: undefined }\n      })\n\n      if (resp.integration?.dev) {\n        integration = resp.integration\n      } else {\n        await this.projectCache.rm('devId')\n      }\n    }\n\n    const line = this.logger.line()\n    line.started(`Deploying dev integration ${chalk.bold(integrationDef.name)}...`)\n    if (integration) {\n      const resp = await api.client\n        .updateIntegration({ ...integrationDef, id: integration.id, url: externalUrl })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, `Could not update dev integration \"${integrationDef.name}\"`)\n        })\n      integration = resp.integration\n    } else {\n      const resp = await api.client\n        .createIntegration({ ...integrationDef, dev: true, url: externalUrl })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, `Could not deploy dev integration \"${integrationDef.name}\"`)\n        })\n      integration = resp.integration\n    }\n\n    line.success(`Dev Integration deployed with id \"${integration.id}\"`)\n    await this.projectCache.set('devId', integration.id)\n  }\n\n  private async _deployDevBot(api: ApiClient, externalUrl: string): Promise<void> {\n    const devId = await this.projectCache.get('devId')\n\n    let bot: bpclient.Bot | undefined = undefined\n\n    if (devId) {\n      const resp = await api.client.getBot({ id: devId }).catch(async (thrown) => {\n        const err = errors.BotpressCLIError.wrap(thrown, `Could not find existing dev bot with id \"${devId}\"`)\n        this.logger.warn(err.message)\n        return { bot: undefined }\n      })\n\n      if (resp.bot?.dev) {\n        bot = resp.bot\n      } else {\n        await this.projectCache.rm('devId')\n      }\n    }\n\n    if (!bot) {\n      const createLine = this.logger.line()\n      createLine.started('Creating dev bot...')\n      const resp = await api.client\n        .createBot({\n          dev: true,\n          url: externalUrl,\n        })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, 'Could not deploy dev bot')\n        })\n\n      bot = resp.bot\n      createLine.success(`Dev Bot created with id \"${bot.id}\"`)\n      await this.projectCache.set('devId', bot.id)\n    }\n\n    const outfile = this.projectPaths.abs.outFile\n    const { default: botImpl } = utils.require.requireJsFile<{ default: BotImpl }>(outfile)\n\n    const integrations = this.prepareIntegrations(botImpl, bot)\n\n    const updateLine = this.logger.line()\n    updateLine.started('Deploying dev bot...')\n\n    const { bot: updatedBot } = await api.client\n      .updateBot({\n        ...botImpl.definition,\n        id: bot.id,\n        integrations,\n        url: externalUrl,\n      })\n      .catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, 'Could not deploy dev bot')\n      })\n    updateLine.success(`Dev Bot deployed with id \"${updatedBot.id}\"`)\n\n    this.displayWebhookUrls(updatedBot)\n  }\n\n  private _forwardTunnelRequest = async (baseUrl: string, request: TunnelRequest): Promise<TunnelResponse> => {\n    const axiosConfig = {\n      method: request.method,\n      url: this._formatLocalUrl(baseUrl, request),\n      headers: request.headers,\n      data: request.body,\n      responseType: 'text',\n      validateStatus: () => true,\n    } satisfies AxiosRequestConfig\n\n    this.logger.debug(`Forwarding request to ${axiosConfig.url}`)\n    const response = await axios(axiosConfig)\n    this.logger.debug('Sending back response up the tunnel')\n\n    return {\n      requestId: request.id,\n      status: response.status,\n      headers: this._getHeaders(response.headers),\n      body: response.data,\n    }\n  }\n\n  private _formatLocalUrl = (baseUrl: string, req: TunnelRequest): string => {\n    if (req.query) {\n      return `${baseUrl}${req.path}?${req.query}`\n    }\n    return `${baseUrl}${req.path}`\n  }\n\n  private _getHeaders = (res: AxiosResponse['headers']): TunnelResponse['headers'] => {\n    const headers: TunnelResponse['headers'] = {}\n    for (const key in res) {\n      if (typeof res[key] === 'string' || typeof res[key] === 'number') {\n        headers[key] = res[key]\n      }\n    }\n    return headers\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type * as bpclient from '@botpress/client'\nimport type { Bot as BotImpl, IntegrationDefinition } from '@botpress/sdk'\nimport { TunnelRequest, TunnelResponse } from '@bpinternal/tunnel'\nimport axios, { AxiosRequestConfig, AxiosResponse } from 'axios'\nimport chalk from 'chalk'\nimport * as pathlib from 'path'\nimport * as uuid from 'uuid'\nimport type { ApiClient } from '../api-client'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { Worker } from '../worker'\nimport { BuildCommand } from './build-command'\nimport { ProjectCommand } from './project-command'\n\nconst DEFAULT_BOT_PORT = 8075\nconst DEFAULT_INTEGRATION_PORT = 8076\nconst TUNNEL_HELLO_INTERVAL = 5000\n\nexport type DevCommandDefinition = typeof commandDefinitions.dev\nexport class DevCommand extends ProjectCommand<DevCommandDefinition> {\n  private _initialDef: IntegrationDefinition | undefined = undefined\n\n  public async run(): Promise<void> {\n    this.logger.warn('This command is experimental and subject to breaking changes without notice.')\n\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n\n    this._initialDef = await this.readIntegrationDefinitionFromFS()\n\n    let env: Record<string, string> = {\n      ...process.env,\n      BP_API_URL: api.url,\n      BP_TOKEN: api.token,\n    }\n\n    let defaultPort = DEFAULT_BOT_PORT\n    if (this._initialDef) {\n      defaultPort = DEFAULT_INTEGRATION_PORT\n      const secrets = await this.promptSecrets(this._initialDef, this.argv)\n      env = { ...env, ...secrets }\n    }\n\n    const port = this.argv.port ?? defaultPort\n\n    const urlParseResult = utils.url.parse(this.argv.tunnelUrl)\n    if (urlParseResult.status === 'error') {\n      throw new errors.BotpressCLIError(`Invalid tunnel URL: ${urlParseResult.error}`)\n    }\n\n    const tunnelId = uuid.v4()\n\n    const { url: parsedTunnelUrl } = urlParseResult\n    const isSecured = parsedTunnelUrl.protocol === 'https' || parsedTunnelUrl.protocol === 'wss'\n\n    const wsTunnelUrl: string = utils.url.format({ ...parsedTunnelUrl, protocol: isSecured ? 'wss' : 'ws' })\n    const httpTunnelUrl: string = utils.url.format({\n      ...parsedTunnelUrl,\n      protocol: isSecured ? 'https' : 'http',\n      path: `/${tunnelId}`,\n    })\n\n    const supervisor = new utils.tunnel.TunnelSupervisor(wsTunnelUrl, tunnelId, this.logger)\n    supervisor.events.on('connected', ({ tunnel }) => {\n      // prevents the tunnel from closing due to inactivity\n      const timer = setInterval(() => tunnel.hello(), TUNNEL_HELLO_INTERVAL)\n      tunnel.events.on('close', () => clearInterval(timer))\n\n      tunnel.events.on(\n        'request',\n        (req) =>\n          void this._forwardTunnelRequest(`http://localhost:${port}`, req)\n            .then((res) => {\n              tunnel.send(res)\n            })\n            .catch((thrown) => {\n              const err = errors.BotpressCLIError.wrap(thrown, 'An error occurred while handling request')\n              this.logger.error(err.message)\n              tunnel.send({\n                requestId: req.id,\n                status: 500,\n                body: err.message,\n              })\n            })\n      )\n    })\n    await supervisor.start()\n\n    await this._runBuild()\n    await this._deploy(api, httpTunnelUrl)\n    const worker = await this._spawnWorker(env, port)\n\n    try {\n      const watcher = await utils.filewatcher.FileWatcher.watch(\n        this.argv.workDir,\n        async (events) => {\n          const typescriptEvents = events.filter((e) => pathlib.extname(e.path) === '.ts')\n          if (typescriptEvents.length === 0) {\n            return\n          }\n\n          this.logger.log('Changes detected, rebuilding')\n          await this._restart(api, worker, httpTunnelUrl)\n        },\n        {\n          ignore: [this.projectPaths.abs.outDir],\n        }\n      )\n\n      await Promise.race([worker.wait(), watcher.wait(), supervisor.wait()])\n\n      if (worker.running) {\n        await worker.kill()\n      }\n      await watcher.close()\n      supervisor.close()\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, 'An error occurred while running the dev server')\n    } finally {\n      if (worker.running) {\n        await worker.kill()\n      }\n    }\n  }\n\n  private _restart = async (api: ApiClient, worker: Worker, tunnelUrl: string) => {\n    try {\n      await this._runBuild()\n    } catch (thrown) {\n      const error = errors.BotpressCLIError.wrap(thrown, 'Build failed')\n      this.logger.error(error.message)\n      return\n    }\n\n    await this._deploy(api, tunnelUrl)\n    await worker.reload()\n  }\n\n  private _deploy = async (api: ApiClient, tunnelUrl: string) => {\n    const integrationDef = await this.readIntegrationDefinitionFromFS()\n    if (integrationDef) {\n      this._checkSecrets(integrationDef)\n      await this._deployDevIntegration(api, tunnelUrl, integrationDef)\n    } else {\n      await this._deployDevBot(api, tunnelUrl)\n    }\n  }\n\n  private _checkSecrets(integrationDef: IntegrationDefinition) {\n    const initialSecrets = this._initialDef?.secrets ?? []\n    const currentSecrets = integrationDef.secrets ?? []\n    const newSecrets = currentSecrets.filter((s) => !initialSecrets.includes(s))\n    if (newSecrets.length > 0) {\n      throw new errors.BotpressCLIError('Secrets were added while the server was running. A restart is required.')\n    }\n  }\n\n  private _spawnWorker = async (env: Record<string, string>, port: number) => {\n    const outfile = this.projectPaths.abs.outFile\n    const importPath = utils.path.toUnix(outfile)\n    const requireFrom = utils.path.rmExtension(importPath)\n    const code = `require('${requireFrom}').default.start(${port})`\n    const worker = await Worker.spawn(\n      {\n        type: 'code',\n        code,\n        env,\n      },\n      this.logger\n    ).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not start dev worker')\n    })\n\n    return worker\n  }\n\n  private _runBuild() {\n    return new BuildCommand(this.api, this.prompt, this.logger, this.argv).run()\n  }\n\n  private async _deployDevIntegration(\n    api: ApiClient,\n    externalUrl: string,\n    integrationDef: IntegrationDefinition\n  ): Promise<void> {\n    const devId = await this.projectCache.get('devId')\n\n    let integration: bpclient.Integration | undefined = undefined\n\n    if (devId) {\n      const resp = await api.client.getIntegration({ id: devId }).catch(async (thrown) => {\n        const err = errors.BotpressCLIError.wrap(thrown, `Could not find existing dev integration with id \"${devId}\"`)\n        this.logger.warn(err.message)\n        return { integration: undefined }\n      })\n\n      if (resp.integration?.dev) {\n        integration = resp.integration\n      } else {\n        await this.projectCache.rm('devId')\n      }\n    }\n\n    const line = this.logger.line()\n    line.started(`Deploying dev integration ${chalk.bold(integrationDef.name)}...`)\n    if (integration) {\n      const resp = await api.client\n        .updateIntegration({ ...integrationDef, id: integration.id, url: externalUrl })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, `Could not update dev integration \"${integrationDef.name}\"`)\n        })\n      integration = resp.integration\n    } else {\n      const resp = await api.client\n        .createIntegration({ ...integrationDef, dev: true, url: externalUrl })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, `Could not deploy dev integration \"${integrationDef.name}\"`)\n        })\n      integration = resp.integration\n    }\n\n    line.success(`Dev Integration deployed with id \"${integration.id}\"`)\n    await this.projectCache.set('devId', integration.id)\n  }\n\n  private async _deployDevBot(api: ApiClient, externalUrl: string): Promise<void> {\n    const devId = await this.projectCache.get('devId')\n\n    let bot: bpclient.Bot | undefined = undefined\n\n    if (devId) {\n      const resp = await api.client.getBot({ id: devId }).catch(async (thrown) => {\n        const err = errors.BotpressCLIError.wrap(thrown, `Could not find existing dev bot with id \"${devId}\"`)\n        this.logger.warn(err.message)\n        return { bot: undefined }\n      })\n\n      if (resp.bot?.dev) {\n        bot = resp.bot\n      } else {\n        await this.projectCache.rm('devId')\n      }\n    }\n\n    if (!bot) {\n      const createLine = this.logger.line()\n      createLine.started('Creating dev bot...')\n      const resp = await api.client\n        .createBot({\n          dev: true,\n          url: externalUrl,\n        })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, 'Could not deploy dev bot')\n        })\n\n      bot = resp.bot\n      createLine.success(`Dev Bot created with id \"${bot.id}\"`)\n      await this.projectCache.set('devId', bot.id)\n    }\n\n    const outfile = this.projectPaths.abs.outFile\n    const { default: botImpl } = utils.require.requireJsFile<{ default: BotImpl }>(outfile)\n\n    const integrations = this.prepareIntegrations(botImpl, bot)\n\n    const updateLine = this.logger.line()\n    updateLine.started('Deploying dev bot...')\n\n    const { bot: updatedBot } = await api.client\n      .updateBot({\n        ...botImpl.definition,\n        id: bot.id,\n        integrations,\n        url: externalUrl,\n      })\n      .catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, 'Could not deploy dev bot')\n      })\n    updateLine.success(`Dev Bot deployed with id \"${updatedBot.id}\"`)\n\n    this.displayWebhookUrls(updatedBot)\n  }\n\n  private _forwardTunnelRequest = async (baseUrl: string, request: TunnelRequest): Promise<TunnelResponse> => {\n    const axiosConfig = {\n      method: request.method,\n      url: this._formatLocalUrl(baseUrl, request),\n      headers: request.headers,\n      data: request.body,\n      responseType: 'text',\n      validateStatus: () => true,\n    } satisfies AxiosRequestConfig\n\n    this.logger.debug(`Forwarding request to ${axiosConfig.url}`)\n    const response = await axios(axiosConfig)\n    this.logger.debug('Sending back response up the tunnel')\n\n    return {\n      requestId: request.id,\n      status: response.status,\n      headers: this._getHeaders(response.headers),\n      body: response.data,\n    }\n  }\n\n  private _formatLocalUrl = (baseUrl: string, req: TunnelRequest): string => {\n    if (req.query) {\n      return `${baseUrl}${req.path}?${req.query}`\n    }\n    return `${baseUrl}${req.path}`\n  }\n\n  private _getHeaders = (res: AxiosResponse['headers']): TunnelResponse['headers'] => {\n    const headers: TunnelResponse['headers'] = {}\n    for (const key in res) {\n      if (typeof res[key] === 'string' || typeof res[key] === 'number') {\n        headers[key] = res[key]\n      }\n    }\n    return headers\n  }\n}\n"],
+  "mappings": "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",
   "names": ["chalk", "axios"]
 }

package/dist/command-implementations/global-command.js

@@ -41,10 +41,10 @@ class GlobalPaths extends utils.path.PathStore {
   constructor(argv) {
     const absBotpressHome = utils.path.absoluteFrom(utils.path.cwd(), argv.botpressHome);
     super({
-      cliRootDir: argv.cliRootDir,
+      cliRootDir: consts.cliRootDir,
       botpressHomeDir: absBotpressHome,
       ...import_lodash.default.mapValues(consts.fromHomeDir, (p) => utils.path.absoluteFrom(absBotpressHome, p)),
-      ...import_lodash.default.mapValues(consts.fromCliRootDir, (p) => utils.path.absoluteFrom(argv.cliRootDir, p))
+      ...import_lodash.default.mapValues(consts.fromCliRootDir, (p) => utils.path.absoluteFrom(consts.cliRootDir, p))
     });
   }
 }

package/dist/command-implementations/global-command.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/global-command.ts"],
-  "sourcesContent": ["import type { YargsConfig } from '@bpinternal/yargs-extra'\nimport chalk from 'chalk'\nimport fs from 'fs'\nimport latestVersion from 'latest-version'\nimport _ from 'lodash'\nimport * as pathlib from 'path'\nimport semver from 'semver'\nimport type { ApiClientFactory } from '../api-client'\nimport type * as config from '../config'\nimport * as consts from '../consts'\nimport * as errors from '../errors'\nimport type { CommandArgv, CommandDefinition } from '../typings'\nimport * as utils from '../utils'\nimport { BaseCommand } from './base-command'\n\nexport type GlobalCommandDefinition = CommandDefinition<typeof config.schemas.global>\nexport type GlobalCache = { apiUrl: string; token: string; workspaceId: string }\n\nexport type ConfigurableGlobalPaths = { botpressHomeDir: string; cliRootDir: utils.path.AbsolutePath }\nexport type ConstantGlobalPaths = typeof consts.fromHomeDir & typeof consts.fromCliRootDir\nexport type AllGlobalPaths = ConfigurableGlobalPaths & ConstantGlobalPaths\n\nclass GlobalPaths extends utils.path.PathStore<keyof AllGlobalPaths> {\n  public constructor(argv: CommandArgv<GlobalCommandDefinition>) {\n    const absBotpressHome = utils.path.absoluteFrom(utils.path.cwd(), argv.botpressHome)\n    super({\n      cliRootDir: argv.cliRootDir,\n      botpressHomeDir: absBotpressHome,\n      ..._.mapValues(consts.fromHomeDir, (p) => utils.path.absoluteFrom(absBotpressHome, p)),\n      ..._.mapValues(consts.fromCliRootDir, (p) => utils.path.absoluteFrom(argv.cliRootDir, p)),\n    })\n  }\n}\n\ntype PackageJson = { name: string; version: string }\n\nconst UPDATE_MSG = (props: PackageJson & { latest: string }) =>\n  `${chalk.bold('Update available')} ${chalk.dim(props.version)} \u2192 ${chalk.green(props.latest)}\n\nTo update, run:\n  for npm  ${chalk.cyan(`npm i -g ${props.name}`)}\n  for yarn ${chalk.cyan(`yarn global add ${props.name}`)}\n  for pnpm ${chalk.cyan(`pnpm i -g ${props.name}`)}`\n\nexport abstract class GlobalCommand<C extends GlobalCommandDefinition> extends BaseCommand<C> {\n  protected api: ApiClientFactory\n  protected prompt: utils.prompt.CLIPrompt\n\n  public constructor(\n    api: ApiClientFactory,\n    prompt: utils.prompt.CLIPrompt,\n    ...args: ConstructorParameters<typeof BaseCommand<C>>\n  ) {\n    super(...args)\n    this.api = api\n    this.prompt = prompt\n  }\n\n  protected get globalPaths() {\n    return new GlobalPaths(this.argv)\n  }\n\n  protected get globalCache() {\n    return new utils.cache.FSKeyValueCache<GlobalCache>(this.globalPaths.abs.globalCacheFile)\n  }\n\n  protected override bootstrap = async () => {\n    const pkgJson = await this._readPackageJson()\n\n    const versionText = chalk.bold(`v${pkgJson.version}`)\n    this.logger.log(`Botpress CLI ${versionText}`, { prefix: '\uD83E\uDD16' })\n\n    await this._notifyUpdate(pkgJson)\n\n    const paths = this.globalPaths\n    if (paths.abs.botpressHomeDir !== consts.defaultBotpressHome) {\n      this.logger.log(`Using custom botpress home: ${paths.abs.botpressHomeDir}`, { prefix: '\uD83C\uDFE0' })\n    }\n  }\n\n  protected override teardown = async () => {\n    this.logger.cleanup()\n  }\n\n  protected async ensureLoginAndCreateClient(credentials: YargsConfig<typeof config.schemas.credentials>) {\n    const cache = this.globalCache\n    const token = await cache.get('token')\n    const workspaceId = credentials.workspaceId ?? (await cache.get('workspaceId'))\n    const apiUrl = credentials.apiUrl ?? (await cache.get('apiUrl'))\n\n    if (!(token && workspaceId && apiUrl)) {\n      throw new errors.NotLoggedInError()\n    }\n\n    return this.api.newClient({ apiUrl, token, workspaceId }, this.logger)\n  }\n\n  private _notifyUpdate = async (pkgJson: PackageJson): Promise<void> => {\n    try {\n      const latest = await latestVersion(pkgJson.name)\n      const isOutdated = semver.lt(pkgJson.version, latest)\n      if (isOutdated) {\n        this.logger.box(UPDATE_MSG({ ...pkgJson, latest }))\n      }\n    } catch (thrown) {\n      const err = errors.BotpressCLIError.map(thrown)\n      this.logger.debug(`Failed to check for updates: ${err.message}`)\n    }\n  }\n\n  private _readPackageJson = async (): Promise<PackageJson> => {\n    const path = pathlib.join(this.globalPaths.abs.cliRootDir, 'package.json')\n    const strContent = await fs.promises.readFile(path, 'utf8')\n    const jsonContent = JSON.parse(strContent)\n    return jsonContent\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { YargsConfig } from '@bpinternal/yargs-extra'\nimport chalk from 'chalk'\nimport fs from 'fs'\nimport latestVersion from 'latest-version'\nimport _ from 'lodash'\nimport * as pathlib from 'path'\nimport semver from 'semver'\nimport type { ApiClientFactory } from '../api-client'\nimport type * as config from '../config'\nimport * as consts from '../consts'\nimport * as errors from '../errors'\nimport type { CommandArgv, CommandDefinition } from '../typings'\nimport * as utils from '../utils'\nimport { BaseCommand } from './base-command'\n\nexport type GlobalCommandDefinition = CommandDefinition<typeof config.schemas.global>\nexport type GlobalCache = { apiUrl: string; token: string; workspaceId: string }\n\nexport type ConfigurableGlobalPaths = { botpressHomeDir: string; cliRootDir: utils.path.AbsolutePath }\nexport type ConstantGlobalPaths = typeof consts.fromHomeDir & typeof consts.fromCliRootDir\nexport type AllGlobalPaths = ConfigurableGlobalPaths & ConstantGlobalPaths\n\nclass GlobalPaths extends utils.path.PathStore<keyof AllGlobalPaths> {\n  public constructor(argv: CommandArgv<GlobalCommandDefinition>) {\n    const absBotpressHome = utils.path.absoluteFrom(utils.path.cwd(), argv.botpressHome)\n    super({\n      cliRootDir: consts.cliRootDir,\n      botpressHomeDir: absBotpressHome,\n      ..._.mapValues(consts.fromHomeDir, (p) => utils.path.absoluteFrom(absBotpressHome, p)),\n      ..._.mapValues(consts.fromCliRootDir, (p) => utils.path.absoluteFrom(consts.cliRootDir, p)),\n    })\n  }\n}\n\ntype PackageJson = { name: string; version: string }\n\nconst UPDATE_MSG = (props: PackageJson & { latest: string }) =>\n  `${chalk.bold('Update available')} ${chalk.dim(props.version)} \u2192 ${chalk.green(props.latest)}\n\nTo update, run:\n  for npm  ${chalk.cyan(`npm i -g ${props.name}`)}\n  for yarn ${chalk.cyan(`yarn global add ${props.name}`)}\n  for pnpm ${chalk.cyan(`pnpm i -g ${props.name}`)}`\n\nexport abstract class GlobalCommand<C extends GlobalCommandDefinition> extends BaseCommand<C> {\n  protected api: ApiClientFactory\n  protected prompt: utils.prompt.CLIPrompt\n\n  public constructor(\n    api: ApiClientFactory,\n    prompt: utils.prompt.CLIPrompt,\n    ...args: ConstructorParameters<typeof BaseCommand<C>>\n  ) {\n    super(...args)\n    this.api = api\n    this.prompt = prompt\n  }\n\n  protected get globalPaths() {\n    return new GlobalPaths(this.argv)\n  }\n\n  protected get globalCache() {\n    return new utils.cache.FSKeyValueCache<GlobalCache>(this.globalPaths.abs.globalCacheFile)\n  }\n\n  protected override bootstrap = async () => {\n    const pkgJson = await this._readPackageJson()\n\n    const versionText = chalk.bold(`v${pkgJson.version}`)\n    this.logger.log(`Botpress CLI ${versionText}`, { prefix: '\uD83E\uDD16' })\n\n    await this._notifyUpdate(pkgJson)\n\n    const paths = this.globalPaths\n    if (paths.abs.botpressHomeDir !== consts.defaultBotpressHome) {\n      this.logger.log(`Using custom botpress home: ${paths.abs.botpressHomeDir}`, { prefix: '\uD83C\uDFE0' })\n    }\n  }\n\n  protected override teardown = async () => {\n    this.logger.cleanup()\n  }\n\n  protected async ensureLoginAndCreateClient(credentials: YargsConfig<typeof config.schemas.credentials>) {\n    const cache = this.globalCache\n    const token = await cache.get('token')\n    const workspaceId = credentials.workspaceId ?? (await cache.get('workspaceId'))\n    const apiUrl = credentials.apiUrl ?? (await cache.get('apiUrl'))\n\n    if (!(token && workspaceId && apiUrl)) {\n      throw new errors.NotLoggedInError()\n    }\n\n    return this.api.newClient({ apiUrl, token, workspaceId }, this.logger)\n  }\n\n  private _notifyUpdate = async (pkgJson: PackageJson): Promise<void> => {\n    try {\n      const latest = await latestVersion(pkgJson.name)\n      const isOutdated = semver.lt(pkgJson.version, latest)\n      if (isOutdated) {\n        this.logger.box(UPDATE_MSG({ ...pkgJson, latest }))\n      }\n    } catch (thrown) {\n      const err = errors.BotpressCLIError.map(thrown)\n      this.logger.debug(`Failed to check for updates: ${err.message}`)\n    }\n  }\n\n  private _readPackageJson = async (): Promise<PackageJson> => {\n    const path = pathlib.join(this.globalPaths.abs.cliRootDir, 'package.json')\n    const strContent = await fs.promises.readFile(path, 'utf8')\n    const jsonContent = JSON.parse(strContent)\n    return jsonContent\n  }\n}\n"],
+  "mappings": "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",
   "names": ["_", "chalk", "latestVersion", "semver", "fs"]
 }

package/dist/command-implementations/integration-commands.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/integration-commands.ts"],
-  "sourcesContent": ["import type * as bpclient from '@botpress/client'\nimport chalk from 'chalk'\nimport _ from 'lodash'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport { parseIntegrationRef } from '../integration-ref'\nimport { GlobalCommand } from './global-command'\n\nexport type GetIntegrationCommandDefinition = typeof commandDefinitions.integrations.subcommands.get\nexport class GetIntegrationCommand extends GlobalCommand<GetIntegrationCommandDefinition> {\n  public async run(): Promise<void> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n    const parsedRef = parseIntegrationRef(this.argv.integrationRef)\n    if (!parsedRef) {\n      throw new errors.InvalidIntegrationReferenceError(this.argv.integrationRef)\n    }\n\n    try {\n      const integration = await api.findIntegration(parsedRef)\n      if (integration) {\n        this.logger.success(`Integration ${chalk.bold(this.argv.integrationRef)}:`)\n        this.logger.json(integration)\n        return\n      }\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not get integration ${this.argv.integrationRef}`)\n    }\n\n    throw new errors.BotpressCLIError(`Integration ${this.argv.integrationRef} not found`)\n  }\n}\n\nexport type ListIntegrationCommandDefinition = typeof commandDefinitions.integrations.subcommands.list\nexport class ListIntegrationsCommand extends GlobalCommand<ListIntegrationCommandDefinition> {\n  public async run(): Promise<void> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n\n    const privateLister = (req: { nextToken?: string }) =>\n      api.client.listIntegrations({ nextToken: req.nextToken, name: this.argv.name, version: this.argv.version })\n\n    const publicLister = (req: { nextToken?: string }) =>\n      api.client.listPublicIntegrations({ nextToken: req.nextToken, name: this.argv.name, version: this.argv.version })\n\n    try {\n      const privateIntegrations = await api.listAllPages(privateLister, (r) => r.integrations)\n      const publicIntegrations = await api.listAllPages(publicLister, (r) => r.integrations)\n      const integrations = _.uniqBy([...privateIntegrations, ...publicIntegrations], (i) => i.id)\n\n      this.logger.success('Integrations:')\n      this.logger.json(integrations)\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not list integrations')\n    }\n  }\n}\n\nexport type DeleteIntegrationCommandDefinition = typeof commandDefinitions.integrations.subcommands.delete\nexport class DeleteIntegrationCommand extends GlobalCommand<DeleteIntegrationCommandDefinition> {\n  public async run(): Promise<void> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n    const parsedRef = parseIntegrationRef(this.argv.integrationRef)\n    if (!parsedRef) {\n      throw new errors.InvalidIntegrationReferenceError(this.argv.integrationRef)\n    }\n\n    let integration: bpclient.Integration | undefined\n    try {\n      integration = await api.findPrivateIntegration(parsedRef)\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not get integration ${this.argv.integrationRef}`)\n    }\n\n    if (!integration) {\n      const publicIntegration = await api.findPublicIntegration(parsedRef)\n      if (publicIntegration) {\n        throw new errors.BotpressCLIError(`Integration ${this.argv.integrationRef} does not belong to your workspace`)\n      }\n\n      throw new errors.BotpressCLIError(`Integration ${this.argv.integrationRef} not found`)\n    }\n\n    try {\n      await api.client.deleteIntegration({ id: integration.id })\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not delete integration ${this.argv.integrationRef}`)\n    }\n\n    this.logger.success(`Integration ${chalk.bold(this.argv.integrationRef)} deleted`)\n    return\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type * as bpclient from '@botpress/client'\nimport chalk from 'chalk'\nimport _ from 'lodash'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport { parseIntegrationRef } from '../integration-ref'\nimport { GlobalCommand } from './global-command'\n\nexport type GetIntegrationCommandDefinition = typeof commandDefinitions.integrations.subcommands.get\nexport class GetIntegrationCommand extends GlobalCommand<GetIntegrationCommandDefinition> {\n  public async run(): Promise<void> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n    const parsedRef = parseIntegrationRef(this.argv.integrationRef)\n    if (!parsedRef) {\n      throw new errors.InvalidIntegrationReferenceError(this.argv.integrationRef)\n    }\n\n    try {\n      const integration = await api.findIntegration(parsedRef)\n      if (integration) {\n        this.logger.success(`Integration ${chalk.bold(this.argv.integrationRef)}:`)\n        this.logger.json(integration)\n        return\n      }\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not get integration ${this.argv.integrationRef}`)\n    }\n\n    throw new errors.BotpressCLIError(`Integration ${this.argv.integrationRef} not found`)\n  }\n}\n\nexport type ListIntegrationsCommandDefinition = typeof commandDefinitions.integrations.subcommands.list\nexport class ListIntegrationsCommand extends GlobalCommand<ListIntegrationsCommandDefinition> {\n  public async run(): Promise<void> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n\n    const privateLister = (req: { nextToken?: string }) =>\n      api.client.listIntegrations({ nextToken: req.nextToken, name: this.argv.name, version: this.argv.version })\n\n    const publicLister = (req: { nextToken?: string }) =>\n      api.client.listPublicIntegrations({ nextToken: req.nextToken, name: this.argv.name, version: this.argv.version })\n\n    try {\n      const privateIntegrations = await api.listAllPages(privateLister, (r) => r.integrations)\n      const publicIntegrations = await api.listAllPages(publicLister, (r) => r.integrations)\n      const integrations = _.uniqBy([...privateIntegrations, ...publicIntegrations], (i) => i.id)\n\n      this.logger.success('Integrations:')\n      this.logger.json(integrations)\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not list integrations')\n    }\n  }\n}\n\nexport type DeleteIntegrationCommandDefinition = typeof commandDefinitions.integrations.subcommands.delete\nexport class DeleteIntegrationCommand extends GlobalCommand<DeleteIntegrationCommandDefinition> {\n  public async run(): Promise<void> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n    const parsedRef = parseIntegrationRef(this.argv.integrationRef)\n    if (!parsedRef) {\n      throw new errors.InvalidIntegrationReferenceError(this.argv.integrationRef)\n    }\n\n    let integration: bpclient.Integration | undefined\n    try {\n      integration = await api.findPrivateIntegration(parsedRef)\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not get integration ${this.argv.integrationRef}`)\n    }\n\n    if (!integration) {\n      const publicIntegration = await api.findPublicIntegration(parsedRef)\n      if (publicIntegration) {\n        throw new errors.BotpressCLIError(`Integration ${this.argv.integrationRef} does not belong to your workspace`)\n      }\n\n      throw new errors.BotpressCLIError(`Integration ${this.argv.integrationRef} not found`)\n    }\n\n    try {\n      await api.client.deleteIntegration({ id: integration.id })\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not delete integration ${this.argv.integrationRef}`)\n    }\n\n    this.logger.success(`Integration ${chalk.bold(this.argv.integrationRef)} deleted`)\n    return\n  }\n}\n"],
+  "mappings": "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",
   "names": ["chalk", "_"]
 }

package/dist/consts.js

@@ -24,6 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var consts_exports = {};
 __export(consts_exports, {
+  cliRootDir: () => cliRootDir,
   defaultBotpressApiUrl: () => defaultBotpressApiUrl,
   defaultBotpressAppUrl: () => defaultBotpressAppUrl,
   defaultBotpressHome: () => defaultBotpressHome,
@@ -40,12 +41,14 @@ __export(consts_exports, {
 module.exports = __toCommonJS(consts_exports);
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
+var import_root = require("./root");
 const defaultBotpressHome = import_path.default.join(import_os.default.homedir(), ".botpress");
 const defaultOutputFolder = ".botpress";
 const defaultEntrypoint = import_path.default.join("src", "index.ts");
 const defaultBotpressApiUrl = "https://api.botpress.cloud";
 const defaultBotpressAppUrl = "https://app.botpress.cloud";
 const defaultTunnelUrl = "https://tunnel.botpress.cloud";
+const cliRootDir = import_root.CLI_ROOT_DIR;
 const echoBotDirName = "echo-bot";
 const emptyIntegrationDirName = "empty-integration";
 const fromCliRootDir = {
@@ -69,6 +72,7 @@ const fromOutDir = {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  cliRootDir,
   defaultBotpressApiUrl,
   defaultBotpressAppUrl,
   defaultBotpressHome,

package/dist/consts.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/consts.ts"],
-  "sourcesContent": ["import os from 'os'\nimport pathlib from 'path'\n\n// configurable\n\nexport const defaultBotpressHome = pathlib.join(os.homedir(), '.botpress')\n\nexport const defaultOutputFolder = '.botpress'\nexport const defaultEntrypoint = pathlib.join('src', 'index.ts')\nexport const defaultBotpressApiUrl = 'https://api.botpress.cloud'\nexport const defaultBotpressAppUrl = 'https://app.botpress.cloud'\nexport const defaultTunnelUrl = 'https://tunnel.botpress.cloud'\n\n// not configurable\n\nexport const echoBotDirName = 'echo-bot'\nexport const emptyIntegrationDirName = 'empty-integration'\n\nexport const fromCliRootDir = {\n  packageJson: 'package.json',\n  echoBotTemplate: pathlib.join('templates', echoBotDirName),\n  emptyIntegrationTemplate: pathlib.join('templates', emptyIntegrationDirName),\n}\n\nexport const fromHomeDir = {\n  globalCacheFile: 'global.cache.json',\n}\n\nexport const fromWorkDir = {\n  definition: 'integration.definition.ts',\n}\n\nexport const fromOutDir = {\n  distDir: 'dist',\n  outFile: pathlib.join('dist', 'index.js'),\n  installDir: 'installations',\n  implementationDir: 'implementation',\n  secretsDir: 'secrets',\n  projectCacheFile: 'project.cache.json',\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AACf,kBAAoB;AAIb,MAAM,sBAAsB,YAAAA,QAAQ,KAAK,UAAAC,QAAG,QAAQ,GAAG,WAAW;AAElE,MAAM,sBAAsB;AAC5B,MAAM,oBAAoB,YAAAD,QAAQ,KAAK,OAAO,UAAU;AACxD,MAAM,wBAAwB;AAC9B,MAAM,wBAAwB;AAC9B,MAAM,mBAAmB;AAIzB,MAAM,iBAAiB;AACvB,MAAM,0BAA0B;AAEhC,MAAM,iBAAiB;AAAA,EAC5B,aAAa;AAAA,EACb,iBAAiB,YAAAA,QAAQ,KAAK,aAAa,cAAc;AAAA,EACzD,0BAA0B,YAAAA,QAAQ,KAAK,aAAa,uBAAuB;AAC7E;AAEO,MAAM,cAAc;AAAA,EACzB,iBAAiB;AACnB;AAEO,MAAM,cAAc;AAAA,EACzB,YAAY;AACd;AAEO,MAAM,aAAa;AAAA,EACxB,SAAS;AAAA,EACT,SAAS,YAAAA,QAAQ,KAAK,QAAQ,UAAU;AAAA,EACxC,YAAY;AAAA,EACZ,mBAAmB;AAAA,EACnB,YAAY;AAAA,EACZ,kBAAkB;AACpB;",
+  "sourcesContent": ["import os from 'os'\nimport pathlib from 'path'\nimport { CLI_ROOT_DIR } from './root'\n\n// configurable\n\nexport const defaultBotpressHome = pathlib.join(os.homedir(), '.botpress')\n\nexport const defaultOutputFolder = '.botpress'\nexport const defaultEntrypoint = pathlib.join('src', 'index.ts')\nexport const defaultBotpressApiUrl = 'https://api.botpress.cloud'\nexport const defaultBotpressAppUrl = 'https://app.botpress.cloud'\nexport const defaultTunnelUrl = 'https://tunnel.botpress.cloud'\n\n// not configurable\n\nexport const cliRootDir = CLI_ROOT_DIR\n\nexport const echoBotDirName = 'echo-bot'\nexport const emptyIntegrationDirName = 'empty-integration'\n\nexport const fromCliRootDir = {\n  packageJson: 'package.json',\n  echoBotTemplate: pathlib.join('templates', echoBotDirName),\n  emptyIntegrationTemplate: pathlib.join('templates', emptyIntegrationDirName),\n}\n\nexport const fromHomeDir = {\n  globalCacheFile: 'global.cache.json',\n}\n\nexport const fromWorkDir = {\n  definition: 'integration.definition.ts',\n}\n\nexport const fromOutDir = {\n  distDir: 'dist',\n  outFile: pathlib.join('dist', 'index.js'),\n  installDir: 'installations',\n  implementationDir: 'implementation',\n  secretsDir: 'secrets',\n  projectCacheFile: 'project.cache.json',\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AACf,kBAAoB;AACpB,kBAA6B;AAItB,MAAM,sBAAsB,YAAAA,QAAQ,KAAK,UAAAC,QAAG,QAAQ,GAAG,WAAW;AAElE,MAAM,sBAAsB;AAC5B,MAAM,oBAAoB,YAAAD,QAAQ,KAAK,OAAO,UAAU;AACxD,MAAM,wBAAwB;AAC9B,MAAM,wBAAwB;AAC9B,MAAM,mBAAmB;AAIzB,MAAM,aAAa;AAEnB,MAAM,iBAAiB;AACvB,MAAM,0BAA0B;AAEhC,MAAM,iBAAiB;AAAA,EAC5B,aAAa;AAAA,EACb,iBAAiB,YAAAA,QAAQ,KAAK,aAAa,cAAc;AAAA,EACzD,0BAA0B,YAAAA,QAAQ,KAAK,aAAa,uBAAuB;AAC7E;AAEO,MAAM,cAAc;AAAA,EACzB,iBAAiB;AACnB;AAEO,MAAM,cAAc;AAAA,EACzB,YAAY;AACd;AAEO,MAAM,aAAa;AAAA,EACxB,SAAS;AAAA,EACT,SAAS,YAAAA,QAAQ,KAAK,QAAQ,UAAU;AAAA,EACxC,YAAY;AAAA,EACZ,mBAAmB;AAAA,EACnB,YAAY;AAAA,EACZ,kBAAkB;AACpB;",
   "names": ["pathlib", "os"]
 }

package/dist/index.js

@@ -24,8 +24,6 @@ var tree = __toESM(require("./command-tree"));
 var errors = __toESM(require("./errors"));
 var import_logger = require("./logger");
 var import_register_yargs = require("./register-yargs");
-var utils = __toESM(require("./utils"));
-const CLI_ROOT_DIR = utils.path.join(__dirname, "..");
 const logError = (thrown) => {
   const error = errors.BotpressCLIError.map(thrown);
   new import_logger.Logger().error(error.message);
@@ -43,6 +41,6 @@ const yargsFail = (msg) => {
 process.on("uncaughtException", (thrown) => onError(thrown));
 process.on("unhandledRejection", (thrown) => onError(thrown));
 const commands = tree.zipTree(import_command_definitions.default, import_command_implementations.default);
-(0, import_register_yargs.registerYargs)(import_yargs_extra.default, commands, { cliRootDir: CLI_ROOT_DIR });
+(0, import_register_yargs.registerYargs)(import_yargs_extra.default, commands);
 void import_yargs_extra.default.version().scriptName("bp").demandCommand(1, "You didn't provide any command. Use the --help flag to see the list of available commands.").recommendCommands().strict().help().fail(yargsFail).parse();
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["import yargs from '@bpinternal/yargs-extra'\nimport commandDefinitions from './command-definitions'\nimport commandImplementations from './command-implementations'\nimport * as tree from './command-tree'\nimport * as errors from './errors'\nimport { Logger } from './logger'\nimport { registerYargs } from './register-yargs'\nimport * as utils from './utils'\n\nconst CLI_ROOT_DIR = utils.path.join(__dirname as utils.path.AbsolutePath, '..')\n\nconst logError = (thrown: unknown) => {\n  const error = errors.BotpressCLIError.map(thrown)\n  new Logger().error(error.message)\n}\n\nconst onError = (thrown: unknown) => {\n  logError(thrown)\n  process.exit(1)\n}\n\nconst yargsFail = (msg: string) => {\n  logError(`${msg}\\n`)\n  yargs.showHelp()\n  process.exit(1)\n}\n\nprocess.on('uncaughtException', (thrown: unknown) => onError(thrown))\nprocess.on('unhandledRejection', (thrown: unknown) => onError(thrown))\n\nconst commands = tree.zipTree(commandDefinitions, commandImplementations)\n\nregisterYargs(yargs, commands, { cliRootDir: CLI_ROOT_DIR })\n\nvoid yargs\n  .version()\n  .scriptName('bp')\n  .demandCommand(1, \"You didn't provide any command. Use the --help flag to see the list of available commands.\")\n  .recommendCommands()\n  .strict()\n  .help()\n  .fail(yargsFail)\n  .parse()\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA,yBAAkB;AAClB,iCAA+B;AAC/B,qCAAmC;AACnC,WAAsB;AACtB,aAAwB;AACxB,oBAAuB;AACvB,4BAA8B;AAC9B,YAAuB;AAEvB,MAAM,eAAe,MAAM,KAAK,KAAK,WAAsC,IAAI;AAE/E,MAAM,WAAW,CAAC,WAAoB;AACpC,QAAM,QAAQ,OAAO,iBAAiB,IAAI,MAAM;AAChD,MAAI,qBAAO,EAAE,MAAM,MAAM,OAAO;AAClC;AAEA,MAAM,UAAU,CAAC,WAAoB;AACnC,WAAS,MAAM;AACf,UAAQ,KAAK,CAAC;AAChB;AAEA,MAAM,YAAY,CAAC,QAAgB;AACjC,WAAS,GAAG;AAAA,CAAO;AACnB,qBAAAA,QAAM,SAAS;AACf,UAAQ,KAAK,CAAC;AAChB;AAEA,QAAQ,GAAG,qBAAqB,CAAC,WAAoB,QAAQ,MAAM,CAAC;AACpE,QAAQ,GAAG,sBAAsB,CAAC,WAAoB,QAAQ,MAAM,CAAC;AAErE,MAAM,WAAW,KAAK,QAAQ,2BAAAC,SAAoB,+BAAAC,OAAsB;AAAA,IAExE,qCAAc,mBAAAF,SAAO,UAAU,EAAE,YAAY,aAAa,CAAC;AAE3D,KAAK,mBAAAA,QACF,QAAQ,EACR,WAAW,IAAI,EACf,cAAc,GAAG,4FAA4F,EAC7G,kBAAkB,EAClB,OAAO,EACP,KAAK,EACL,KAAK,SAAS,EACd,MAAM;",
+  "sourcesContent": ["import yargs from '@bpinternal/yargs-extra'\nimport commandDefinitions from './command-definitions'\nimport commandImplementations from './command-implementations'\nimport * as tree from './command-tree'\nimport * as errors from './errors'\nimport { Logger } from './logger'\nimport { registerYargs } from './register-yargs'\n\nconst logError = (thrown: unknown) => {\n  const error = errors.BotpressCLIError.map(thrown)\n  new Logger().error(error.message)\n}\n\nconst onError = (thrown: unknown) => {\n  logError(thrown)\n  process.exit(1)\n}\n\nconst yargsFail = (msg: string) => {\n  logError(`${msg}\\n`)\n  yargs.showHelp()\n  process.exit(1)\n}\n\nprocess.on('uncaughtException', (thrown: unknown) => onError(thrown))\nprocess.on('unhandledRejection', (thrown: unknown) => onError(thrown))\n\nconst commands = tree.zipTree(commandDefinitions, commandImplementations)\n\nregisterYargs(yargs, commands)\n\nvoid yargs\n  .version()\n  .scriptName('bp')\n  .demandCommand(1, \"You didn't provide any command. Use the --help flag to see the list of available commands.\")\n  .recommendCommands()\n  .strict()\n  .help()\n  .fail(yargsFail)\n  .parse()\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA,yBAAkB;AAClB,iCAA+B;AAC/B,qCAAmC;AACnC,WAAsB;AACtB,aAAwB;AACxB,oBAAuB;AACvB,4BAA8B;AAE9B,MAAM,WAAW,CAAC,WAAoB;AACpC,QAAM,QAAQ,OAAO,iBAAiB,IAAI,MAAM;AAChD,MAAI,qBAAO,EAAE,MAAM,MAAM,OAAO;AAClC;AAEA,MAAM,UAAU,CAAC,WAAoB;AACnC,WAAS,MAAM;AACf,UAAQ,KAAK,CAAC;AAChB;AAEA,MAAM,YAAY,CAAC,QAAgB;AACjC,WAAS,GAAG;AAAA,CAAO;AACnB,qBAAAA,QAAM,SAAS;AACf,UAAQ,KAAK,CAAC;AAChB;AAEA,QAAQ,GAAG,qBAAqB,CAAC,WAAoB,QAAQ,MAAM,CAAC;AACpE,QAAQ,GAAG,sBAAsB,CAAC,WAAoB,QAAQ,MAAM,CAAC;AAErE,MAAM,WAAW,KAAK,QAAQ,2BAAAC,SAAoB,+BAAAC,OAAsB;AAAA,IAExE,qCAAc,mBAAAF,SAAO,QAAQ;AAE7B,KAAK,mBAAAA,QACF,QAAQ,EACR,WAAW,IAAI,EACf,cAAc,GAAG,4FAA4F,EAC7G,kBAAkB,EAClB,OAAO,EACP,KAAK,EACL,KAAK,SAAS,EACd,MAAM;",
   "names": ["yargs", "commandDefinitions", "commandImplementations"]
 }

package/dist/init.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/init.ts"],
-  "sourcesContent": ["import Module from 'module'\nimport pathlib from 'path'\n\nconst DEFAULT_DIRNAME = '.botpress'\n\nconst getOutDir = () => {\n  const { BP_OUTDIR } = process.env\n  if (!BP_OUTDIR) {\n    return pathlib.join(process.cwd(), DEFAULT_DIRNAME)\n  }\n  if (pathlib.isAbsolute(BP_OUTDIR)) {\n    return BP_OUTDIR\n  }\n  return pathlib.join(process.cwd(), BP_OUTDIR)\n}\n\nconst outDirPath = getOutDir()\nconst outDirName = pathlib.basename(outDirPath)\nconst originalRequire = Module.prototype.require\n\nconst rewire = function (this: NodeRequire, mod: string) {\n  const importParts = mod.split('/')\n\n  if (importParts[0] === outDirName) {\n    const newMod = importParts.slice(1).join('/')\n    const fullpath = pathlib.join(outDirPath, newMod)\n    return originalRequire.apply(this, [fullpath])\n  }\n\n  return originalRequire.apply(this, [mod])\n} as NodeRequire\n\nModule.prototype.require = rewire\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA,oBAAmB;AACnB,kBAAoB;AAEpB,MAAM,kBAAkB;AAExB,MAAM,YAAY,MAAM;AACtB,QAAM,EAAE,UAAU,IAAI,QAAQ;AAC9B,MAAI,CAAC,WAAW;AACd,WAAO,YAAAA,QAAQ,KAAK,QAAQ,IAAI,GAAG,eAAe;AAAA,EACpD;AACA,MAAI,YAAAA,QAAQ,WAAW,SAAS,GAAG;AACjC,WAAO;AAAA,EACT;AACA,SAAO,YAAAA,QAAQ,KAAK,QAAQ,IAAI,GAAG,SAAS;AAC9C;AAEA,MAAM,aAAa,UAAU;AAC7B,MAAM,aAAa,YAAAA,QAAQ,SAAS,UAAU;AAC9C,MAAM,kBAAkB,cAAAC,QAAO,UAAU;AAEzC,MAAM,SAAS,SAA6B,KAAa;AACvD,QAAM,cAAc,IAAI,MAAM,GAAG;AAEjC,MAAI,YAAY,OAAO,YAAY;AACjC,UAAM,SAAS,YAAY,MAAM,CAAC,EAAE,KAAK,GAAG;AAC5C,UAAM,WAAW,YAAAD,QAAQ,KAAK,YAAY,MAAM;AAChD,WAAO,gBAAgB,MAAM,MAAM,CAAC,QAAQ,CAAC;AAAA,EAC/C;AAEA,SAAO,gBAAgB,MAAM,MAAM,CAAC,GAAG,CAAC;AAC1C;AAEA,cAAAC,QAAO,UAAU,UAAU;",
+  "sourcesContent": ["/**\n * Important:\n *\n * This file must be kept at the root of the src directory (and dist directory when built)\n */\nimport Module from 'module'\nimport pathlib from 'path'\n\nconst DEFAULT_DIRNAME = '.botpress'\n\nconst getOutDir = () => {\n  const { BP_OUTDIR } = process.env\n  if (!BP_OUTDIR) {\n    return pathlib.join(process.cwd(), DEFAULT_DIRNAME)\n  }\n  if (pathlib.isAbsolute(BP_OUTDIR)) {\n    return BP_OUTDIR\n  }\n  return pathlib.join(process.cwd(), BP_OUTDIR)\n}\n\nconst outDirPath = getOutDir()\nconst outDirName = pathlib.basename(outDirPath)\nconst originalRequire = Module.prototype.require\n\nconst rewire = function (this: NodeRequire, mod: string) {\n  const importParts = mod.split('/')\n\n  if (importParts[0] === outDirName) {\n    const newMod = importParts.slice(1).join('/')\n    const fullpath = pathlib.join(outDirPath, newMod)\n    return originalRequire.apply(this, [fullpath])\n  }\n\n  return originalRequire.apply(this, [mod])\n} as NodeRequire\n\nModule.prototype.require = rewire\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAKA,oBAAmB;AACnB,kBAAoB;AAEpB,MAAM,kBAAkB;AAExB,MAAM,YAAY,MAAM;AACtB,QAAM,EAAE,UAAU,IAAI,QAAQ;AAC9B,MAAI,CAAC,WAAW;AACd,WAAO,YAAAA,QAAQ,KAAK,QAAQ,IAAI,GAAG,eAAe;AAAA,EACpD;AACA,MAAI,YAAAA,QAAQ,WAAW,SAAS,GAAG;AACjC,WAAO;AAAA,EACT;AACA,SAAO,YAAAA,QAAQ,KAAK,QAAQ,IAAI,GAAG,SAAS;AAC9C;AAEA,MAAM,aAAa,UAAU;AAC7B,MAAM,aAAa,YAAAA,QAAQ,SAAS,UAAU;AAC9C,MAAM,kBAAkB,cAAAC,QAAO,UAAU;AAEzC,MAAM,SAAS,SAA6B,KAAa;AACvD,QAAM,cAAc,IAAI,MAAM,GAAG;AAEjC,MAAI,YAAY,OAAO,YAAY;AACjC,UAAM,SAAS,YAAY,MAAM,CAAC,EAAE,KAAK,GAAG;AAC5C,UAAM,WAAW,YAAAD,QAAQ,KAAK,YAAY,MAAM;AAChD,WAAO,gBAAgB,MAAM,MAAM,CAAC,QAAQ,CAAC;AAAA,EAC/C;AAEA,SAAO,gBAAgB,MAAM,MAAM,CAAC,GAAG,CAAC;AAC1C;AAEA,cAAAC,QAAO,UAAU,UAAU;",
   "names": ["pathlib", "Module"]
 }

package/dist/register-yargs.js

@@ -34,12 +34,12 @@ const parseArguments = (schema, argv) => {
   const yargsEnv = (0, import_yargs_extra.parseEnv)(schema, "BP");
   return (0, import_yargs_extra.cleanupConfig)(schema, { ...argv, ...yargsEnv });
 };
-const registerYargs = (yargz, commands, props) => {
+const registerYargs = (yargz, commands) => {
   for (const cmdName in commands) {
     const command = commands[cmdName];
     if (tree.guards.command.isSubTree(command)) {
       yargz.command(cmdName, command.description ?? cmdName, (y) => {
-        registerYargs(y, command.subcommands, props);
+        registerYargs(y, command.subcommands);
         return y;
       });
       continue;
@@ -74,7 +74,8 @@ const registerYargs = (yargz, commands, props) => {
       },
       async (argv) => {
         const parsed = parseArguments(schema, argv);
-        await command.handler({ ...parsed, ...props });
+        const { exitCode } = await command.handler({ ...parsed });
+        process.exit(exitCode);
       }
     );
   }

package/dist/register-yargs.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/register-yargs.ts"],
-  "sourcesContent": ["import yargs, { YargsArgv, YargsConfig, cleanupConfig, parseEnv } from '@bpinternal/yargs-extra'\nimport _ from 'lodash'\nimport * as tree from './command-tree'\nimport type * as typings from './typings'\nimport type * as utils from './utils'\n\nexport type YargsInstance = typeof yargs\n\nexport type RegisterProps = {\n  cliRootDir: utils.path.AbsolutePath\n}\n\nconst parseArguments = <S extends typings.CommandSchema>(schema: S, argv: YargsArgv<S>): YargsConfig<S> => {\n  const yargsEnv = parseEnv(schema, 'BP')\n  return cleanupConfig(schema, { ...argv, ...yargsEnv })\n}\n\nexport const registerYargs = (yargz: YargsInstance, commands: tree.CommandTree, props: RegisterProps) => {\n  for (const cmdName in commands) {\n    const command = commands[cmdName] as tree.CommandTreeNode\n\n    if (tree.guards.command.isSubTree(command)) {\n      yargz.command(cmdName, command.description ?? cmdName, (y) => {\n        registerYargs(y, command.subcommands, props)\n        return y\n      })\n      continue\n    }\n\n    const { schema, description, alias } = command\n    const aliases = alias ? [cmdName, alias] : [cmdName]\n\n    const options = Object.entries(schema)\n    let positionals = options.filter(\n      (value): value is [string, typings.CommandPositionalOption] => !!value[1].positional\n    )\n\n    let usage = aliases\n    if (positionals.length) {\n      positionals = _.sortBy(positionals, ([, option]) => option.idx)\n      const positionalArgs = positionals.map(([optName, option]) =>\n        option.demandOption ? `<${optName}>` : `[${optName}]`\n      )\n      const positionalStr = positionalArgs.join(' ')\n      usage = aliases.map((optAlias) => `${optAlias} ${positionalStr}`)\n    }\n\n    yargz.command(\n      usage,\n      description ?? cmdName,\n      (y) => {\n        for (const [key, option] of Object.entries(schema)) {\n          if (option.positional) {\n            y = y.positional(key, option)\n          } else {\n            y = y.option(key, option)\n          }\n        }\n        return y\n      },\n      async (argv) => {\n        const parsed = parseArguments(schema, argv)\n        await command.handler({ ...parsed, ...props })\n      }\n    )\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAAuE;AACvE,oBAAc;AACd,WAAsB;AAUtB,MAAM,iBAAiB,CAAkC,QAAW,SAAuC;AACzG,QAAM,eAAW,6BAAS,QAAQ,IAAI;AACtC,aAAO,kCAAc,QAAQ,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC;AACvD;AAEO,MAAM,gBAAgB,CAAC,OAAsB,UAA4B,UAAyB;AACvG,aAAW,WAAW,UAAU;AAC9B,UAAM,UAAU,SAAS;AAEzB,QAAI,KAAK,OAAO,QAAQ,UAAU,OAAO,GAAG;AAC1C,YAAM,QAAQ,SAAS,QAAQ,eAAe,SAAS,CAAC,MAAM;AAC5D,sBAAc,GAAG,QAAQ,aAAa,KAAK;AAC3C,eAAO;AAAA,MACT,CAAC;AACD;AAAA,IACF;AAEA,UAAM,EAAE,QAAQ,aAAa,MAAM,IAAI;AACvC,UAAM,UAAU,QAAQ,CAAC,SAAS,KAAK,IAAI,CAAC,OAAO;AAEnD,UAAM,UAAU,OAAO,QAAQ,MAAM;AACrC,QAAI,cAAc,QAAQ;AAAA,MACxB,CAAC,UAA8D,CAAC,CAAC,MAAM,GAAG;AAAA,IAC5E;AAEA,QAAI,QAAQ;AACZ,QAAI,YAAY,QAAQ;AACtB,oBAAc,cAAAA,QAAE,OAAO,aAAa,CAAC,CAAC,EAAE,MAAM,MAAM,OAAO,GAAG;AAC9D,YAAM,iBAAiB,YAAY;AAAA,QAAI,CAAC,CAAC,SAAS,MAAM,MACtD,OAAO,eAAe,IAAI,aAAa,IAAI;AAAA,MAC7C;AACA,YAAM,gBAAgB,eAAe,KAAK,GAAG;AAC7C,cAAQ,QAAQ,IAAI,CAAC,aAAa,GAAG,YAAY,eAAe;AAAA,IAClE;AAEA,UAAM;AAAA,MACJ;AAAA,MACA,eAAe;AAAA,MACf,CAAC,MAAM;AACL,mBAAW,CAAC,KAAK,MAAM,KAAK,OAAO,QAAQ,MAAM,GAAG;AAClD,cAAI,OAAO,YAAY;AACrB,gBAAI,EAAE,WAAW,KAAK,MAAM;AAAA,UAC9B,OAAO;AACL,gBAAI,EAAE,OAAO,KAAK,MAAM;AAAA,UAC1B;AAAA,QACF;AACA,eAAO;AAAA,MACT;AAAA,MACA,OAAO,SAAS;AACd,cAAM,SAAS,eAAe,QAAQ,IAAI;AAC1C,cAAM,QAAQ,QAAQ,EAAE,GAAG,QAAQ,GAAG,MAAM,CAAC;AAAA,MAC/C;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import yargs, { YargsArgv, YargsConfig, cleanupConfig, parseEnv } from '@bpinternal/yargs-extra'\nimport _ from 'lodash'\nimport * as tree from './command-tree'\nimport type * as typings from './typings'\n\nexport type YargsInstance = typeof yargs\n\nconst parseArguments = <S extends typings.CommandSchema>(schema: S, argv: YargsArgv<S>): YargsConfig<S> => {\n  const yargsEnv = parseEnv(schema, 'BP')\n  return cleanupConfig(schema, { ...argv, ...yargsEnv })\n}\n\nexport const registerYargs = (yargz: YargsInstance, commands: tree.CommandTree) => {\n  for (const cmdName in commands) {\n    const command = commands[cmdName] as tree.CommandTreeNode\n\n    if (tree.guards.command.isSubTree(command)) {\n      yargz.command(cmdName, command.description ?? cmdName, (y) => {\n        registerYargs(y, command.subcommands)\n        return y\n      })\n      continue\n    }\n\n    const { schema, description, alias } = command\n    const aliases = alias ? [cmdName, alias] : [cmdName]\n\n    const options = Object.entries(schema)\n    let positionals = options.filter(\n      (value): value is [string, typings.CommandPositionalOption] => !!value[1].positional\n    )\n\n    let usage = aliases\n    if (positionals.length) {\n      positionals = _.sortBy(positionals, ([, option]) => option.idx)\n      const positionalArgs = positionals.map(([optName, option]) =>\n        option.demandOption ? `<${optName}>` : `[${optName}]`\n      )\n      const positionalStr = positionalArgs.join(' ')\n      usage = aliases.map((optAlias) => `${optAlias} ${positionalStr}`)\n    }\n\n    yargz.command(\n      usage,\n      description ?? cmdName,\n      (y) => {\n        for (const [key, option] of Object.entries(schema)) {\n          if (option.positional) {\n            y = y.positional(key, option)\n          } else {\n            y = y.option(key, option)\n          }\n        }\n        return y\n      },\n      async (argv) => {\n        const parsed = parseArguments(schema, argv)\n        const { exitCode } = await command.handler({ ...parsed })\n        process.exit(exitCode)\n      }\n    )\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAAuE;AACvE,oBAAc;AACd,WAAsB;AAKtB,MAAM,iBAAiB,CAAkC,QAAW,SAAuC;AACzG,QAAM,eAAW,6BAAS,QAAQ,IAAI;AACtC,aAAO,kCAAc,QAAQ,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC;AACvD;AAEO,MAAM,gBAAgB,CAAC,OAAsB,aAA+B;AACjF,aAAW,WAAW,UAAU;AAC9B,UAAM,UAAU,SAAS;AAEzB,QAAI,KAAK,OAAO,QAAQ,UAAU,OAAO,GAAG;AAC1C,YAAM,QAAQ,SAAS,QAAQ,eAAe,SAAS,CAAC,MAAM;AAC5D,sBAAc,GAAG,QAAQ,WAAW;AACpC,eAAO;AAAA,MACT,CAAC;AACD;AAAA,IACF;AAEA,UAAM,EAAE,QAAQ,aAAa,MAAM,IAAI;AACvC,UAAM,UAAU,QAAQ,CAAC,SAAS,KAAK,IAAI,CAAC,OAAO;AAEnD,UAAM,UAAU,OAAO,QAAQ,MAAM;AACrC,QAAI,cAAc,QAAQ;AAAA,MACxB,CAAC,UAA8D,CAAC,CAAC,MAAM,GAAG;AAAA,IAC5E;AAEA,QAAI,QAAQ;AACZ,QAAI,YAAY,QAAQ;AACtB,oBAAc,cAAAA,QAAE,OAAO,aAAa,CAAC,CAAC,EAAE,MAAM,MAAM,OAAO,GAAG;AAC9D,YAAM,iBAAiB,YAAY;AAAA,QAAI,CAAC,CAAC,SAAS,MAAM,MACtD,OAAO,eAAe,IAAI,aAAa,IAAI;AAAA,MAC7C;AACA,YAAM,gBAAgB,eAAe,KAAK,GAAG;AAC7C,cAAQ,QAAQ,IAAI,CAAC,aAAa,GAAG,YAAY,eAAe;AAAA,IAClE;AAEA,UAAM;AAAA,MACJ;AAAA,MACA,eAAe;AAAA,MACf,CAAC,MAAM;AACL,mBAAW,CAAC,KAAK,MAAM,KAAK,OAAO,QAAQ,MAAM,GAAG;AAClD,cAAI,OAAO,YAAY;AACrB,gBAAI,EAAE,WAAW,KAAK,MAAM;AAAA,UAC9B,OAAO;AACL,gBAAI,EAAE,OAAO,KAAK,MAAM;AAAA,UAC1B;AAAA,QACF;AACA,eAAO;AAAA,MACT;AAAA,MACA,OAAO,SAAS;AACd,cAAM,SAAS,eAAe,QAAQ,IAAI;AAC1C,cAAM,EAAE,SAAS,IAAI,MAAM,QAAQ,QAAQ,EAAE,GAAG,OAAO,CAAC;AACxD,gBAAQ,KAAK,QAAQ;AAAA,MACvB;AAAA,IACF;AAAA,EACF;AACF;",
   "names": ["_"]
 }

package/dist/root.js

@@ -0,0 +1,36 @@
+"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 root_exports = {};
+__export(root_exports, {
+  CLI_ROOT_DIR: () => CLI_ROOT_DIR
+});
+module.exports = __toCommonJS(root_exports);
+var utils = __toESM(require("./utils"));
+const CLI_ROOT_DIR = utils.path.join(__dirname, "..");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CLI_ROOT_DIR
+});
+//# sourceMappingURL=root.js.map

package/dist/root.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/root.ts"],
+  "sourcesContent": ["/**\n * Important:\n *\n * This file must be kept at the root of the src directory (and dist directory when built)\n */\nimport * as utils from './utils'\n\nexport const CLI_ROOT_DIR = utils.path.join(__dirname as utils.path.AbsolutePath, '..')\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,YAAuB;AAEhB,MAAM,eAAe,MAAM,KAAK,KAAK,WAAsC,IAAI;",
+  "names": []
+}

package/dist/typings.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/typings.ts"],
-  "sourcesContent": ["import type yargs from '@bpinternal/yargs-extra'\n// eslint-disable-next-line no-duplicate-imports\nimport type { YargsConfig, YargsSchema } from '@bpinternal/yargs-extra'\nimport type * as utils from './utils'\n\nexport type CommandPositionalOption = yargs.PositionalOptions & { positional: true; idx: number }\nexport type CommandNamedOption = YargsSchema[string] & { positional?: false }\nexport type CommandOption = CommandPositionalOption | CommandNamedOption\nexport type CommandSchema = Record<string, CommandOption>\n\nexport type CommandArgv<C extends CommandDefinition = CommandDefinition> = YargsConfig<C['schema']> & {\n  cliRootDir: utils.path.AbsolutePath\n}\n\nexport type CommandDefinition<S extends CommandSchema = CommandSchema> = {\n  schema: S\n  description?: string\n  alias?: string\n}\n\nexport type CommandImplementation<C extends CommandDefinition = CommandDefinition> = (\n  argv: CommandArgv<C>\n) => Promise<never>\n\nexport type CommandLeaf<C extends CommandDefinition = CommandDefinition> = C & {\n  handler: CommandImplementation<C>\n}\n"],
+  "sourcesContent": ["import type yargs from '@bpinternal/yargs-extra'\n// eslint-disable-next-line no-duplicate-imports\nimport type { YargsConfig, YargsSchema } from '@bpinternal/yargs-extra'\n\nexport type CommandPositionalOption = yargs.PositionalOptions & { positional: true; idx: number }\nexport type CommandNamedOption = YargsSchema[string] & { positional?: false }\nexport type CommandOption = CommandPositionalOption | CommandNamedOption\nexport type CommandSchema = Record<string, CommandOption>\n\nexport type CommandArgv<C extends CommandDefinition = CommandDefinition> = YargsConfig<C['schema']> & {\n  /**\n   * Ignored: fixes weird typing issue\n   */\n  _?: string\n}\n\nexport type CommandDefinition<S extends CommandSchema = CommandSchema> = {\n  schema: S\n  description?: string\n  alias?: string\n}\n\nexport type CommandImplementation<C extends CommandDefinition = CommandDefinition> = (\n  argv: CommandArgv<C>\n) => Promise<{ exitCode: number }>\n\nexport type CommandLeaf<C extends CommandDefinition = CommandDefinition> = C & {\n  handler: CommandImplementation<C>\n}\n"],
   "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/dist/utils/case-utils.test.js

@@ -0,0 +1,57 @@
+"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 __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 import_vitest = require("vitest");
+var caseUtils = __toESM(require("./case-utils"));
+const pascalCase = "HelloWorld";
+const kebabCase = "hello-world";
+const snakeCase = "hello_world";
+const screamingSnakeCase = "HELLO_WORLD";
+const camelCase = "helloWorld";
+(0, import_vitest.test)("case utils should convert from pascal case to all other cases", () => {
+  (0, import_vitest.expect)(caseUtils.to.kebabCase(pascalCase)).toBe(kebabCase);
+  (0, import_vitest.expect)(caseUtils.to.snakeCase(pascalCase)).toBe(snakeCase);
+  (0, import_vitest.expect)(caseUtils.to.screamingSnakeCase(pascalCase)).toBe(screamingSnakeCase);
+  (0, import_vitest.expect)(caseUtils.to.camelCase(pascalCase)).toBe(camelCase);
+});
+(0, import_vitest.test)("case utils should convert from kebab case to all other cases", () => {
+  (0, import_vitest.expect)(caseUtils.to.pascalCase(kebabCase)).toBe(pascalCase);
+  (0, import_vitest.expect)(caseUtils.to.snakeCase(kebabCase)).toBe(snakeCase);
+  (0, import_vitest.expect)(caseUtils.to.screamingSnakeCase(kebabCase)).toBe(screamingSnakeCase);
+  (0, import_vitest.expect)(caseUtils.to.camelCase(kebabCase)).toBe(camelCase);
+});
+(0, import_vitest.test)("case utils should convert from snake case to all other cases", () => {
+  (0, import_vitest.expect)(caseUtils.to.pascalCase(snakeCase)).toBe(pascalCase);
+  (0, import_vitest.expect)(caseUtils.to.kebabCase(snakeCase)).toBe(kebabCase);
+  (0, import_vitest.expect)(caseUtils.to.screamingSnakeCase(snakeCase)).toBe(screamingSnakeCase);
+  (0, import_vitest.expect)(caseUtils.to.camelCase(snakeCase)).toBe(camelCase);
+});
+(0, import_vitest.test)("case utils should convert from screaming snake case to all other cases", () => {
+  (0, import_vitest.expect)(caseUtils.to.pascalCase(screamingSnakeCase)).toBe(pascalCase);
+  (0, import_vitest.expect)(caseUtils.to.kebabCase(screamingSnakeCase)).toBe(kebabCase);
+  (0, import_vitest.expect)(caseUtils.to.snakeCase(screamingSnakeCase)).toBe(snakeCase);
+  (0, import_vitest.expect)(caseUtils.to.camelCase(screamingSnakeCase)).toBe(camelCase);
+});
+(0, import_vitest.test)("case utils should convert from camel case to all other cases", () => {
+  (0, import_vitest.expect)(caseUtils.to.pascalCase(camelCase)).toBe(pascalCase);
+  (0, import_vitest.expect)(caseUtils.to.kebabCase(camelCase)).toBe(kebabCase);
+  (0, import_vitest.expect)(caseUtils.to.snakeCase(camelCase)).toBe(snakeCase);
+  (0, import_vitest.expect)(caseUtils.to.screamingSnakeCase(camelCase)).toBe(screamingSnakeCase);
+});
+//# sourceMappingURL=case-utils.test.js.map

package/dist/utils/case-utils.test.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/utils/case-utils.test.ts"],
+  "sourcesContent": ["import { test, expect } from 'vitest'\nimport * as caseUtils from './case-utils'\n\nconst pascalCase = 'HelloWorld'\nconst kebabCase = 'hello-world'\nconst snakeCase = 'hello_world'\nconst screamingSnakeCase = 'HELLO_WORLD'\nconst camelCase = 'helloWorld'\n\ntest('case utils should convert from pascal case to all other cases', () => {\n  expect(caseUtils.to.kebabCase(pascalCase)).toBe(kebabCase)\n  expect(caseUtils.to.snakeCase(pascalCase)).toBe(snakeCase)\n  expect(caseUtils.to.screamingSnakeCase(pascalCase)).toBe(screamingSnakeCase)\n  expect(caseUtils.to.camelCase(pascalCase)).toBe(camelCase)\n})\n\ntest('case utils should convert from kebab case to all other cases', () => {\n  expect(caseUtils.to.pascalCase(kebabCase)).toBe(pascalCase)\n  expect(caseUtils.to.snakeCase(kebabCase)).toBe(snakeCase)\n  expect(caseUtils.to.screamingSnakeCase(kebabCase)).toBe(screamingSnakeCase)\n  expect(caseUtils.to.camelCase(kebabCase)).toBe(camelCase)\n})\n\ntest('case utils should convert from snake case to all other cases', () => {\n  expect(caseUtils.to.pascalCase(snakeCase)).toBe(pascalCase)\n  expect(caseUtils.to.kebabCase(snakeCase)).toBe(kebabCase)\n  expect(caseUtils.to.screamingSnakeCase(snakeCase)).toBe(screamingSnakeCase)\n  expect(caseUtils.to.camelCase(snakeCase)).toBe(camelCase)\n})\n\ntest('case utils should convert from screaming snake case to all other cases', () => {\n  expect(caseUtils.to.pascalCase(screamingSnakeCase)).toBe(pascalCase)\n  expect(caseUtils.to.kebabCase(screamingSnakeCase)).toBe(kebabCase)\n  expect(caseUtils.to.snakeCase(screamingSnakeCase)).toBe(snakeCase)\n  expect(caseUtils.to.camelCase(screamingSnakeCase)).toBe(camelCase)\n})\n\ntest('case utils should convert from camel case to all other cases', () => {\n  expect(caseUtils.to.pascalCase(camelCase)).toBe(pascalCase)\n  expect(caseUtils.to.kebabCase(camelCase)).toBe(kebabCase)\n  expect(caseUtils.to.snakeCase(camelCase)).toBe(snakeCase)\n  expect(caseUtils.to.screamingSnakeCase(camelCase)).toBe(screamingSnakeCase)\n})\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA,oBAA6B;AAC7B,gBAA2B;AAE3B,MAAM,aAAa;AACnB,MAAM,YAAY;AAClB,MAAM,YAAY;AAClB,MAAM,qBAAqB;AAC3B,MAAM,YAAY;AAAA,IAElB,oBAAK,iEAAiE,MAAM;AAC1E,4BAAO,UAAU,GAAG,UAAU,UAAU,CAAC,EAAE,KAAK,SAAS;AACzD,4BAAO,UAAU,GAAG,UAAU,UAAU,CAAC,EAAE,KAAK,SAAS;AACzD,4BAAO,UAAU,GAAG,mBAAmB,UAAU,CAAC,EAAE,KAAK,kBAAkB;AAC3E,4BAAO,UAAU,GAAG,UAAU,UAAU,CAAC,EAAE,KAAK,SAAS;AAC3D,CAAC;AAAA,IAED,oBAAK,gEAAgE,MAAM;AACzE,4BAAO,UAAU,GAAG,WAAW,SAAS,CAAC,EAAE,KAAK,UAAU;AAC1D,4BAAO,UAAU,GAAG,UAAU,SAAS,CAAC,EAAE,KAAK,SAAS;AACxD,4BAAO,UAAU,GAAG,mBAAmB,SAAS,CAAC,EAAE,KAAK,kBAAkB;AAC1E,4BAAO,UAAU,GAAG,UAAU,SAAS,CAAC,EAAE,KAAK,SAAS;AAC1D,CAAC;AAAA,IAED,oBAAK,gEAAgE,MAAM;AACzE,4BAAO,UAAU,GAAG,WAAW,SAAS,CAAC,EAAE,KAAK,UAAU;AAC1D,4BAAO,UAAU,GAAG,UAAU,SAAS,CAAC,EAAE,KAAK,SAAS;AACxD,4BAAO,UAAU,GAAG,mBAAmB,SAAS,CAAC,EAAE,KAAK,kBAAkB;AAC1E,4BAAO,UAAU,GAAG,UAAU,SAAS,CAAC,EAAE,KAAK,SAAS;AAC1D,CAAC;AAAA,IAED,oBAAK,0EAA0E,MAAM;AACnF,4BAAO,UAAU,GAAG,WAAW,kBAAkB,CAAC,EAAE,KAAK,UAAU;AACnE,4BAAO,UAAU,GAAG,UAAU,kBAAkB,CAAC,EAAE,KAAK,SAAS;AACjE,4BAAO,UAAU,GAAG,UAAU,kBAAkB,CAAC,EAAE,KAAK,SAAS;AACjE,4BAAO,UAAU,GAAG,UAAU,kBAAkB,CAAC,EAAE,KAAK,SAAS;AACnE,CAAC;AAAA,IAED,oBAAK,gEAAgE,MAAM;AACzE,4BAAO,UAAU,GAAG,WAAW,SAAS,CAAC,EAAE,KAAK,UAAU;AAC1D,4BAAO,UAAU,GAAG,UAAU,SAAS,CAAC,EAAE,KAAK,SAAS;AACxD,4BAAO,UAAU,GAAG,UAAU,SAAS,CAAC,EAAE,KAAK,SAAS;AACxD,4BAAO,UAAU,GAAG,mBAAmB,SAAS,CAAC,EAAE,KAAK,kBAAkB;AAC5E,CAAC;",
+  "names": []
+}

package/dist/utils/require-utils.test.js

@@ -0,0 +1,31 @@
+"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 __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 import_vitest = require("vitest");
+var requireUtils = __toESM(require("./require-utils"));
+(0, import_vitest.test)("require js code should do as its name suggests", () => {
+  const code = `
+    module.exports = {
+      foo: 'bar'
+    }
+  `;
+  const result = requireUtils.requireJsCode(code);
+  (0, import_vitest.expect)(result.foo).toBe("bar");
+});
+//# sourceMappingURL=require-utils.test.js.map

package/dist/utils/require-utils.test.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/utils/require-utils.test.ts"],
+  "sourcesContent": ["import { test, expect } from 'vitest'\nimport * as requireUtils from './require-utils'\n\ntest('require js code should do as its name suggests', () => {\n  const code = `\n    module.exports = {\n      foo: 'bar'\n    }\n  `\n\n  const result = requireUtils.requireJsCode<{ foo: string }>(code)\n\n  expect(result.foo).toBe('bar')\n})\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA,oBAA6B;AAC7B,mBAA8B;AAAA,IAE9B,oBAAK,kDAAkD,MAAM;AAC3D,QAAM,OAAO;AAAA;AAAA;AAAA;AAAA;AAMb,QAAM,SAAS,aAAa,cAA+B,IAAI;AAE/D,4BAAO,OAAO,GAAG,EAAE,KAAK,KAAK;AAC/B,CAAC;",
+  "names": []
+}

package/e2e/api.ts

@@ -0,0 +1,25 @@
+import { Client } from '@botpress/client'
+
+export type ApiBot = Awaited<ReturnType<Client['listBots']>>['bots'][0]
+export const fetchAllBots = async (client: Client): Promise<ApiBot[]> => {
+  let allBots: ApiBot[] = []
+  let nextToken: string | undefined = undefined
+  do {
+    const { bots, meta } = await client.listBots({ nextToken })
+    allBots = allBots.concat(bots)
+    nextToken = meta.nextToken
+  } while (nextToken)
+  return allBots
+}
+
+export type ApiIntegration = Awaited<ReturnType<Client['listIntegrations']>>['integrations'][0]
+export const fetchAllIntegrations = async (client: Client): Promise<ApiIntegration[]> => {
+  let allIntegrations: ApiIntegration[] = []
+  let nextToken: string | undefined = undefined
+  do {
+    const { integrations, meta } = await client.listIntegrations({ nextToken })
+    allIntegrations = allIntegrations.concat(integrations)
+    nextToken = meta.nextToken
+  } while (nextToken)
+  return allIntegrations
+}

package/e2e/defaults.ts

@@ -0,0 +1,20 @@
+import * as consts from '../src/consts'
+
+const noBuild = false
+const secrets = [] satisfies string[]
+const sourceMap = false
+const verbose = false
+const confirm = true
+const json = false
+const entryPoint = consts.defaultEntrypoint
+const outDir = consts.defaultOutputFolder
+export default {
+  noBuild,
+  secrets,
+  sourceMap,
+  verbose,
+  confirm,
+  json,
+  entryPoint,
+  outDir,
+}

package/e2e/index.ts

@@ -0,0 +1,83 @@
+import { Logger } from '@bpinternal/log4bot'
+import yargs, { YargsConfig, YargsSchema } from '@bpinternal/yargs-extra'
+import * as consts from '../src/consts'
+import { createDeployBot } from './tests/create-deploy-bot'
+import { createDeployIntegration } from './tests/create-deploy-integration'
+import { devBot } from './tests/dev-bot'
+import { Test } from './typings'
+import { sleep, TmpDirectory } from './utils'
+
+const tests: Test[] = [createDeployBot, createDeployIntegration, devBot]
+
+const timeout = (ms: number) =>
+  sleep(ms).then(() => {
+    throw new Error(`Timeout after ${ms}ms`)
+  })
+
+const TIMEOUT = 20_000
+
+const configSchema = {
+  timeout: {
+    type: 'number',
+    default: TIMEOUT,
+  },
+  verbose: {
+    type: 'boolean',
+    default: false,
+    alias: 'v',
+  },
+  filter: {
+    type: 'string',
+  },
+  workspaceId: {
+    type: 'string',
+    demandOption: true,
+  },
+  token: {
+    type: 'string',
+    demandOption: true,
+  },
+  apiUrl: {
+    type: 'string',
+    default: consts.defaultBotpressApiUrl,
+  },
+  tunnelUrl: {
+    type: 'string',
+    default: consts.defaultTunnelUrl,
+  },
+} satisfies YargsSchema
+
+const main = async (argv: YargsConfig<typeof configSchema>): Promise<never> => {
+  const logger = new Logger('e2e', { level: argv.verbose ? 'debug' : 'info' })
+
+  const filterRegex = argv.filter ? new RegExp(argv.filter) : null
+  const filteredTests = tests.filter(({ name }) => (filterRegex ? filterRegex.test(name) : true))
+  logger.info(`Running ${filteredTests.length} / ${tests.length} tests`)
+
+  for (const { name, handler } of filteredTests) {
+    const logLine = `### Running test: "${name}" ###`
+    const logPad = '#'.repeat(logLine.length)
+    logger.info(logPad)
+    logger.info(logLine)
+    logger.info(logPad + '\n')
+
+    const tmpDir = TmpDirectory.create()
+    try {
+      const t0 = Date.now()
+      await Promise.race([handler({ tmpDir: tmpDir.path, ...argv }), timeout(argv.timeout)])
+      const t1 = Date.now()
+      logger.info(`SUCCESS: "${name}" (${t1 - t0}ms)`)
+    } catch (thrown) {
+      const err = thrown instanceof Error ? thrown : new Error(`${thrown}`)
+      logger.attachError(err).error(`FAILURE: "${name}"`)
+      process.exit(1)
+    } finally {
+      tmpDir.cleanup()
+    }
+  }
+
+  logger.info('All tests passed')
+  process.exit(0)
+}
+
+void yargs.command('$0', 'Run E2E Tests', configSchema, main).parse()

package/e2e/tests/create-deploy-bot.ts

@@ -0,0 +1,50 @@
+import { Client } from '@botpress/client'
+import pathlib from 'path'
+import * as uuid from 'uuid'
+import impl from '../../src/command-implementations'
+import { ApiBot, fetchAllBots } from '../api'
+import defaults from '../defaults'
+import { Test } from '../typings'
+import * as utils from '../utils'
+
+const fetchBot = async (client: Client, botName: string): Promise<ApiBot | undefined> => {
+  const bots = await fetchAllBots(client)
+  return bots.find(({ name }) => name === botName)
+}
+
+export const createDeployBot: Test = {
+  name: 'cli should allow creating, building, deploying and mannaging a bot',
+  handler: async ({ tmpDir, ...creds }) => {
+    const botpressHomeDir = pathlib.join(tmpDir, '.botpresshome')
+    const baseDir = pathlib.join(tmpDir, 'bots')
+    const botName = uuid.v4()
+    const botDir = pathlib.join(baseDir, botName)
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    const client = new Client({ host: creds.apiUrl, token: creds.token, workspaceId: creds.workspaceId })
+
+    await impl.init({ ...argv, workDir: baseDir, name: botName, type: 'bot' }).then(utils.handleExitCode)
+    await utils.npmInstall({ workDir: botDir }).then(utils.handleExitCode)
+    await impl.build({ ...argv, workDir: botDir }).then(utils.handleExitCode)
+    await impl.login({ ...argv }).then(utils.handleExitCode)
+    await impl.bots.subcommands.create({ ...argv, name: botName }).then(utils.handleExitCode)
+
+    const bot = await fetchBot(client, botName)
+    if (!bot) {
+      throw new Error(`Bot ${botName} should have been created`)
+    }
+
+    await impl.deploy({ ...argv, workDir: botDir, createNewBot: false, botId: bot.id }).then(utils.handleExitCode)
+    await impl.bots.subcommands.delete({ ...argv, botRef: bot.id }).then(utils.handleExitCode)
+
+    if (await fetchBot(client, botName)) {
+      throw new Error(`Bot ${botName} should have been deleted`)
+    }
+  },
+}

package/e2e/tests/create-deploy-integration.ts

@@ -0,0 +1,55 @@
+import { Client } from '@botpress/client'
+
+import pathlib from 'path'
+import * as uuid from 'uuid'
+import impl from '../../src/command-implementations'
+import { ApiIntegration, fetchAllIntegrations } from '../api'
+import defaults from '../defaults'
+import { Test } from '../typings'
+import * as utils from '../utils'
+
+const fetchIntegration = async (client: Client, integrationName: string): Promise<ApiIntegration | undefined> => {
+  const integrations = await fetchAllIntegrations(client)
+  return integrations.find(({ name }) => name === integrationName)
+}
+
+export const createDeployIntegration: Test = {
+  name: 'cli should allow creating, building, deploying and mannaging an integration',
+  handler: async ({ tmpDir, ...creds }) => {
+    const botpressHomeDir = pathlib.join(tmpDir, '.botpresshome')
+    const baseDir = pathlib.join(tmpDir, 'integrations')
+    const integrationName = `myintegration-${uuid.v4()}`.replace(/-/g, '')
+    const integrationDir = pathlib.join(baseDir, integrationName)
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    const client = new Client({ host: creds.apiUrl, token: creds.token, workspaceId: creds.workspaceId })
+
+    await impl
+      .init({ ...argv, workDir: baseDir, name: integrationName, type: 'integration' })
+      .then(utils.handleExitCode)
+    await utils.npmInstall({ workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.build({ ...argv, workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.login({ ...argv }).then(utils.handleExitCode)
+
+    await impl
+      .deploy({ ...argv, createNewBot: undefined, botId: undefined, workDir: integrationDir })
+      .then(utils.handleExitCode)
+
+    const integration = await fetchIntegration(client, integrationName)
+    if (!integration) {
+      throw new Error(`Integration ${integrationName} should have been created`)
+    }
+
+    await impl.integrations.subcommands.delete({ ...argv, integrationRef: integration.id }).then(utils.handleExitCode)
+
+    if (await fetchIntegration(client, integrationName)) {
+      throw new Error(`Integration ${integrationName} should have been deleted`)
+    }
+  },
+}

package/e2e/tests/dev-bot.ts

@@ -0,0 +1,57 @@
+import findProcess from 'find-process'
+import pathlib from 'path'
+import * as uuid from 'uuid'
+import impl from '../../src/command-implementations'
+import defaults from '../defaults'
+import { Test } from '../typings'
+import * as utils from '../utils'
+
+const handleExitCode = ({ exitCode }: { exitCode: number }) => {
+  if (exitCode !== 0) {
+    throw new Error(`Command exited with code ${exitCode}`)
+  }
+}
+
+const PORT = 8075
+
+export const devBot: Test = {
+  name: 'cli should allow creating and running a bot locally',
+  handler: async ({ tmpDir, tunnelUrl, ...creds }) => {
+    const botpressHomeDir = pathlib.join(tmpDir, '.botpresshome')
+    const baseDir = pathlib.join(tmpDir, 'bots')
+    const botName = uuid.v4()
+    const botDir = pathlib.join(baseDir, botName)
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    await impl.init({ ...argv, workDir: baseDir, name: botName, type: 'bot' }).then(handleExitCode)
+    await utils.npmInstall({ workDir: botDir }).then(handleExitCode)
+    await impl.login({ ...argv }).then(handleExitCode)
+
+    const cmdPromise = impl.dev({ ...argv, workDir: botDir, port: PORT, tunnelUrl }).then(handleExitCode)
+    await utils.sleep(5000)
+
+    const allProcess = await findProcess('port', PORT)
+    if (allProcess.length === 0) {
+      throw new Error(`Expected to find a process listening on port ${PORT}`)
+    }
+    if (allProcess.length > 1) {
+      throw new Error(`Expected to find only one process listening on port ${PORT}`)
+    }
+    const botProcess = allProcess[0]
+
+    /**
+     * TODO:
+     * - try calling the Bot locally to see if it works
+     * - allow listing dev bots in API and find the one we just created (by name)
+     */
+
+    process.kill(botProcess.pid)
+    await cmdPromise
+  },
+}

package/e2e/typings.ts

@@ -0,0 +1,12 @@
+export type TestProps = {
+  tmpDir: string
+  workspaceId: string
+  token: string
+  apiUrl: string
+  tunnelUrl: string
+}
+
+export type Test = {
+  name: string
+  handler: (props: TestProps) => Promise<void>
+}

package/e2e/utils.ts

@@ -0,0 +1,42 @@
+import childprocess from 'child_process'
+import tmp from 'tmp'
+
+export const sleep = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms))
+
+export class TmpDirectory {
+  private _closed = false
+
+  public static create() {
+    return new TmpDirectory(tmp.dirSync({ unsafeCleanup: true }))
+  }
+
+  private constructor(private _res: tmp.DirResult) {}
+
+  public get path() {
+    if (this._closed) {
+      throw new Error('Cannot access tmp directory after cleanup')
+    }
+    return this._res.name
+  }
+
+  public cleanup() {
+    if (this._closed) {
+      return
+    }
+    this._res.removeCallback()
+  }
+}
+
+export const npmInstall = async ({ workDir }: { workDir: string }) => {
+  const { status } = childprocess.spawnSync('pnpm', ['install'], {
+    cwd: workDir,
+    stdio: 'inherit',
+  })
+  return { exitCode: status ?? 0 }
+}
+
+export const handleExitCode = ({ exitCode }: { exitCode: number }) => {
+  if (exitCode !== 0) {
+    throw new Error(`Command exited with code ${exitCode}`)
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",
@@ -8,7 +8,9 @@
     "start": "node dist/index.js",
     "type:check": "tsc --noEmit",
     "bundle": "ts-node -T build.ts",
-    "template:gen": "pnpm -r --stream -F echo-bot -F empty-integration exec bp gen"
+    "template:gen": "pnpm -r --stream -F echo-bot -F empty-integration exec bp gen",
+    "e2e:test": "ts-node -T ./e2e",
+    "unit:test": "pnpm vitest --run"
   },
   "keywords": [],
   "author": "",
@@ -18,8 +20,8 @@
   },
   "main": "dist/index.js",
   "dependencies": {
-    "@botpress/client": "0.1.2",
-    "@bpinternal/tunnel": "^0.0.2",
+    "@botpress/client": "0.1.3",
+    "@bpinternal/tunnel": "^0.1.0",
     "@bpinternal/yargs-extra": "^0.0.3",
     "@parcel/watcher": "^2.1.0",
     "@types/lodash": "^4.14.191",
@@ -45,12 +47,16 @@
     "zod-to-json-schema": "^3.20.1"
   },
   "devDependencies": {
-    "@botpress/sdk": "0.1.4",
+    "@botpress/sdk": "0.1.5",
+    "@bpinternal/log4bot": "^0.0.4",
     "@types/bluebird": "^3.5.38",
     "@types/prompts": "^2.0.14",
     "@types/semver": "^7.3.11",
+    "@types/tmp": "^0.2.3",
     "@types/uuid": "^9.0.1",
+    "find-process": "^1.4.7",
     "glob": "^9.3.4",
+    "tmp": "^0.2.1",
     "ts-node": "^10.9.1"
   },
   "engines": {

package/templates/echo-bot/package.json

@@ -8,14 +8,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@botpress/client": "0.1.2",
-    "@botpress/sdk": "0.1.4",
+    "@botpress/client": "0.1.3",
+    "@botpress/sdk": "0.1.5",
     "zod": "^3.20.6"
   },
   "devDependencies": {
     "@types/node": "^18.11.17",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4",
-    "@tsconfig/node18-strictest": "^1.0.0"
+    "typescript": "^4.9.4"
   }
 }

package/templates/echo-bot/tsconfig.json

@@ -1,6 +1,19 @@
 {
-  "extends": "@tsconfig/node18-strictest/tsconfig.json",
   "compilerOptions": {
+    "lib": ["es2022"],
+    "module": "commonjs",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
+    "allowUnusedLabels": false,
+    "allowUnreachableCode": false,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedParameters": true,
     "target": "es2017",
     "baseUrl": ".",
     "outDir": "dist",

package/templates/empty-integration/package.json

@@ -8,14 +8,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@botpress/client": "0.1.2",
-    "@botpress/sdk": "0.1.4",
+    "@botpress/client": "0.1.3",
+    "@botpress/sdk": "0.1.5",
     "zod": "^3.20.6"
   },
   "devDependencies": {
     "@types/node": "^18.11.17",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4",
-    "@tsconfig/node18-strictest": "^1.0.0"
+    "typescript": "^4.9.4"
   }
 }

package/templates/empty-integration/tsconfig.json

@@ -1,6 +1,19 @@
 {
-  "extends": "@tsconfig/node18-strictest/tsconfig.json",
   "compilerOptions": {
+    "lib": ["es2022"],
+    "module": "commonjs",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
+    "allowUnusedLabels": false,
+    "allowUnreachableCode": false,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedParameters": true,
     "target": "es2017",
     "baseUrl": ".",
     "outDir": "dist",