@botpress/cli 4.17.15 → 4.17.17

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

@@ -37,23 +37,27 @@ var utils = __toESM(require("../utils"));
 var import_project_command = require("./project-command");
 class ReadCommand extends import_project_command.ProjectCommand {
   async run() {
-    const projectDef = await this.readProjectDefinitionFromFS();
-    if (projectDef.type === "integration") {
+    const { projectType, resolveProjectDefinition } = this.readProjectDefinitionFromFS();
+    if (projectType === "integration") {
+      const projectDef = await resolveProjectDefinition();
       const parsed = await this._parseIntegration(projectDef.definition);
       this.logger.json(parsed);
       return;
     }
-    if (projectDef.type === "interface") {
+    if (projectType === "interface") {
+      const projectDef = await resolveProjectDefinition();
       const parsed = await this._parseInterface(projectDef.definition);
       this.logger.json(parsed);
       return;
     }
-    if (projectDef.type === "bot") {
+    if (projectType === "bot") {
+      const projectDef = await resolveProjectDefinition();
       const parsed = await this._parseBot(projectDef.definition);
       this.logger.json(parsed);
       return;
     }
-    if (projectDef.type === "plugin") {
+    if (projectType === "plugin") {
+      const projectDef = await resolveProjectDefinition();
       const parsed = await this._parsePlugin(projectDef.definition);
       this.logger.json(parsed);
       return;

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/read-command.ts"],
-  "sourcesContent": ["import * as sdk from '@botpress/sdk'\nimport * as apiUtils from '../api'\nimport commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\nexport type ReadCommandDefinition = typeof commandDefinitions.read\nexport class ReadCommand extends ProjectCommand<ReadCommandDefinition> {\n  public async run(): Promise<void> {\n    const projectDef = await this.readProjectDefinitionFromFS()\n    if (projectDef.type === 'integration') {\n      const parsed = await this._parseIntegration(projectDef.definition)\n      this.logger.json(parsed)\n      return\n    }\n    if (projectDef.type === 'interface') {\n      const parsed = await this._parseInterface(projectDef.definition)\n      this.logger.json(parsed)\n      return\n    }\n    if (projectDef.type === 'bot') {\n      const parsed = await this._parseBot(projectDef.definition)\n      this.logger.json(parsed)\n      return\n    }\n    if (projectDef.type === 'plugin') {\n      const parsed = await this._parsePlugin(projectDef.definition)\n      this.logger.json(parsed)\n      return\n    }\n\n    type _assertion = utils.types.AssertNever<typeof projectDef>\n    throw new errors.BotpressCLIError('Unsupported project type')\n  }\n\n  private _parseIntegration = async (integrationDef: sdk.IntegrationDefinition) => {\n    const parsed = await apiUtils.prepareCreateIntegrationBody(integrationDef)\n    parsed.interfaces = utils.records.mapValues(integrationDef.interfaces ?? {}, (iface) => ({\n      ...iface,\n      id: iface.id ?? '',\n    }))\n    return parsed\n  }\n\n  private _parseInterface = async (interfaceDef: sdk.InterfaceDefinition) => {\n    return await apiUtils.prepareCreateInterfaceBody(interfaceDef)\n  }\n\n  private _parseBot = async (botDef: sdk.BotDefinition) => {\n    return await apiUtils.prepareCreateBotBody(botDef)\n  }\n\n  private _parsePlugin = async (pluginDef: sdk.PluginDefinition) => {\n    return await apiUtils.prepareCreatePluginBody(pluginDef)\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,eAA0B;AAE1B,aAAwB;AACxB,YAAuB;AACvB,6BAA+B;AAGxB,MAAM,oBAAoB,sCAAsC;AAAA,EACrE,MAAa,MAAqB;AAChC,UAAM,aAAa,MAAM,KAAK,4BAA4B;AAC1D,QAAI,WAAW,SAAS,eAAe;AACrC,YAAM,SAAS,MAAM,KAAK,kBAAkB,WAAW,UAAU;AACjE,WAAK,OAAO,KAAK,MAAM;AACvB;AAAA,IACF;AACA,QAAI,WAAW,SAAS,aAAa;AACnC,YAAM,SAAS,MAAM,KAAK,gBAAgB,WAAW,UAAU;AAC/D,WAAK,OAAO,KAAK,MAAM;AACvB;AAAA,IACF;AACA,QAAI,WAAW,SAAS,OAAO;AAC7B,YAAM,SAAS,MAAM,KAAK,UAAU,WAAW,UAAU;AACzD,WAAK,OAAO,KAAK,MAAM;AACvB;AAAA,IACF;AACA,QAAI,WAAW,SAAS,UAAU;AAChC,YAAM,SAAS,MAAM,KAAK,aAAa,WAAW,UAAU;AAC5D,WAAK,OAAO,KAAK,MAAM;AACvB;AAAA,IACF;AAGA,UAAM,IAAI,OAAO,iBAAiB,0BAA0B;AAAA,EAC9D;AAAA,EAEQ,oBAAoB,OAAO,mBAA8C;AAC/E,UAAM,SAAS,MAAM,SAAS,6BAA6B,cAAc;AACzE,WAAO,aAAa,MAAM,QAAQ,UAAU,eAAe,cAAc,CAAC,GAAG,CAAC,WAAW;AAAA,MACvF,GAAG;AAAA,MACH,IAAI,MAAM,MAAM;AAAA,IAClB,EAAE;AACF,WAAO;AAAA,EACT;AAAA,EAEQ,kBAAkB,OAAO,iBAA0C;AACzE,WAAO,MAAM,SAAS,2BAA2B,YAAY;AAAA,EAC/D;AAAA,EAEQ,YAAY,OAAO,WAA8B;AACvD,WAAO,MAAM,SAAS,qBAAqB,MAAM;AAAA,EACnD;AAAA,EAEQ,eAAe,OAAO,cAAoC;AAChE,WAAO,MAAM,SAAS,wBAAwB,SAAS;AAAA,EACzD;AACF;",
+  "sourcesContent": ["import * as sdk from '@botpress/sdk'\nimport * as apiUtils from '../api'\nimport commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\nexport type ReadCommandDefinition = typeof commandDefinitions.read\nexport class ReadCommand extends ProjectCommand<ReadCommandDefinition> {\n  public async run(): Promise<void> {\n    const { projectType, resolveProjectDefinition } = this.readProjectDefinitionFromFS()\n    if (projectType === 'integration') {\n      const projectDef = await resolveProjectDefinition()\n      const parsed = await this._parseIntegration(projectDef.definition)\n      this.logger.json(parsed)\n      return\n    }\n    if (projectType === 'interface') {\n      const projectDef = await resolveProjectDefinition()\n      const parsed = await this._parseInterface(projectDef.definition)\n      this.logger.json(parsed)\n      return\n    }\n    if (projectType === 'bot') {\n      const projectDef = await resolveProjectDefinition()\n      const parsed = await this._parseBot(projectDef.definition)\n      this.logger.json(parsed)\n      return\n    }\n    if (projectType === 'plugin') {\n      const projectDef = await resolveProjectDefinition()\n      const parsed = await this._parsePlugin(projectDef.definition)\n      this.logger.json(parsed)\n      return\n    }\n\n    throw new errors.BotpressCLIError('Unsupported project type')\n  }\n\n  private _parseIntegration = async (integrationDef: sdk.IntegrationDefinition) => {\n    const parsed = await apiUtils.prepareCreateIntegrationBody(integrationDef)\n    parsed.interfaces = utils.records.mapValues(integrationDef.interfaces ?? {}, (iface) => ({\n      ...iface,\n      id: iface.id ?? '',\n    }))\n    return parsed\n  }\n\n  private _parseInterface = async (interfaceDef: sdk.InterfaceDefinition) => {\n    return await apiUtils.prepareCreateInterfaceBody(interfaceDef)\n  }\n\n  private _parseBot = async (botDef: sdk.BotDefinition) => {\n    return await apiUtils.prepareCreateBotBody(botDef)\n  }\n\n  private _parsePlugin = async (pluginDef: sdk.PluginDefinition) => {\n    return await apiUtils.prepareCreatePluginBody(pluginDef)\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,eAA0B;AAE1B,aAAwB;AACxB,YAAuB;AACvB,6BAA+B;AAGxB,MAAM,oBAAoB,sCAAsC;AAAA,EACrE,MAAa,MAAqB;AAChC,UAAM,EAAE,aAAa,yBAAyB,IAAI,KAAK,4BAA4B;AACnF,QAAI,gBAAgB,eAAe;AACjC,YAAM,aAAa,MAAM,yBAAyB;AAClD,YAAM,SAAS,MAAM,KAAK,kBAAkB,WAAW,UAAU;AACjE,WAAK,OAAO,KAAK,MAAM;AACvB;AAAA,IACF;AACA,QAAI,gBAAgB,aAAa;AAC/B,YAAM,aAAa,MAAM,yBAAyB;AAClD,YAAM,SAAS,MAAM,KAAK,gBAAgB,WAAW,UAAU;AAC/D,WAAK,OAAO,KAAK,MAAM;AACvB;AAAA,IACF;AACA,QAAI,gBAAgB,OAAO;AACzB,YAAM,aAAa,MAAM,yBAAyB;AAClD,YAAM,SAAS,MAAM,KAAK,UAAU,WAAW,UAAU;AACzD,WAAK,OAAO,KAAK,MAAM;AACvB;AAAA,IACF;AACA,QAAI,gBAAgB,UAAU;AAC5B,YAAM,aAAa,MAAM,yBAAyB;AAClD,YAAM,SAAS,MAAM,KAAK,aAAa,WAAW,UAAU;AAC5D,WAAK,OAAO,KAAK,MAAM;AACvB;AAAA,IACF;AAEA,UAAM,IAAI,OAAO,iBAAiB,0BAA0B;AAAA,EAC9D;AAAA,EAEQ,oBAAoB,OAAO,mBAA8C;AAC/E,UAAM,SAAS,MAAM,SAAS,6BAA6B,cAAc;AACzE,WAAO,aAAa,MAAM,QAAQ,UAAU,eAAe,cAAc,CAAC,GAAG,CAAC,WAAW;AAAA,MACvF,GAAG;AAAA,MACH,IAAI,MAAM,MAAM;AAAA,IAClB,EAAE;AACF,WAAO;AAAA,EACT;AAAA,EAEQ,kBAAkB,OAAO,iBAA0C;AACzE,WAAO,MAAM,SAAS,2BAA2B,YAAY;AAAA,EAC/D;AAAA,EAEQ,YAAY,OAAO,WAA8B;AACvD,WAAO,MAAM,SAAS,qBAAqB,MAAM;AAAA,EACnD;AAAA,EAEQ,eAAe,OAAO,cAAoC;AAChE,WAAO,MAAM,SAAS,wBAAwB,SAAS;AAAA,EACzD;AACF;",
   "names": []
 }

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

@@ -41,18 +41,19 @@ class ServeCommand extends import_project_command.ProjectCommand {
     if (!fs.existsSync(outfile)) {
       throw new errors.NoBundleFoundError();
     }
-    const projectDef = await this.readProjectDefinitionFromFS();
-    if (projectDef.type === "interface") {
+    const { projectType, resolveProjectDefinition } = this.readProjectDefinitionFromFS();
+    if (projectType === "interface") {
       throw new errors.BotpressCLIError("An interface project has no implementation to serve.");
     }
-    if (projectDef.type === "integration") {
+    if (projectType === "integration") {
+      const projectDef = await resolveProjectDefinition();
       const secretEnvVariables = await this.promptSecrets(projectDef.definition, this.argv, { formatEnv: true });
       const nonNullSecretEnvVariables = utils.records.filterValues(secretEnvVariables, utils.guards.is.notNull);
       for (const [key, value] of Object.entries(nonNullSecretEnvVariables)) {
         process.env[key] = value;
       }
     }
-    this.logger.log(`Serving ${projectDef.type}...`);
+    this.logger.log(`Serving ${projectType}...`);
     const { default: serveable } = utils.require.requireJsFile(outfile);
     const server = await serveable.start(this.argv.port);
     await new Promise((resolve, reject) => {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/serve-command.ts"],
-  "sourcesContent": ["import type { Bot as BotImpl, Integration as IntegrationImpl } from '@botpress/sdk'\nimport * as fs from 'fs'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\ntype Serveable = BotImpl | IntegrationImpl\n\nexport type ServeCommandDefinition = typeof commandDefinitions.serve\nexport class ServeCommand extends ProjectCommand<ServeCommandDefinition> {\n  public async run(): Promise<void> {\n    const outfile = this.projectPaths.abs.outFileCJS\n    if (!fs.existsSync(outfile)) {\n      throw new errors.NoBundleFoundError()\n    }\n\n    const projectDef = await this.readProjectDefinitionFromFS()\n    if (projectDef.type === 'interface') {\n      throw new errors.BotpressCLIError('An interface project has no implementation to serve.')\n    }\n\n    if (projectDef.type === 'integration') {\n      // TODO: store secrets in local cache to avoid prompting every time\n      const secretEnvVariables = await this.promptSecrets(projectDef.definition, this.argv, { formatEnv: true })\n      const nonNullSecretEnvVariables = utils.records.filterValues(secretEnvVariables, utils.guards.is.notNull)\n      for (const [key, value] of Object.entries(nonNullSecretEnvVariables)) {\n        process.env[key] = value\n      }\n    }\n\n    this.logger.log(`Serving ${projectDef.type}...`)\n\n    const { default: serveable } = utils.require.requireJsFile<{ default: Serveable }>(outfile)\n    const server = await serveable.start(this.argv.port)\n\n    await new Promise<void>((resolve, reject) => {\n      server.on('error', reject)\n      server.on('close', resolve)\n    })\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,SAAoB;AAEpB,aAAwB;AACxB,YAAuB;AACvB,6BAA+B;AAKxB,MAAM,qBAAqB,sCAAuC;AAAA,EACvE,MAAa,MAAqB;AAChC,UAAM,UAAU,KAAK,aAAa,IAAI;AACtC,QAAI,CAAC,GAAG,WAAW,OAAO,GAAG;AAC3B,YAAM,IAAI,OAAO,mBAAmB;AAAA,IACtC;AAEA,UAAM,aAAa,MAAM,KAAK,4BAA4B;AAC1D,QAAI,WAAW,SAAS,aAAa;AACnC,YAAM,IAAI,OAAO,iBAAiB,sDAAsD;AAAA,IAC1F;AAEA,QAAI,WAAW,SAAS,eAAe;AAErC,YAAM,qBAAqB,MAAM,KAAK,cAAc,WAAW,YAAY,KAAK,MAAM,EAAE,WAAW,KAAK,CAAC;AACzG,YAAM,4BAA4B,MAAM,QAAQ,aAAa,oBAAoB,MAAM,OAAO,GAAG,OAAO;AACxG,iBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,yBAAyB,GAAG;AACpE,gBAAQ,IAAI,GAAG,IAAI;AAAA,MACrB;AAAA,IACF;AAEA,SAAK,OAAO,IAAI,WAAW,WAAW,IAAI,KAAK;AAE/C,UAAM,EAAE,SAAS,UAAU,IAAI,MAAM,QAAQ,cAAsC,OAAO;AAC1F,UAAM,SAAS,MAAM,UAAU,MAAM,KAAK,KAAK,IAAI;AAEnD,UAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AAC3C,aAAO,GAAG,SAAS,MAAM;AACzB,aAAO,GAAG,SAAS,OAAO;AAAA,IAC5B,CAAC;AAAA,EACH;AACF;",
+  "sourcesContent": ["import type { Bot as BotImpl, Integration as IntegrationImpl } from '@botpress/sdk'\nimport * as fs from 'fs'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\ntype Serveable = BotImpl | IntegrationImpl\n\nexport type ServeCommandDefinition = typeof commandDefinitions.serve\nexport class ServeCommand extends ProjectCommand<ServeCommandDefinition> {\n  public async run(): Promise<void> {\n    const outfile = this.projectPaths.abs.outFileCJS\n    if (!fs.existsSync(outfile)) {\n      throw new errors.NoBundleFoundError()\n    }\n\n    const { projectType, resolveProjectDefinition } = this.readProjectDefinitionFromFS()\n    if (projectType === 'interface') {\n      throw new errors.BotpressCLIError('An interface project has no implementation to serve.')\n    }\n\n    if (projectType === 'integration') {\n      const projectDef = await resolveProjectDefinition()\n      // TODO: store secrets in local cache to avoid prompting every time\n      const secretEnvVariables = await this.promptSecrets(projectDef.definition, this.argv, { formatEnv: true })\n      const nonNullSecretEnvVariables = utils.records.filterValues(secretEnvVariables, utils.guards.is.notNull)\n      for (const [key, value] of Object.entries(nonNullSecretEnvVariables)) {\n        process.env[key] = value\n      }\n    }\n\n    this.logger.log(`Serving ${projectType}...`)\n\n    const { default: serveable } = utils.require.requireJsFile<{ default: Serveable }>(outfile)\n    const server = await serveable.start(this.argv.port)\n\n    await new Promise<void>((resolve, reject) => {\n      server.on('error', reject)\n      server.on('close', resolve)\n    })\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,SAAoB;AAEpB,aAAwB;AACxB,YAAuB;AACvB,6BAA+B;AAKxB,MAAM,qBAAqB,sCAAuC;AAAA,EACvE,MAAa,MAAqB;AAChC,UAAM,UAAU,KAAK,aAAa,IAAI;AACtC,QAAI,CAAC,GAAG,WAAW,OAAO,GAAG;AAC3B,YAAM,IAAI,OAAO,mBAAmB;AAAA,IACtC;AAEA,UAAM,EAAE,aAAa,yBAAyB,IAAI,KAAK,4BAA4B;AACnF,QAAI,gBAAgB,aAAa;AAC/B,YAAM,IAAI,OAAO,iBAAiB,sDAAsD;AAAA,IAC1F;AAEA,QAAI,gBAAgB,eAAe;AACjC,YAAM,aAAa,MAAM,yBAAyB;AAElD,YAAM,qBAAqB,MAAM,KAAK,cAAc,WAAW,YAAY,KAAK,MAAM,EAAE,WAAW,KAAK,CAAC;AACzG,YAAM,4BAA4B,MAAM,QAAQ,aAAa,oBAAoB,MAAM,OAAO,GAAG,OAAO;AACxG,iBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,yBAAyB,GAAG;AACpE,gBAAQ,IAAI,GAAG,IAAI;AAAA,MACrB;AAAA,IACF;AAEA,SAAK,OAAO,IAAI,WAAW,WAAW,KAAK;AAE3C,UAAM,EAAE,SAAS,UAAU,IAAI,MAAM,QAAQ,cAAsC,OAAO;AAC1F,UAAM,SAAS,MAAM,UAAU,MAAM,KAAK,KAAK,IAAI;AAEnD,UAAM,IAAI,QAAc,CAAC,SAAS,WAAW;AAC3C,aAAO,GAAG,SAAS,MAAM;AACzB,aAAO,GAAG,SAAS,OAAO;AAAA,IAC5B,CAAC;AAAA,EACH;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "4.17.15",
+  "version": "4.17.17",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run build:types && pnpm run bundle && pnpm run template:gen",
@@ -23,8 +23,8 @@
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^11.7.0",
     "@botpress/chat": "0.5.1",
-    "@botpress/client": "1.24.2",
-    "@botpress/sdk": "4.15.8",
+    "@botpress/client": "1.25.0",
+    "@botpress/sdk": "4.15.9",
     "@bpinternal/const": "^0.1.0",
     "@bpinternal/tunnel": "^0.1.1",
     "@bpinternal/yargs-extra": "^0.0.3",

package/templates/empty-bot/package.json

@@ -5,8 +5,8 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/client": "1.24.2",
-    "@botpress/sdk": "4.15.8"
+    "@botpress/client": "1.25.0",
+    "@botpress/sdk": "4.15.9"
   },
   "devDependencies": {
     "@types/node": "^22.16.4",

package/templates/empty-integration/package.json

@@ -6,8 +6,8 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/client": "1.24.2",
-    "@botpress/sdk": "4.15.8"
+    "@botpress/client": "1.25.0",
+    "@botpress/sdk": "4.15.9"
   },
   "devDependencies": {
     "@types/node": "^22.16.4",

package/templates/empty-plugin/package.json

@@ -6,7 +6,7 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/sdk": "4.15.8"
+    "@botpress/sdk": "4.15.9"
   },
   "devDependencies": {
     "@types/node": "^22.16.4",

package/templates/hello-world/package.json

@@ -6,8 +6,8 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/client": "1.24.2",
-    "@botpress/sdk": "4.15.8"
+    "@botpress/client": "1.25.0",
+    "@botpress/sdk": "4.15.9"
   },
   "devDependencies": {
     "@types/node": "^22.16.4",

package/templates/webhook-message/package.json

@@ -6,8 +6,8 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/client": "1.24.2",
-    "@botpress/sdk": "4.15.8",
+    "@botpress/client": "1.25.0",
+    "@botpress/sdk": "4.15.9",
     "axios": "^1.6.8"
   },
   "devDependencies": {