@botpress/cli 0.11.5 → 1.0.0

package/dist/code-generation/module.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/code-generation/module.ts"],
-  "sourcesContent": ["import { posix as pathlib } from 'path'\nimport * as utils from '../utils'\nimport { GENERATED_HEADER, INDEX_FILE } from './const'\nimport * as strings from './strings'\nimport type { File } from './typings'\n\nexport type ModuleDef = File & {\n  exportName: string\n}\n\nexport abstract class Module implements File {\n  private _localDependencies: Module[] = []\n\n  public get path(): string {\n    return this._def.path\n  }\n\n  public get content(): string {\n    return this._def.content\n  }\n\n  /**\n   * @returns file name without extension\n   */\n  public get name(): string {\n    const basename = pathlib.basename(this.path)\n    if (basename === INDEX_FILE) {\n      const dirname = pathlib.basename(pathlib.dirname(this.path))\n      return dirname\n    }\n    const withoutExtension = utils.path.rmExtension(basename)\n    return withoutExtension\n  }\n\n  public get exports(): string {\n    return this._def.exportName\n  }\n\n  public get deps(): Module[] {\n    return [...this._localDependencies]\n  }\n\n  protected constructor(private _def: ModuleDef) {}\n\n  public pushDep(...dependencies: Module[]): this {\n    this._localDependencies.push(...dependencies)\n    return this\n  }\n\n  public unshift(...basePath: string[]): this {\n    this._def = {\n      ...this._def,\n      path: pathlib.join(...basePath, this._def.path),\n    }\n    this._localDependencies = this._localDependencies.map((d) => d.unshift(...basePath))\n    return this\n  }\n\n  public flatten(): File[] {\n    return [this, ...this._localDependencies.flatMap((d) => d.flatten())]\n  }\n\n  public import(base: Module): string {\n    let relativePath = pathlib.relative(pathlib.dirname(base.path), this.path)\n    relativePath = pathlib.join('.', relativePath)\n    return utils.path.rmExtension(relativePath)\n  }\n}\n\nexport class ReExportTypeModule extends Module {\n  protected constructor(def: { exportName: string }) {\n    super({\n      ...def,\n      path: INDEX_FILE,\n      content: '',\n    })\n  }\n\n  public override get content(): string {\n    let content = GENERATED_HEADER\n\n    for (const m of this.deps) {\n      const { name } = m\n      const importAlias = strings.importAlias(name)\n      const importFrom = m.import(this)\n      content += `import * as ${importAlias} from \"./${importFrom}\";\\n`\n      content += `export * as ${importAlias} from \"./${importFrom}\";\\n`\n    }\n\n    content += '\\n'\n\n    content += `export type ${this.exports} = {\\n`\n    for (const { name, exports } of this.deps) {\n      const importAlias = strings.importAlias(name)\n      content += `  \"${name}\": ${importAlias}.${exports};\\n`\n    }\n    content += '}'\n\n    content += '\\n'\n\n    return content\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiC;AACjC,YAAuB;AACvB,mBAA6C;AAC7C,cAAyB;AAOlB,MAAe,OAAuB;AAAA,EAgCjC,YAAoB,MAAiB;AAAjB;AAAA,EAAkB;AAAA,EA/BxC,qBAA+B,CAAC;AAAA,EAExC,IAAW,OAAe;AACxB,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAW,UAAkB;AAC3B,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAKA,IAAW,OAAe;AACxB,UAAM,WAAW,YAAAA,MAAQ,SAAS,KAAK,IAAI;AAC3C,QAAI,aAAa,yBAAY;AAC3B,YAAM,UAAU,YAAAA,MAAQ,SAAS,YAAAA,MAAQ,QAAQ,KAAK,IAAI,CAAC;AAC3D,aAAO;AAAA,IACT;AACA,UAAM,mBAAmB,MAAM,KAAK,YAAY,QAAQ;AACxD,WAAO;AAAA,EACT;AAAA,EAEA,IAAW,UAAkB;AAC3B,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAW,OAAiB;AAC1B,WAAO,CAAC,GAAG,KAAK,kBAAkB;AAAA,EACpC;AAAA,EAIO,WAAW,cAA8B;AAC9C,SAAK,mBAAmB,KAAK,GAAG,YAAY;AAC5C,WAAO;AAAA,EACT;AAAA,EAEO,WAAW,UAA0B;AAC1C,SAAK,OAAO;AAAA,MACV,GAAG,KAAK;AAAA,MACR,MAAM,YAAAA,MAAQ,KAAK,GAAG,UAAU,KAAK,KAAK,IAAI;AAAA,IAChD;AACA,SAAK,qBAAqB,KAAK,mBAAmB,IAAI,CAAC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;AACnF,WAAO;AAAA,EACT;AAAA,EAEO,UAAkB;AACvB,WAAO,CAAC,MAAM,GAAG,KAAK,mBAAmB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAAA,EACtE;AAAA,EAEO,OAAO,MAAsB;AAClC,QAAI,eAAe,YAAAA,MAAQ,SAAS,YAAAA,MAAQ,QAAQ,KAAK,IAAI,GAAG,KAAK,IAAI;AACzE,mBAAe,YAAAA,MAAQ,KAAK,KAAK,YAAY;AAC7C,WAAO,MAAM,KAAK,YAAY,YAAY;AAAA,EAC5C;AACF;AAEO,MAAM,2BAA2B,OAAO;AAAA,EACnC,YAAY,KAA6B;AACjD,UAAM;AAAA,MACJ,GAAG;AAAA,MACH,MAAM;AAAA,MACN,SAAS;AAAA,IACX,CAAC;AAAA,EACH;AAAA,EAEA,IAAoB,UAAkB;AACpC,QAAI,UAAU;AAEd,eAAW,KAAK,KAAK,MAAM;AACzB,YAAM,EAAE,KAAK,IAAI;AACjB,YAAM,cAAc,QAAQ,YAAY,IAAI;AAC5C,YAAM,aAAa,EAAE,OAAO,IAAI;AAChC,iBAAW,eAAe,uBAAuB;AAAA;AACjD,iBAAW,eAAe,uBAAuB;AAAA;AAAA,IACnD;AAEA,eAAW;AAEX,eAAW,eAAe,KAAK;AAAA;AAC/B,eAAW,EAAE,MAAM,QAAQ,KAAK,KAAK,MAAM;AACzC,YAAM,cAAc,QAAQ,YAAY,IAAI;AAC5C,iBAAW,MAAM,UAAU,eAAe;AAAA;AAAA,IAC5C;AACA,eAAW;AAEX,eAAW;AAEX,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import { posix as pathlib } from 'path'\nimport * as utils from '../utils'\nimport * as consts from './consts'\nimport * as strings from './strings'\nimport { File } from './typings'\n\nexport type ModuleProps = {\n  path: string\n  exportName: string\n}\n\nexport abstract class Module {\n  private _localDependencies: Module[] = []\n\n  public get path(): string {\n    return this._def.path\n  }\n\n  /**\n   * @returns file name without extension\n   */\n  public get name(): string {\n    const basename = pathlib.basename(this.path)\n    if (basename === consts.INDEX_FILE) {\n      const dirname = pathlib.basename(pathlib.dirname(this.path))\n      return dirname\n    }\n    const withoutExtension = utils.path.rmExtension(basename)\n    return withoutExtension\n  }\n\n  public get isDefaultExport(): boolean {\n    return this._def.exportName === consts.DEFAULT_EXPORT_NAME\n  }\n\n  public get exportName(): string {\n    return this._def.exportName\n  }\n\n  public get deps(): Module[] {\n    return [...this._localDependencies]\n  }\n\n  protected constructor(private _def: ModuleProps) {}\n\n  public abstract getContent(): Promise<string>\n\n  public pushDep(...dependencies: Module[]): this {\n    this._localDependencies.push(...dependencies)\n    return this\n  }\n\n  public unshift(...basePath: string[]): this {\n    this._def = {\n      ...this._def,\n      path: pathlib.join(...basePath, this._def.path),\n    }\n    this._localDependencies = this._localDependencies.map((d) => d.unshift(...basePath))\n    return this\n  }\n\n  public async toFile(): Promise<File> {\n    return {\n      path: this.path,\n      content: await this.getContent(),\n    }\n  }\n\n  public async flatten(): Promise<File[]> {\n    const self = await this.toFile()\n    const allFiles: File[] = [self]\n    for (const dep of this._localDependencies) {\n      const depFiles = await dep.flatten()\n      allFiles.push(...depFiles)\n    }\n    return allFiles\n  }\n\n  public import(base: Module): string {\n    let relativePath = pathlib.relative(pathlib.dirname(base.path), this.path)\n    relativePath = pathlib.join('.', relativePath)\n    return utils.path.rmExtension(relativePath)\n  }\n}\n\nexport class ReExportTypeModule extends Module {\n  protected constructor(def: { exportName: string }) {\n    super({\n      ...def,\n      path: consts.INDEX_FILE,\n    })\n  }\n\n  public async getContent(): Promise<string> {\n    let content = consts.GENERATED_HEADER\n\n    for (const m of this.deps) {\n      const { name } = m\n      const importAlias = strings.importAlias(name)\n      const importFrom = m.import(this)\n      content += `import * as ${importAlias} from \"./${importFrom}\";\\n`\n      content += `export * as ${importAlias} from \"./${importFrom}\";\\n`\n    }\n\n    content += '\\n'\n\n    content += `export type ${this.exportName} = {\\n`\n    for (const { name, exportName: exports } of this.deps) {\n      const importAlias = strings.importAlias(name)\n      content += `  \"${name}\": ${importAlias}.${exports};\\n`\n    }\n    content += '}'\n\n    content += '\\n'\n\n    return content\n  }\n}\n\nexport class ReExportVariableModule extends Module {\n  protected constructor(def: { exportName: string }) {\n    super({\n      ...def,\n      path: consts.INDEX_FILE,\n    })\n  }\n\n  public async getContent(): Promise<string> {\n    let content = consts.GENERATED_HEADER\n\n    for (const m of this.deps) {\n      const { name } = m\n      const importAlias = strings.importAlias(name)\n      const importFrom = m.import(this)\n      content += `import * as ${importAlias} from \"./${importFrom}\";\\n`\n      content += `export * as ${importAlias} from \"./${importFrom}\";\\n`\n    }\n\n    content += '\\n'\n\n    content += `export const ${this.exportName} = {\\n`\n    for (const { name, exportName: exports } of this.deps) {\n      const importAlias = strings.importAlias(name)\n      content += `  \"${name}\": ${importAlias}.${exports},\\n`\n    }\n    content += '}'\n\n    content += '\\n'\n\n    return content\n  }\n}\n"],
+  "mappings": "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",
   "names": ["pathlib"]
 }

