@botpress/cli 7.0.1 → 7.1.0

package/.turbo/turbo-build.log

@@ -1,44 +1,44 @@
 
-> @botpress/cli@7.0.1 build /home/runner/work/botpress/botpress/packages/cli
+> @botpress/cli@7.1.0 build /home/runner/work/botpress/botpress/packages/cli
 > pnpm run build:types && pnpm run bundle && pnpm run template:gen
 
 
-> @botpress/cli@7.0.1 build:types /home/runner/work/botpress/botpress/packages/cli
+> @botpress/cli@7.1.0 build:types /home/runner/work/botpress/botpress/packages/cli
 > tsc -p ./tsconfig.build.json
 
 
-> @botpress/cli@7.0.1 bundle /home/runner/work/botpress/botpress/packages/cli
-> ts-node -T build.ts
+> @botpress/cli@7.1.0 bundle /home/runner/work/botpress/botpress/packages/cli
+> ts-node -T -P tsconfig.ts-node.json build.ts
 
 
-> @botpress/cli@7.0.1 template:gen /home/runner/work/botpress/botpress/packages/cli
+> @botpress/cli@7.1.0 template:gen /home/runner/work/botpress/botpress/packages/cli
 > pnpm -r --stream -F @bp-templates/* exec bp gen
 
-🤖 Botpress CLI v7.0.1
-🤖 Botpress CLI v7.0.1
+🤖 Botpress CLI v7.1.0
 ● Checking if cli is up to date
+🤖 Botpress CLI v7.1.0
 ● Checking if cli is up to date
-🤖 Botpress CLI v7.0.1
-🤖 Botpress CLI v7.0.1
+🤖 Botpress CLI v7.1.0
 ● Checking if cli is up to date
+🤖 Botpress CLI v7.1.0
 ● Checking if cli is up to date
 ● Checking if sdk is up to date
 ● Checking if sdk is up to date
 ● Checking if sdk is up to date
 ● Checking if sdk is up to date
-○ Generating typings for integration empty-integration...
+○ Generating typings for integration hello-world...
 ○ Generating typings for bot...
-○ Generating typings for plugin empty-plugin...
-✓ Typings available at .botpress
 ✓ Typings available at .botpress
 
+○ Generating typings for plugin empty-plugin...
+○ Generating typings for integration empty-integration...
+✓ Typings available at .botpress
 
 ✓ Typings available at .botpress
 
-○ Generating typings for integration hello-world...
 ✓ Typings available at .botpress
 
-🤖 Botpress CLI v7.0.1
+🤖 Botpress CLI v7.1.0
 ● Checking if cli is up to date
 ● Checking if sdk is up to date
 ○ Generating typings for integration webhook-message...

package/dist/code-generation/integration-implementation/integration-implementation.js

@@ -84,11 +84,15 @@ class IntegrationImplementationModule extends import_module.Module {
       "}",
       "export type AnyActionProps = ValueOf<ActionProps>",
       "",
+      // `messages` and `messageCreated` share the same underlying type on a channel (see ExactlyOneProperty in the
+      // SDK), so this resolves correctly regardless of which one the integration actually defines
+      "type ChannelMessages<TChannel extends keyof IntegrationProps['channels']> = NonNullable<",
+      "  IntegrationProps['channels'][TChannel]['messageCreated']",
+      ">",
+      "",
       "export type MessageProps = {",
       "  [TChannel in keyof IntegrationProps['channels']]: {",
-      "    [TMessage in keyof IntegrationProps['channels'][TChannel]['messages']]: Parameters<",
-      "      IntegrationProps['channels'][TChannel]['messages'][TMessage]",
-      "    >[0]",
+      "    [TMessage in keyof ChannelMessages<TChannel>]: Parameters<ChannelMessages<TChannel>[TMessage]>[0]",
       "  }",
       "}",
       "export type AnyMessageProps = ValueOf<ValueOf<MessageProps>>",

package/dist/code-generation/integration-implementation/integration-implementation.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/code-generation/integration-implementation/integration-implementation.ts"],
-  "sourcesContent": ["import * as sdk from '@botpress/sdk'\nimport * as consts from '../consts'\nimport { Module } from '../module'\nimport { IntegrationTypingsModule } from './integration-typings'\n\nexport class IntegrationImplementationModule extends Module {\n  private _typingsModule: IntegrationTypingsModule\n\n  public constructor(integration: sdk.IntegrationDefinition) {\n    super({\n      path: consts.INDEX_FILE,\n      exportName: 'Integration',\n    })\n    this._typingsModule = new IntegrationTypingsModule(integration)\n    this._typingsModule.unshift('typings')\n    this.pushDep(this._typingsModule)\n  }\n\n  public async getContent() {\n    let content = ''\n\n    const typingsImport = this._typingsModule.import(this)\n\n    content += [\n      consts.GENERATED_HEADER,\n      'import * as sdk from \"@botpress/sdk\"',\n      `import * as ${this._typingsModule.name} from \"./${typingsImport}\"`,\n      `export * from \"./${typingsImport}\"`,\n      '',\n      `type TIntegration = sdk.DefaultIntegration<${this._typingsModule.name}.${this._typingsModule.exportName}>`,\n      '',\n      'export type IntegrationProps = sdk.IntegrationProps<TIntegration>',\n      '',\n      'export class Integration extends sdk.Integration<TIntegration> {}',\n      '',\n      'export type Client = sdk.IntegrationSpecificClient<TIntegration>',\n      '',\n      '// extra types',\n      '',\n      'type Cast<X, Y> = X extends Y ? X : Y',\n      'type ValueOf<T> = T[keyof T]',\n      'type AsyncFunction = (...args: any[]) => Promise<any>',\n      '',\n      \"export type HandlerProps = Parameters<IntegrationProps['handler']>[0]\",\n      '',\n      \"export type Context = HandlerProps['ctx']\",\n      \"export type Logger = HandlerProps['logger']\",\n      '',\n      'export type CommonHandlerProps = {',\n      '  ctx: Context',\n      '  client: Client',\n      '  logger: Logger',\n      '}',\n      '',\n      'export type ActionProps = {',\n      \"  [K in keyof IntegrationProps['actions']]: Parameters<IntegrationProps['actions'][K]>[0]\",\n      '}',\n      'export type AnyActionProps = ValueOf<ActionProps>',\n      '',\n      'export type MessageProps = {',\n      \"  [TChannel in keyof IntegrationProps['channels']]: {\",\n      \"    [TMessage in keyof IntegrationProps['channels'][TChannel]['messages']]: Parameters<\",\n      \"      IntegrationProps['channels'][TChannel]['messages'][TMessage]\",\n      '    >[0]',\n      '  }',\n      '}',\n      'export type AnyMessageProps = ValueOf<ValueOf<MessageProps>>',\n      '',\n      'export type AckFunctions = {',\n      '  [TChannel in keyof MessageProps]: {',\n      \"    [TMessage in keyof MessageProps[TChannel]]: Cast<MessageProps[TChannel][TMessage], AnyMessageProps>['ack']\",\n      '  }',\n      '}',\n      'export type AnyAckFunction = ValueOf<ValueOf<AckFunctions>>',\n      '',\n      'export type ClientOperation = ValueOf<{',\n      '  [K in keyof Client as Client[K] extends AsyncFunction ? K : never]: K',\n      '}>',\n      'export type ClientRequests = {',\n      '  [K in ClientOperation]: Parameters<Client[K]>[0]',\n      '}',\n      'export type ClientResponses = {',\n      '  [K in ClientOperation]: Awaited<ReturnType<Client[K]>>',\n      '}',\n    ].join('\\n')\n\n    return content\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,aAAwB;AACxB,oBAAuB;AACvB,iCAAyC;AAElC,MAAM,wCAAwC,qBAAO;AAAA,EAClD;AAAA,EAED,YAAY,aAAwC;AACzD,UAAM;AAAA,MACJ,MAAM,OAAO;AAAA,MACb,YAAY;AAAA,IACd,CAAC;AACD,SAAK,iBAAiB,IAAI,oDAAyB,WAAW;AAC9D,SAAK,eAAe,QAAQ,SAAS;AACrC,SAAK,QAAQ,KAAK,cAAc;AAAA,EAClC;AAAA,EAEA,MAAa,aAAa;AACxB,QAAI,UAAU;AAEd,UAAM,gBAAgB,KAAK,eAAe,OAAO,IAAI;AAErD,eAAW;AAAA,MACT,OAAO;AAAA,MACP;AAAA,MACA,eAAe,KAAK,eAAe,IAAI,YAAY,aAAa;AAAA,MAChE,oBAAoB,aAAa;AAAA,MACjC;AAAA,MACA,8CAA8C,KAAK,eAAe,IAAI,IAAI,KAAK,eAAe,UAAU;AAAA,MACxG;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,EAAE,KAAK,IAAI;AAEX,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import * as sdk from '@botpress/sdk'\nimport * as consts from '../consts'\nimport { Module } from '../module'\nimport { IntegrationTypingsModule } from './integration-typings'\n\nexport class IntegrationImplementationModule extends Module {\n  private _typingsModule: IntegrationTypingsModule\n\n  public constructor(integration: sdk.IntegrationDefinition) {\n    super({\n      path: consts.INDEX_FILE,\n      exportName: 'Integration',\n    })\n    this._typingsModule = new IntegrationTypingsModule(integration)\n    this._typingsModule.unshift('typings')\n    this.pushDep(this._typingsModule)\n  }\n\n  public async getContent() {\n    let content = ''\n\n    const typingsImport = this._typingsModule.import(this)\n\n    content += [\n      consts.GENERATED_HEADER,\n      'import * as sdk from \"@botpress/sdk\"',\n      `import * as ${this._typingsModule.name} from \"./${typingsImport}\"`,\n      `export * from \"./${typingsImport}\"`,\n      '',\n      `type TIntegration = sdk.DefaultIntegration<${this._typingsModule.name}.${this._typingsModule.exportName}>`,\n      '',\n      'export type IntegrationProps = sdk.IntegrationProps<TIntegration>',\n      '',\n      'export class Integration extends sdk.Integration<TIntegration> {}',\n      '',\n      'export type Client = sdk.IntegrationSpecificClient<TIntegration>',\n      '',\n      '// extra types',\n      '',\n      'type Cast<X, Y> = X extends Y ? X : Y',\n      'type ValueOf<T> = T[keyof T]',\n      'type AsyncFunction = (...args: any[]) => Promise<any>',\n      '',\n      \"export type HandlerProps = Parameters<IntegrationProps['handler']>[0]\",\n      '',\n      \"export type Context = HandlerProps['ctx']\",\n      \"export type Logger = HandlerProps['logger']\",\n      '',\n      'export type CommonHandlerProps = {',\n      '  ctx: Context',\n      '  client: Client',\n      '  logger: Logger',\n      '}',\n      '',\n      'export type ActionProps = {',\n      \"  [K in keyof IntegrationProps['actions']]: Parameters<IntegrationProps['actions'][K]>[0]\",\n      '}',\n      'export type AnyActionProps = ValueOf<ActionProps>',\n      '',\n      // `messages` and `messageCreated` share the same underlying type on a channel (see ExactlyOneProperty in the\n      // SDK), so this resolves correctly regardless of which one the integration actually defines\n      \"type ChannelMessages<TChannel extends keyof IntegrationProps['channels']> = NonNullable<\",\n      \"  IntegrationProps['channels'][TChannel]['messageCreated']\",\n      '>',\n      '',\n      'export type MessageProps = {',\n      \"  [TChannel in keyof IntegrationProps['channels']]: {\",\n      '    [TMessage in keyof ChannelMessages<TChannel>]: Parameters<ChannelMessages<TChannel>[TMessage]>[0]',\n      '  }',\n      '}',\n      'export type AnyMessageProps = ValueOf<ValueOf<MessageProps>>',\n      '',\n      'export type AckFunctions = {',\n      '  [TChannel in keyof MessageProps]: {',\n      \"    [TMessage in keyof MessageProps[TChannel]]: Cast<MessageProps[TChannel][TMessage], AnyMessageProps>['ack']\",\n      '  }',\n      '}',\n      'export type AnyAckFunction = ValueOf<ValueOf<AckFunctions>>',\n      '',\n      'export type ClientOperation = ValueOf<{',\n      '  [K in keyof Client as Client[K] extends AsyncFunction ? K : never]: K',\n      '}>',\n      'export type ClientRequests = {',\n      '  [K in ClientOperation]: Parameters<Client[K]>[0]',\n      '}',\n      'export type ClientResponses = {',\n      '  [K in ClientOperation]: Awaited<ReturnType<Client[K]>>',\n      '}',\n    ].join('\\n')\n\n    return content\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,aAAwB;AACxB,oBAAuB;AACvB,iCAAyC;AAElC,MAAM,wCAAwC,qBAAO;AAAA,EAClD;AAAA,EAED,YAAY,aAAwC;AACzD,UAAM;AAAA,MACJ,MAAM,OAAO;AAAA,MACb,YAAY;AAAA,IACd,CAAC;AACD,SAAK,iBAAiB,IAAI,oDAAyB,WAAW;AAC9D,SAAK,eAAe,QAAQ,SAAS;AACrC,SAAK,QAAQ,KAAK,cAAc;AAAA,EAClC;AAAA,EAEA,MAAa,aAAa;AACxB,QAAI,UAAU;AAEd,UAAM,gBAAgB,KAAK,eAAe,OAAO,IAAI;AAErD,eAAW;AAAA,MACT,OAAO;AAAA,MACP;AAAA,MACA,eAAe,KAAK,eAAe,IAAI,YAAY,aAAa;AAAA,MAChE,oBAAoB,aAAa;AAAA,MACjC;AAAA,MACA,8CAA8C,KAAK,eAAe,IAAI,IAAI,KAAK,eAAe,UAAU;AAAA,MACxG;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA;AAAA,MAGA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,EAAE,KAAK,IAAI;AAEX,WAAO;AAAA,EACT;AACF;",
   "names": []
 }

package/dist/code-generation/strings.d.ts

@@ -2,4 +2,4 @@ export declare const typeName: (name: string) => string;
 export declare const importAlias: (name: string) => string;
 export declare const varName: (name: string) => string;
 export declare const fileName: (name: string) => string;
-export declare const dirName: (name: string) => string;
+export declare const dirName: typeof fileName;