package/dist/code-generation/strings.js

@@ -25,16 +25,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var strings_exports = {};
 __export(strings_exports, {
   importAlias: () => importAlias,
-  typeName: () => typeName
+  typeName: () => typeName,
+  varName: () => varName
 });
 module.exports = __toCommonJS(strings_exports);
 var utils = __toESM(require("../utils"));
 const apply = (str, ...transforms) => transforms.reduce((acc, transform) => transform(acc), str);
 const typeName = (name) => apply(name, utils.casing.to.pascalCase);
 const importAlias = (name) => apply(name, utils.casing.to.camelCase);
+const varName = (name) => apply(name, utils.casing.to.camelCase);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   importAlias,
-  typeName
+  typeName,
+  varName
 });
 //# sourceMappingURL=strings.js.map

package/dist/code-generation/strings.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/code-generation/strings.ts"],
-  "sourcesContent": ["import * as utils from '../utils'\ntype StrTransform = (str: string) => string\n\nconst apply = (str: string, ...transforms: StrTransform[]) => transforms.reduce((acc, transform) => transform(acc), str)\n\nexport const typeName = (name: string) => apply(name, utils.casing.to.pascalCase)\nexport const importAlias = (name: string) => apply(name, utils.casing.to.camelCase)\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,YAAuB;AAGvB,MAAM,QAAQ,CAAC,QAAgB,eAA+B,WAAW,OAAO,CAAC,KAAK,cAAc,UAAU,GAAG,GAAG,GAAG;AAEhH,MAAM,WAAW,CAAC,SAAiB,MAAM,MAAM,MAAM,OAAO,GAAG,UAAU;AACzE,MAAM,cAAc,CAAC,SAAiB,MAAM,MAAM,MAAM,OAAO,GAAG,SAAS;",
+  "sourcesContent": ["import * as utils from '../utils'\ntype StrTransform = (str: string) => string\n\nconst apply = (str: string, ...transforms: StrTransform[]) => transforms.reduce((acc, transform) => transform(acc), str)\n\nexport const typeName = (name: string) => apply(name, utils.casing.to.pascalCase)\nexport const importAlias = (name: string) => apply(name, utils.casing.to.camelCase)\nexport const varName = (name: string) => apply(name, utils.casing.to.camelCase)\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,YAAuB;AAGvB,MAAM,QAAQ,CAAC,QAAgB,eAA+B,WAAW,OAAO,CAAC,KAAK,cAAc,UAAU,GAAG,GAAG,GAAG;AAEhH,MAAM,WAAW,CAAC,SAAiB,MAAM,MAAM,MAAM,OAAO,GAAG,UAAU;AACzE,MAAM,cAAc,CAAC,SAAiB,MAAM,MAAM,MAAM,OAAO,GAAG,SAAS;AAC3E,MAAM,UAAU,CAAC,SAAiB,MAAM,MAAM,MAAM,OAAO,GAAG,SAAS;",
   "names": []
 }

package/dist/code-generation/typings.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/code-generation/typings.ts"],
-  "sourcesContent": ["import { Integration } from '@botpress/client'\n\nexport type File = { path: string; content: string }\n\nexport type IntegrationDefinition = Pick<\n  Integration,\n  'name' | 'version' | 'channels' | 'states' | 'events' | 'actions' | 'user' | 'entities'\n> & {\n  id: string | null\n  configuration: Pick<Integration['configuration'], 'schema'>\n  configurations: Record<string, Pick<Integration['configuration'], 'schema'>>\n}\n\ntype Def<T> = NonNullable<T>\n\nexport type ConfigurationDefinition = Def<IntegrationDefinition['configuration']>\nexport type ConfigurationsDefinition = Def<IntegrationDefinition['configurations']>\nexport type ChannelDefinition = Def<IntegrationDefinition['channels']>[string]\nexport type MessageDefinition = Def<ChannelDefinition['messages']>[string]\nexport type ActionDefinition = Def<IntegrationDefinition['actions']>[string]\nexport type EventDefinition = Def<IntegrationDefinition['events']>[string]\nexport type StateDefinition = Def<IntegrationDefinition['states']>[string]\nexport type UserDefinition = Def<IntegrationDefinition['user']>\nexport type EntityDefinition = Def<IntegrationDefinition['entities']>[string]\n"],
+  "sourcesContent": ["import * as client from '@botpress/client'\nimport * as utils from '../utils'\n\nexport type File = { path: string; content: string }\n\nexport type IntegrationInstallablePackage =\n  | {\n      source: 'remote'\n      integration: client.Integration\n    }\n  | {\n      source: 'local'\n      path: utils.path.AbsolutePath\n    }\n\nexport type InterfaceInstallablePackage =\n  | {\n      source: 'remote'\n      interface: client.Interface\n    }\n  | {\n      source: 'local'\n      path: utils.path.AbsolutePath\n    }\n"],
   "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

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

@@ -27,122 +27,133 @@ __export(add_command_exports, {
   AddCommand: () => AddCommand
 });
 module.exports = __toCommonJS(add_command_exports);
-var import_bluebird = __toESM(require("bluebird"));
-var import_chalk = __toESM(require("chalk"));
-var fs = __toESM(require("fs"));
+var fslib = __toESM(require("fs"));
 var pathlib = __toESM(require("path"));
+var import_api = require("../api");
 var codegen = __toESM(require("../code-generation"));
 var consts = __toESM(require("../consts"));
 var errors = __toESM(require("../errors"));
-var import_integration_ref = require("../integration-ref");
+var pkgRef = __toESM(require("../package-ref"));
 var utils = __toESM(require("../utils"));
+var import_global_command = require("./global-command");
 var import_project_command = require("./project-command");
-class AddCommand extends import_project_command.ProjectCommand {
+class AddCommand extends import_global_command.GlobalCommand {
   async run() {
-    const projectDef = await this.readProjectDefinitionFromFS();
-    if (projectDef.type !== "bot") {
-      throw new errors.ExclusiveBotFeatureError();
-    }
-    const integrationRef = this.argv.integrationRef;
-    const parsedRef = (0, import_integration_ref.parseIntegrationRef)(integrationRef);
+    const parsedRef = pkgRef.parsePackageRef(this.argv.packageRef);
     if (!parsedRef) {
-      throw new errors.InvalidIntegrationReferenceError(integrationRef);
+      throw new errors.InvalidPackageReferenceError(this.argv.packageRef);
+    }
+    const targetPackage = parsedRef.type === "path" ? await this._findLocalPackage(parsedRef) : await this._findRemotePackage(parsedRef);
+    if (!targetPackage) {
+      const notFoundMessage = this.argv.packageType ? `Could not find package "${this.argv.packageRef}" of type "${this.argv.packageType}"` : `Could not find package "${this.argv.packageRef}"`;
+      throw new errors.BotpressCLIError(notFoundMessage);
     }
-    const integration = parsedRef.type === "path" ? await this._fetchLocalIntegrationOrInterface(parsedRef) : await this._fetchApiIntegration(parsedRef);
-    const allInstances = await this._listIntegrationInstances();
-    const existingInstance = allInstances.find((i) => i.name === integration.name);
-    if (existingInstance) {
-      this.logger.warn(`Integration with name "${integration.name}" already installed.`);
-      const res = await this.prompt.confirm("Do you want to overwrite the existing instance?");
+    const packageName = targetPackage.name;
+    const baseInstallPath = utils.path.absoluteFrom(utils.path.cwd(), this.argv.installPath);
+    const packageDirName = utils.casing.to.kebabCase(packageName);
+    const installPath = utils.path.join(baseInstallPath, consts.installDirName, packageDirName);
+    const alreadyInstalled = fslib.existsSync(installPath);
+    if (alreadyInstalled) {
+      this.logger.warn(`Package with name "${packageName}" already installed.`);
+      const res = await this.prompt.confirm("Do you want to overwrite the existing package?");
       if (!res) {
         this.logger.log("Aborted");
         return;
       }
-      await this._uninstallIntegration(existingInstance);
+      await this._uninstall(installPath);
     }
-    await this._generateIntegrationInstance(integration);
-  }
-  _fetchLocalIntegrationOrInterface = async (integrationOrInterfaceRef) => {
-    this.logger.warn(
-      "Installing integration from a local path. There is no guarantee that the integration is deployed with the expected schemas."
-    );
-    const workDir = integrationOrInterfaceRef.path;
-    const pathStore = new utils.path.PathStore({
-      workDir,
-      integrationDefinition: utils.path.absoluteFrom(workDir, consts.fromWorkDir.integrationDefinition),
-      interfaceDefinition: utils.path.absoluteFrom(workDir, consts.fromWorkDir.interfaceDefinition)
-    });
-    const projectDef = await this.readProjectDefinitionFromFS(pathStore);
-    if (projectDef.type === "bot") {
-      throw new errors.BotpressCLIError(`Integration definition not found at ${workDir}`);
-    } else if (projectDef.type === "interface") {
-      throw new errors.BotpressCLIError("Installing interfaces is not supported yet");
+    let files;
+    if (targetPackage.type === "integration") {
+      files = await codegen.generateIntegrationPackage(targetPackage.pkg);
+    } else {
+      files = await codegen.generateInterfacePackage(targetPackage.pkg);
     }
-    return projectDef.definition;
-  };
-  _fetchApiIntegration = async (integrationRef) => {
+    await this._install(installPath, files);
+  }
+  async _findRemotePackage(ref) {
     const api = await this.ensureLoginAndCreateClient(this.argv);
-    const integration = await api.findIntegration(integrationRef);
-    if (integration) {
-      return integration;
+    if (this._pkgCouldBe("integration")) {
+      const integration = await api.findIntegration(ref);
+      if (integration) {
+        return { type: "integration", name: integration.name, pkg: { source: "remote", integration } };
+      }
     }
-    const intrface = await api.findPublicInterface(integrationRef);
-    if (intrface) {
-      throw new errors.BotpressCLIError("Installing interfaces is not supported yet");
+    if (this._pkgCouldBe("interface")) {
+      const intrface = await api.findPublicInterface(ref);
+      if (intrface) {
+        return { type: "interface", name: intrface.name, pkg: { source: "remote", interface: intrface } };
+      }
     }
-    const formattedRef = (0, import_integration_ref.formatIntegrationRef)(integrationRef);
-    throw new errors.BotpressCLIError(`Integration "${formattedRef}" not found`);
-  };
-  async _listIntegrationInstances() {
-    const installPath = this.projectPaths.abs.installDir;
-    if (!fs.existsSync(installPath)) {
-      this.logger.debug("Install path does not exist. Skipping listing of integration instances");
-      return [];
+    return;
+  }
+  async _findLocalPackage(ref) {
+    const absPath = utils.path.absoluteFrom(utils.path.cwd(), ref.path);
+    const projectDefinition = await this._readProject(absPath);
+    if (this._pkgCouldBe("integration") && projectDefinition?.type === "integration") {
+      return {
+        type: "integration",
+        name: projectDefinition.definition.name,
+        pkg: { source: "local", path: absPath }
+      };
     }
-    const allFiles = await fs.promises.readdir(installPath);
-    const allPaths = allFiles.map((name) => pathlib.join(installPath, name));
-    const directories = await import_bluebird.default.filter(allPaths, async (path) => {
-      const stat = await fs.promises.stat(path);
-      return stat.isDirectory();
-    });
-    let jsons = directories.map((root) => ({ root, json: pathlib.join(root, codegen.INTEGRATION_JSON) }));
-    jsons = jsons.filter(({ json: x }) => fs.existsSync(x));
-    return import_bluebird.default.map(jsons, async ({ root, json }) => {
-      const content = await fs.promises.readFile(json, "utf-8");
-      const { name, version, id } = JSON.parse(content);
-      const dirname = pathlib.basename(root);
+    if (this._pkgCouldBe("interface") && projectDefinition?.type === "interface") {
       return {
-        dirname,
-        id,
-        name,
-        version
+        type: "interface",
+        name: projectDefinition.definition.name,
+        pkg: { source: "local", path: absPath }
       };
-    });
-  }
-  async _uninstallIntegration(instance) {
-    const installDir = this.projectPaths.abs.installDir;
-    const instancePath = pathlib.join(installDir, instance.dirname);
-    await fs.promises.rm(instancePath, { recursive: true });
-    await this._generateBotIndex();
+    }
+    if (projectDefinition?.type === "bot") {
+      throw new errors.BotpressCLIError("Cannot install a bot as a package");
+    }
+    return;
   }
-  async _generateIntegrationInstance(integration) {
+  async _install(installPath, files) {
     const line = this.logger.line();
-    const { name, version } = integration;
-    line.started(`Installing ${import_chalk.default.bold(name)} v${version}...`);
-    const instanceFiles = await codegen.generateIntegrationInstance(
-      integration,
-      this.projectPaths.rel("outDir").installDir
-    );
-    await this.writeGeneratedFilesToOutFolder(instanceFiles);
-    await this._generateBotIndex();
-    const rel = this.projectPaths.rel("workDir");
-    line.success(`Installed integration available at ${import_chalk.default.grey(rel.outDir)}`);
+    line.started(`Installing ${files.length} files to "${installPath}"`);
+    try {
+      for (const file of files) {
+        const filePath = utils.path.absoluteFrom(installPath, file.path);
+        const dirPath = pathlib.dirname(filePath);
+        await fslib.promises.mkdir(dirPath, { recursive: true });
+        await fslib.promises.writeFile(filePath, file.content);
+      }
+      line.success(`Installed ${files.length} files to "${installPath}"`);
+    } finally {
+      line.commit();
+    }
+  }
+  async _uninstall(installPath) {
+    await fslib.promises.rm(installPath, { recursive: true });
   }
-  async _generateBotIndex() {
-    const allInstances = await this._listIntegrationInstances();
-    const indexFile = await codegen.generateBotIndex(this.projectPaths.rel("outDir").installDir, allInstances);
-    await this.writeGeneratedFilesToOutFolder([indexFile]);
+  async _readProject(workDir) {
+    class AnyProjectCommand extends import_project_command.ProjectCommand {
+      async run() {
+        throw new errors.BotpressCLIError("Not implemented");
+      }
+      async readProjectDefinitionFromFS() {
+        return super.readProjectDefinitionFromFS();
+      }
+    }
+    const cmd = new AnyProjectCommand(import_api.ApiClient, this.prompt, this.logger, {
+      ...this.argv,
+      entryPoint: consts.defaultEntrypoint,
+      outDir: consts.defaultOutputFolder,
+      workDir
+    });
+    return cmd.readProjectDefinitionFromFS().catch((thrown) => {
+      if (thrown instanceof errors.ProjectDefinitionNotFoundError) {
+        return void 0;
+      }
+      throw thrown;
+    });
   }
+  _pkgCouldBe = (pkgType) => {
+    if (!this.argv.packageType) {
+      return true;
+    }
+    return this.argv.packageType === pkgType;
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/add-command.ts"],
-  "sourcesContent": ["import type * as client from '@botpress/client'\nimport type * as sdk from '@botpress/sdk'\nimport bluebird from 'bluebird'\nimport chalk from 'chalk'\nimport * as fs from 'fs'\nimport * as pathlib from 'path'\nimport * as codegen from '../code-generation'\nimport type commandDefinitions from '../command-definitions'\nimport * as consts from '../consts'\nimport * as errors from '../errors'\nimport {\n  ApiIntegrationRef,\n  formatIntegrationRef,\n  LocalPathIntegrationRef,\n  parseIntegrationRef,\n} from '../integration-ref'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\ntype IntegrationInstallDir = codegen.IntegrationInstanceJson & {\n  dirname: string\n}\n\nexport type AddCommandDefinition = typeof commandDefinitions.add\nexport class AddCommand extends ProjectCommand<AddCommandDefinition> {\n  public async run(): Promise<void> {\n    const projectDef = await this.readProjectDefinitionFromFS()\n    if (projectDef.type !== 'bot') {\n      throw new errors.ExclusiveBotFeatureError()\n    }\n\n    const integrationRef = this.argv.integrationRef\n\n    const parsedRef = parseIntegrationRef(integrationRef)\n    if (!parsedRef) {\n      throw new errors.InvalidIntegrationReferenceError(integrationRef)\n    }\n\n    const integration =\n      parsedRef.type === 'path'\n        ? await this._fetchLocalIntegrationOrInterface(parsedRef)\n        : await this._fetchApiIntegration(parsedRef)\n\n    const allInstances = await this._listIntegrationInstances()\n    const existingInstance = allInstances.find((i) => i.name === integration.name)\n    if (existingInstance) {\n      this.logger.warn(`Integration with name \"${integration.name}\" already installed.`)\n      const res = await this.prompt.confirm('Do you want to overwrite the existing instance?')\n      if (!res) {\n        this.logger.log('Aborted')\n        return\n      }\n\n      await this._uninstallIntegration(existingInstance)\n    }\n\n    await this._generateIntegrationInstance(integration)\n  }\n\n  private _fetchLocalIntegrationOrInterface = async (\n    integrationOrInterfaceRef: LocalPathIntegrationRef\n  ): Promise<sdk.IntegrationDefinition> => {\n    this.logger.warn(\n      'Installing integration from a local path. There is no guarantee that the integration is deployed with the expected schemas.'\n    )\n\n    const workDir = integrationOrInterfaceRef.path\n    const pathStore = new utils.path.PathStore<'workDir' | 'integrationDefinition' | 'interfaceDefinition'>({\n      workDir,\n      integrationDefinition: utils.path.absoluteFrom(workDir, consts.fromWorkDir.integrationDefinition),\n      interfaceDefinition: utils.path.absoluteFrom(workDir, consts.fromWorkDir.interfaceDefinition),\n    })\n\n    const projectDef = await this.readProjectDefinitionFromFS(pathStore)\n    if (projectDef.type === 'bot') {\n      throw new errors.BotpressCLIError(`Integration definition not found at ${workDir}`)\n    } else if (projectDef.type === 'interface') {\n      throw new errors.BotpressCLIError('Installing interfaces is not supported yet')\n    }\n\n    return projectDef.definition\n  }\n\n  private _fetchApiIntegration = async (integrationRef: ApiIntegrationRef): Promise<client.Integration> => {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n    const integration = await api.findIntegration(integrationRef)\n    if (integration) {\n      return integration\n    }\n\n    const intrface = await api.findPublicInterface(integrationRef)\n    if (intrface) {\n      throw new errors.BotpressCLIError('Installing interfaces is not supported yet')\n    }\n\n    const formattedRef = formatIntegrationRef(integrationRef)\n    throw new errors.BotpressCLIError(`Integration \"${formattedRef}\" not found`)\n  }\n\n  private async _listIntegrationInstances(): Promise<IntegrationInstallDir[]> {\n    const installPath = this.projectPaths.abs.installDir\n    if (!fs.existsSync(installPath)) {\n      this.logger.debug('Install path does not exist. Skipping listing of integration instances')\n      return []\n    }\n\n    const allFiles = await fs.promises.readdir(installPath)\n    const allPaths = allFiles.map((name) => pathlib.join(installPath, name))\n    const directories = await bluebird.filter(allPaths, async (path) => {\n      const stat = await fs.promises.stat(path)\n      return stat.isDirectory()\n    })\n\n    let jsons = directories.map((root) => ({ root, json: pathlib.join(root, codegen.INTEGRATION_JSON) }))\n    jsons = jsons.filter(({ json: x }) => fs.existsSync(x))\n\n    return bluebird.map(jsons, async ({ root, json }) => {\n      const content: string = await fs.promises.readFile(json, 'utf-8')\n      const { name, version, id } = JSON.parse(content) as codegen.IntegrationInstanceJson\n      const dirname = pathlib.basename(root)\n      return {\n        dirname,\n        id,\n        name,\n        version,\n      }\n    })\n  }\n\n  private async _uninstallIntegration(instance: IntegrationInstallDir) {\n    const installDir = this.projectPaths.abs.installDir\n    const instancePath = pathlib.join(installDir, instance.dirname)\n    await fs.promises.rm(instancePath, { recursive: true })\n    await this._generateBotIndex()\n  }\n\n  private async _generateIntegrationInstance(integration: client.Integration | sdk.IntegrationDefinition) {\n    const line = this.logger.line()\n\n    const { name, version } = integration\n    line.started(`Installing ${chalk.bold(name)} v${version}...`)\n\n    const instanceFiles = await codegen.generateIntegrationInstance(\n      integration,\n      this.projectPaths.rel('outDir').installDir\n    )\n    await this.writeGeneratedFilesToOutFolder(instanceFiles)\n    await this._generateBotIndex()\n\n    const rel = this.projectPaths.rel('workDir')\n    line.success(`Installed integration available at ${chalk.grey(rel.outDir)}`)\n  }\n\n  private async _generateBotIndex() {\n    const allInstances = await this._listIntegrationInstances()\n    const indexFile = await codegen.generateBotIndex(this.projectPaths.rel('outDir').installDir, allInstances)\n    await this.writeGeneratedFilesToOutFolder([indexFile])\n  }\n}\n"],
-  "mappings": "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",
-  "names": ["bluebird", "chalk"]
+  "sourcesContent": ["import * as fslib from 'fs'\nimport * as pathlib from 'path'\nimport { ApiClient } from '../api'\nimport * as codegen from '../code-generation'\nimport type commandDefinitions from '../command-definitions'\nimport * as consts from '../consts'\nimport * as errors from '../errors'\nimport * as pkgRef from '../package-ref'\nimport * as utils from '../utils'\nimport { GlobalCommand } from './global-command'\nimport { ProjectCommand, ProjectCommandDefinition, ProjectDefinition } from './project-command'\n\ntype InstallablePackage =\n  | {\n      type: 'integration'\n      name: string\n      pkg: codegen.IntegrationInstallablePackage\n    }\n  | {\n      type: 'interface'\n      name: string\n      pkg: codegen.InterfaceInstallablePackage\n    }\n\nexport type AddCommandDefinition = typeof commandDefinitions.add\nexport class AddCommand extends GlobalCommand<AddCommandDefinition> {\n  public async run(): Promise<void> {\n    const parsedRef = pkgRef.parsePackageRef(this.argv.packageRef)\n    if (!parsedRef) {\n      throw new errors.InvalidPackageReferenceError(this.argv.packageRef)\n    }\n\n    const targetPackage =\n      parsedRef.type === 'path' ? await this._findLocalPackage(parsedRef) : await this._findRemotePackage(parsedRef)\n\n    if (!targetPackage) {\n      const notFoundMessage = this.argv.packageType\n        ? `Could not find package \"${this.argv.packageRef}\" of type \"${this.argv.packageType}\"`\n        : `Could not find package \"${this.argv.packageRef}\"`\n      throw new errors.BotpressCLIError(notFoundMessage)\n    }\n\n    const packageName = targetPackage.name // TODO: eventually replace name by alias (with argv --alias)\n    const baseInstallPath = utils.path.absoluteFrom(utils.path.cwd(), this.argv.installPath)\n    const packageDirName = utils.casing.to.kebabCase(packageName)\n    const installPath = utils.path.join(baseInstallPath, consts.installDirName, packageDirName)\n\n    const alreadyInstalled = fslib.existsSync(installPath)\n    if (alreadyInstalled) {\n      this.logger.warn(`Package with name \"${packageName}\" already installed.`)\n      const res = await this.prompt.confirm('Do you want to overwrite the existing package?')\n      if (!res) {\n        this.logger.log('Aborted')\n        return\n      }\n\n      await this._uninstall(installPath)\n    }\n\n    let files: codegen.File[]\n    if (targetPackage.type === 'integration') {\n      files = await codegen.generateIntegrationPackage(targetPackage.pkg)\n    } else {\n      files = await codegen.generateInterfacePackage(targetPackage.pkg)\n    }\n\n    await this._install(installPath, files)\n  }\n\n  private async _findRemotePackage(ref: pkgRef.ApiPackageRef): Promise<InstallablePackage | undefined> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n    if (this._pkgCouldBe('integration')) {\n      const integration = await api.findIntegration(ref)\n      if (integration) {\n        return { type: 'integration', name: integration.name, pkg: { source: 'remote', integration } }\n      }\n    }\n    if (this._pkgCouldBe('interface')) {\n      const intrface = await api.findPublicInterface(ref)\n      if (intrface) {\n        return { type: 'interface', name: intrface.name, pkg: { source: 'remote', interface: intrface } }\n      }\n    }\n    return\n  }\n\n  private async _findLocalPackage(ref: pkgRef.LocalPackageRef): Promise<InstallablePackage | undefined> {\n    const absPath = utils.path.absoluteFrom(utils.path.cwd(), ref.path)\n    const projectDefinition = await this._readProject(absPath)\n    if (this._pkgCouldBe('integration') && projectDefinition?.type === 'integration') {\n      return {\n        type: 'integration',\n        name: projectDefinition.definition.name,\n        pkg: { source: 'local', path: absPath },\n      }\n    }\n    if (this._pkgCouldBe('interface') && projectDefinition?.type === 'interface') {\n      return {\n        type: 'interface',\n        name: projectDefinition.definition.name,\n        pkg: { source: 'local', path: absPath },\n      }\n    }\n    if (projectDefinition?.type === 'bot') {\n      throw new errors.BotpressCLIError('Cannot install a bot as a package')\n    }\n    return\n  }\n\n  private async _install(installPath: utils.path.AbsolutePath, files: codegen.File[]): Promise<void> {\n    const line = this.logger.line()\n    line.started(`Installing ${files.length} files to \"${installPath}\"`)\n    try {\n      for (const file of files) {\n        const filePath = utils.path.absoluteFrom(installPath, file.path)\n        const dirPath = pathlib.dirname(filePath)\n        await fslib.promises.mkdir(dirPath, { recursive: true })\n        await fslib.promises.writeFile(filePath, file.content)\n      }\n      line.success(`Installed ${files.length} files to \"${installPath}\"`)\n    } finally {\n      line.commit()\n    }\n  }\n\n  private async _uninstall(installPath: utils.path.AbsolutePath): Promise<void> {\n    await fslib.promises.rm(installPath, { recursive: true })\n  }\n\n  private async _readProject(workDir: utils.path.AbsolutePath): Promise<ProjectDefinition | undefined> {\n    // this is a hack to avoid refactoring the project command class\n    class AnyProjectCommand extends ProjectCommand<ProjectCommandDefinition> {\n      public async run(): Promise<void> {\n        throw new errors.BotpressCLIError('Not implemented')\n      }\n\n      public async readProjectDefinitionFromFS(): Promise<ProjectDefinition> {\n        return super.readProjectDefinitionFromFS()\n      }\n    }\n\n    const cmd = new AnyProjectCommand(ApiClient, this.prompt, this.logger, {\n      ...this.argv,\n      entryPoint: consts.defaultEntrypoint,\n      outDir: consts.defaultOutputFolder,\n      workDir,\n    })\n\n    return cmd.readProjectDefinitionFromFS().catch((thrown) => {\n      if (thrown instanceof errors.ProjectDefinitionNotFoundError) {\n        return undefined\n      }\n      throw thrown\n    })\n  }\n\n  private _pkgCouldBe = (pkgType: InstallablePackage['type']) => {\n    if (!this.argv.packageType) {\n      return true\n    }\n    return this.argv.packageType === pkgType\n  }\n}\n"],
+  "mappings": "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",
+  "names": []
 }

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

@@ -28,25 +28,32 @@ __export(bundle_command_exports, {
 });
 module.exports = __toCommonJS(bundle_command_exports);
 var import_chalk = __toESM(require("chalk"));
+var errors = __toESM(require("../errors"));
 var utils = __toESM(require("../utils"));
 var import_project_command = require("./project-command");
 class BundleCommand extends import_project_command.ProjectCommand {
   async run() {
-    const { type: projectType, definition: integrationDef } = await this.readProjectDefinitionFromFS();
-    if (projectType === "interface") {
-      this.logger.success("Interface projects have nothing to bundle.");
+    const projectDef = await this.readProjectDefinitionFromFS();
+    if (projectDef.type === "interface") {
+      this.logger.success("Interface projects have no implementation to bundle.");
       return;
     }
-    const abs = this.projectPaths.abs;
-    const rel = this.projectPaths.rel("workDir");
     const line = this.logger.line();
-    const logLevel = this.argv.verbose ? "info" : "silent";
-    if (integrationDef) {
-      const { name } = integrationDef;
+    if (projectDef.type === "integration") {
+      const { name } = projectDef.definition;
       line.started(`Bundling integration ${import_chalk.default.bold(name)}...`);
-    } else {
+      return await this._bundle(line);
+    }
+    if (projectDef.type === "bot") {
       line.started("Bundling bot...");
+      return await this._bundle(line);
     }
+    throw new errors.UnsupportedProjectType();
+  }
+  async _bundle(line) {
+    const logLevel = this.argv.verbose ? "info" : "silent";
+    const abs = this.projectPaths.abs;
+    const rel = this.projectPaths.rel("workDir");
     const unixPath = utils.path.toUnix(rel.entryPoint);
     const importFrom = utils.path.rmExtension(unixPath);
     const code = `import x from './${importFrom}'; export default x; export const handler = x.handler;`;

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/bundle-command.ts"],
-  "sourcesContent": ["import chalk from 'chalk'\nimport type commandDefinitions from '../command-definitions'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\nexport type BundleCommandDefinition = typeof commandDefinitions.bundle\nexport class BundleCommand extends ProjectCommand<BundleCommandDefinition> {\n  public async run(): Promise<void> {\n    const { type: projectType, definition: integrationDef } = await this.readProjectDefinitionFromFS()\n\n    if (projectType === 'interface') {\n      this.logger.success('Interface projects have nothing to bundle.')\n      return\n    }\n\n    const abs = this.projectPaths.abs\n    const rel = this.projectPaths.rel('workDir')\n\n    const line = this.logger.line()\n\n    const logLevel = this.argv.verbose ? 'info' : 'silent'\n\n    if (integrationDef) {\n      const { name } = integrationDef\n      line.started(`Bundling integration ${chalk.bold(name)}...`)\n    } else {\n      line.started('Bundling bot...')\n    }\n\n    const unixPath = utils.path.toUnix(rel.entryPoint)\n    const importFrom = utils.path.rmExtension(unixPath)\n    const code = `import x from './${importFrom}'; export default x; export const handler = x.handler;`\n\n    const outfile = abs.outFile // TODO: ensure dir exists\n    line.debug(`Writing bundle to ${outfile}`)\n\n    await utils.esbuild.buildCode({\n      code,\n      cwd: abs.workDir,\n      outfile,\n      logLevel,\n      write: true,\n      sourcemap: this.argv.sourceMap,\n      minify: this.argv.minify,\n    })\n\n    line.success(`Bundle available at ${chalk.grey(rel.outDir)}`)\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,YAAuB;AACvB,6BAA+B;AAGxB,MAAM,sBAAsB,sCAAwC;AAAA,EACzE,MAAa,MAAqB;AAChC,UAAM,EAAE,MAAM,aAAa,YAAY,eAAe,IAAI,MAAM,KAAK,4BAA4B;AAEjG,QAAI,gBAAgB,aAAa;AAC/B,WAAK,OAAO,QAAQ,4CAA4C;AAChE;AAAA,IACF;AAEA,UAAM,MAAM,KAAK,aAAa;AAC9B,UAAM,MAAM,KAAK,aAAa,IAAI,SAAS;AAE3C,UAAM,OAAO,KAAK,OAAO,KAAK;AAE9B,UAAM,WAAW,KAAK,KAAK,UAAU,SAAS;AAE9C,QAAI,gBAAgB;AAClB,YAAM,EAAE,KAAK,IAAI;AACjB,WAAK,QAAQ,wBAAwB,aAAAA,QAAM,KAAK,IAAI,MAAM;AAAA,IAC5D,OAAO;AACL,WAAK,QAAQ,iBAAiB;AAAA,IAChC;AAEA,UAAM,WAAW,MAAM,KAAK,OAAO,IAAI,UAAU;AACjD,UAAM,aAAa,MAAM,KAAK,YAAY,QAAQ;AAClD,UAAM,OAAO,oBAAoB;AAEjC,UAAM,UAAU,IAAI;AACpB,SAAK,MAAM,qBAAqB,SAAS;AAEzC,UAAM,MAAM,QAAQ,UAAU;AAAA,MAC5B;AAAA,MACA,KAAK,IAAI;AAAA,MACT;AAAA,MACA;AAAA,MACA,OAAO;AAAA,MACP,WAAW,KAAK,KAAK;AAAA,MACrB,QAAQ,KAAK,KAAK;AAAA,IACpB,CAAC;AAED,SAAK,QAAQ,uBAAuB,aAAAA,QAAM,KAAK,IAAI,MAAM,GAAG;AAAA,EAC9D;AACF;",
+  "sourcesContent": ["import chalk from 'chalk'\nimport { SingleLineLogger } from 'src/logger'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\nexport type BundleCommandDefinition = typeof commandDefinitions.bundle\nexport class BundleCommand extends ProjectCommand<BundleCommandDefinition> {\n  public async run(): Promise<void> {\n    const projectDef = await this.readProjectDefinitionFromFS()\n\n    if (projectDef.type === 'interface') {\n      this.logger.success('Interface projects have no implementation to bundle.')\n      return\n    }\n\n    const line = this.logger.line()\n\n    if (projectDef.type === 'integration') {\n      const { name } = projectDef.definition\n      line.started(`Bundling integration ${chalk.bold(name)}...`)\n      return await this._bundle(line)\n    }\n\n    if (projectDef.type === 'bot') {\n      line.started('Bundling bot...')\n      return await this._bundle(line)\n    }\n\n    throw new errors.UnsupportedProjectType()\n  }\n\n  private async _bundle(line: SingleLineLogger) {\n    const logLevel = this.argv.verbose ? 'info' : 'silent'\n    const abs = this.projectPaths.abs\n    const rel = this.projectPaths.rel('workDir')\n\n    const unixPath = utils.path.toUnix(rel.entryPoint)\n    const importFrom = utils.path.rmExtension(unixPath)\n    const code = `import x from './${importFrom}'; export default x; export const handler = x.handler;`\n\n    const outfile = abs.outFile // TODO: ensure dir exists\n    line.debug(`Writing bundle to ${outfile}`)\n\n    await utils.esbuild.buildCode({\n      code,\n      cwd: abs.workDir,\n      outfile,\n      logLevel,\n      write: true,\n      sourcemap: this.argv.sourceMap,\n      minify: this.argv.minify,\n    })\n\n    line.success(`Bundle available at ${chalk.grey(rel.outDir)}`)\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAGlB,aAAwB;AACxB,YAAuB;AACvB,6BAA+B;AAGxB,MAAM,sBAAsB,sCAAwC;AAAA,EACzE,MAAa,MAAqB;AAChC,UAAM,aAAa,MAAM,KAAK,4BAA4B;AAE1D,QAAI,WAAW,SAAS,aAAa;AACnC,WAAK,OAAO,QAAQ,sDAAsD;AAC1E;AAAA,IACF;AAEA,UAAM,OAAO,KAAK,OAAO,KAAK;AAE9B,QAAI,WAAW,SAAS,eAAe;AACrC,YAAM,EAAE,KAAK,IAAI,WAAW;AAC5B,WAAK,QAAQ,wBAAwB,aAAAA,QAAM,KAAK,IAAI,MAAM;AAC1D,aAAO,MAAM,KAAK,QAAQ,IAAI;AAAA,IAChC;AAEA,QAAI,WAAW,SAAS,OAAO;AAC7B,WAAK,QAAQ,iBAAiB;AAC9B,aAAO,MAAM,KAAK,QAAQ,IAAI;AAAA,IAChC;AAEA,UAAM,IAAI,OAAO,uBAAuB;AAAA,EAC1C;AAAA,EAEA,MAAc,QAAQ,MAAwB;AAC5C,UAAM,WAAW,KAAK,KAAK,UAAU,SAAS;AAC9C,UAAM,MAAM,KAAK,aAAa;AAC9B,UAAM,MAAM,KAAK,aAAa,IAAI,SAAS;AAE3C,UAAM,WAAW,MAAM,KAAK,OAAO,IAAI,UAAU;AACjD,UAAM,aAAa,MAAM,KAAK,YAAY,QAAQ;AAClD,UAAM,OAAO,oBAAoB;AAEjC,UAAM,UAAU,IAAI;AACpB,SAAK,MAAM,qBAAqB,SAAS;AAEzC,UAAM,MAAM,QAAQ,UAAU;AAAA,MAC5B;AAAA,MACA,KAAK,IAAI;AAAA,MACT;AAAA,MACA;AAAA,MACA,OAAO;AAAA,MACP,WAAW,KAAK,KAAK;AAAA,MACrB,QAAQ,KAAK,KAAK;AAAA,IACpB,CAAC;AAED,SAAK,QAAQ,uBAAuB,aAAAA,QAAM,KAAK,IAAI,MAAM,GAAG;AAAA,EAC9D;AACF;",
   "names": ["chalk"]
 }

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

@@ -27,6 +27,7 @@ __export(deploy_command_exports, {
   DeployCommand: () => DeployCommand
 });
 module.exports = __toCommonJS(deploy_command_exports);
+var sdk = __toESM(require("@botpress/sdk"));
 var import_chalk = __toESM(require("chalk"));
 var fs = __toESM(require("fs"));
 var import_semver = __toESM(require("semver"));
@@ -34,6 +35,7 @@ var import_bot_body = require("../api/bot-body");
 var import_integration_body = require("../api/integration-body");
 var import_interface_body = require("../api/interface-body");
 var errors = __toESM(require("../errors"));
+var import_sdk = require("../sdk");
 var utils = __toESM(require("../utils"));
 var import_build_command = require("./build-command");
 var import_project_command = require("./project-command");
@@ -50,7 +52,10 @@ class DeployCommand extends import_project_command.ProjectCommand {
     if (projectDef.type === "interface") {
       return this._deployInterface(api, projectDef.definition);
     }
-    return this._deployBot(api, this.argv.botId, this.argv.createNewBot);
+    if (projectDef.type === "bot") {
+      return this._deployBot(api, projectDef.definition, this.argv.botId, this.argv.createNewBot);
+    }
+    throw new errors.UnsupportedProjectType();
   }
   async _runBuild() {
     return new import_build_command.BuildCommand(this.api, this.prompt, this.logger, this.argv).run();
@@ -90,6 +95,7 @@ class DeployCommand extends import_project_command.ProjectCommand {
       this.logger.log("Aborted");
       return;
     }
+    this.logger.debug("Preparing integration request body...");
     let createBody = await (0, import_integration_body.prepareCreateIntegrationBody)(integrationDef);
     createBody = {
       ...createBody,
@@ -128,7 +134,13 @@ class DeployCommand extends import_project_command.ProjectCommand {
       });
       line.success(successMessage);
     } else {
+      this.logger.debug(`looking for previous version of integration "${name}"`);
       const previousVersion = await api.findPreviousIntegrationVersion({ type: "name", name, version });
+      if (previousVersion) {
+        this.logger.debug(`previous version found: ${previousVersion.version}`);
+      } else {
+        this.logger.debug("no previous version found");
+      }
       const knownSecrets = previousVersion?.secrets;
       const createSecrets = await this.promptSecrets(integrationDef, this.argv, { knownSecrets });
       createBody.secrets = utils.records.filterValues(createSecrets, utils.guards.is.notNull);
@@ -232,10 +244,9 @@ class DeployCommand extends import_project_command.ProjectCommand {
       throw errors.BotpressCLIError.wrap(thrown, `Could not read ${filePurpose} file "${absoluteFilePath}"`);
     });
   };
-  async _deployBot(api, argvBotId, argvCreateNew) {
+  async _deployBot(api, botDefinition, argvBotId, argvCreateNew) {
     const outfile = this.projectPaths.abs.outFile;
     const code = await fs.promises.readFile(outfile, "utf-8");
-    const { default: botImpl } = utils.require.requireJsFile(outfile);
     let bot;
     if (argvBotId && argvCreateNew) {
       throw new errors.BotpressCLIError("Cannot specify both --botId and --createNew");
@@ -256,10 +267,11 @@ class DeployCommand extends import_project_command.ProjectCommand {
     }
     const line = this.logger.line();
     line.started(`Deploying bot ${import_chalk.default.bold(bot.name)}...`);
-    const integrationInstances = await this.fetchBotIntegrationInstances(botImpl, api);
+    const integrationInstances = await this.fetchBotIntegrationInstances(botDefinition, api);
+    const createBotBody = await (0, import_bot_body.prepareCreateBotBody)(botDefinition);
     const updateBotBody = (0, import_bot_body.prepareUpdateBotBody)(
       {
-        ...await (0, import_bot_body.prepareCreateBotBody)(botImpl),
+        ...createBotBody,
         id: bot.id,
         code,
         integrations: integrationInstances
@@ -330,7 +342,7 @@ class DeployCommand extends import_project_command.ProjectCommand {
         throw new errors.BotpressCLIError(workspaceHandleIsMandatoryMsg);
       }
       const newName2 = `${remoteHandle}/${localName}`;
-      return integration.clone({ name: newName2 });
+      return new sdk.IntegrationDefinition({ ...integration, name: newName2 });
     }
     if (localHandle && !remoteHandle) {
       const { available } = await api.client.checkHandleAvailability({ handle: localHandle }).catch((thrown) => {
@@ -370,7 +382,7 @@ class DeployCommand extends import_project_command.ProjectCommand {
     } while (!claimedHandle);
     this.logger.success(`Handle "${claimedHandle}" is yours!`);
     const newName = `${claimedHandle}/${localName}`;
-    return integration.clone({ name: newName });
+    return new sdk.IntegrationDefinition({ ...integration, name: newName });
   }
   _parseIntegrationName = (integrationName) => {
     const parts = integrationName.split("/");
@@ -387,22 +399,25 @@ class DeployCommand extends import_project_command.ProjectCommand {
     return { name };
   };
   _formatInterfacesImplStatements = async (api, integration) => {
-    const interfacesEntries = Object.entries(integration.interfaces);
-    if (!interfacesEntries.length) {
-      return void 0;
-    }
+    const interfacesStatements = (0, import_sdk.getImplementationStatements)(integration);
     const interfaces = {};
-    for (const [key, i] of interfacesEntries) {
-      const { name, version, entities, actions, events } = i;
-      const intrface = await api.findPublicInterface({ type: "name", name, version });
-      if (!intrface) {
-        throw new errors.BotpressCLIError(`Could not find interface "${name}@${version}"`);
-      }
-      const { id } = intrface;
-      interfaces[key] = { id, entities, actions, events };
+    for (const [key, i] of Object.entries(interfacesStatements)) {
+      const { name, version, entities, actions, events, channels } = i;
+      const id = await this._getInterfaceId(api, { id: i.id, name, version });
+      interfaces[key] = { id, entities, actions, events, channels };
     }
     return interfaces;
   };
+  _getInterfaceId = async (api, ref) => {
+    if (ref.id) {
+      return ref.id;
+    }
+    const intrface = await api.findPublicInterface({ type: "name", name: ref.name, version: ref.version });
+    if (!intrface) {
+      throw new errors.BotpressCLIError(`Could not find interface "${ref.name}@${ref.version}"`);
+    }
+    return intrface.id;
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {