@botpress/cli 0.7.0 → 0.8.0

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/code-generation/map-integration.ts"],
-  "sourcesContent": ["import * as client from '@botpress/client'\nimport * as sdk from '@botpress/sdk'\nimport { z } from 'zod'\nimport * as utils from '../utils'\nimport * as types from './typings'\n\nexport namespace from {\n  export const sdk = (i: sdk.IntegrationDefinition): types.IntegrationDefinition => ({\n    id: null,\n    name: i.name,\n    version: i.version,\n    user: {\n      tags: i.user?.tags ?? {},\n      creation: i.user?.creation ?? { enabled: false, requiredTags: [] },\n    },\n    configuration: i.configuration ? _mapSchema(i.configuration) : { schema: {} },\n    events: i.events ? utils.records.mapValues(i.events, _mapSchema) : {},\n    states: i.states ? utils.records.mapValues(i.states, _mapSchema) : {},\n    actions: i.actions\n      ? utils.records.mapValues(i.actions, (a) => ({\n          input: _mapSchema(a.input),\n          output: _mapSchema(a.output),\n        }))\n      : {},\n    channels: i.channels\n      ? utils.records.mapValues(i.channels, (c) => ({\n          conversation: {\n            tags: c.conversation?.tags ?? {},\n            creation: c.conversation?.creation ?? { enabled: false, requiredTags: [] },\n          },\n          message: {\n            tags: c.message?.tags ?? {},\n          },\n          messages: utils.records.mapValues(c.messages, _mapSchema),\n        }))\n      : {},\n  })\n\n  export const client = (i: client.Integration): types.IntegrationDefinition => {\n    const { id, name, version, configuration, channels, states, events, actions, user } = i\n    return { id, name, version, configuration, channels, states, events, actions, user }\n  }\n\n  const _mapSchema = <T extends { schema: z.ZodObject<any> }>(\n    x: T\n  ): utils.types.Merge<T, { schema: ReturnType<typeof utils.schema.mapZodToJsonSchema> }> => ({\n    ...x,\n    schema: utils.schema.mapZodToJsonSchema(x),\n  })\n}\n"],
+  "sourcesContent": ["import * as client from '@botpress/client'\nimport * as sdk from '@botpress/sdk'\nimport { z } from '@botpress/sdk'\nimport * as utils from '../utils'\nimport * as types from './typings'\n\nexport namespace from {\n  export const sdk = (i: sdk.IntegrationDefinition): types.IntegrationDefinition => ({\n    id: null,\n    name: i.name,\n    version: i.version,\n    user: {\n      tags: i.user?.tags ?? {},\n      creation: i.user?.creation ?? { enabled: false, requiredTags: [] },\n    },\n    configuration: i.configuration ? _mapSchema(i.configuration) : { schema: {} },\n    events: i.events ? utils.records.mapValues(i.events, _mapSchema) : {},\n    states: i.states ? utils.records.mapValues(i.states, _mapSchema) : {},\n    actions: i.actions\n      ? utils.records.mapValues(i.actions, (a) => ({\n          input: _mapSchema(a.input),\n          output: _mapSchema(a.output),\n        }))\n      : {},\n    channels: i.channels\n      ? utils.records.mapValues(i.channels, (c) => ({\n          conversation: {\n            tags: c.conversation?.tags ?? {},\n            creation: c.conversation?.creation ?? { enabled: false, requiredTags: [] },\n          },\n          message: {\n            tags: c.message?.tags ?? {},\n          },\n          messages: utils.records.mapValues(c.messages, _mapSchema),\n        }))\n      : {},\n  })\n\n  export const client = (i: client.Integration): types.IntegrationDefinition => {\n    const { id, name, version, configuration, channels, states, events, actions, user } = i\n    return { id, name, version, configuration, channels, states, events, actions, user }\n  }\n\n  const _mapSchema = <T extends { schema: z.ZodObject<any> }>(\n    x: T\n  ): utils.types.Merge<T, { schema: ReturnType<typeof utils.schema.mapZodToJsonSchema> }> => ({\n    ...x,\n    schema: utils.schema.mapZodToJsonSchema(x),\n  })\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,YAAuB;AAGhB,IAAU;AAAA,CAAV,CAAUA,UAAV;AACE,EAAMA,MAAA,MAAM,CAAC,OAA+D;AAAA,IACjF,IAAI;AAAA,IACJ,MAAM,EAAE;AAAA,IACR,SAAS,EAAE;AAAA,IACX,MAAM;AAAA,MACJ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAAA,MACvB,UAAU,EAAE,MAAM,YAAY,EAAE,SAAS,OAAO,cAAc,CAAC,EAAE;AAAA,IACnE;AAAA,IACA,eAAe,EAAE,gBAAgB,WAAW,EAAE,aAAa,IAAI,EAAE,QAAQ,CAAC,EAAE;AAAA,IAC5E,QAAQ,EAAE,SAAS,MAAM,QAAQ,UAAU,EAAE,QAAQ,UAAU,IAAI,CAAC;AAAA,IACpE,QAAQ,EAAE,SAAS,MAAM,QAAQ,UAAU,EAAE,QAAQ,UAAU,IAAI,CAAC;AAAA,IACpE,SAAS,EAAE,UACP,MAAM,QAAQ,UAAU,EAAE,SAAS,CAAC,OAAO;AAAA,MACzC,OAAO,WAAW,EAAE,KAAK;AAAA,MACzB,QAAQ,WAAW,EAAE,MAAM;AAAA,IAC7B,EAAE,IACF,CAAC;AAAA,IACL,UAAU,EAAE,WACR,MAAM,QAAQ,UAAU,EAAE,UAAU,CAAC,OAAO;AAAA,MAC1C,cAAc;AAAA,QACZ,MAAM,EAAE,cAAc,QAAQ,CAAC;AAAA,QAC/B,UAAU,EAAE,cAAc,YAAY,EAAE,SAAS,OAAO,cAAc,CAAC,EAAE;AAAA,MAC3E;AAAA,MACA,SAAS;AAAA,QACP,MAAM,EAAE,SAAS,QAAQ,CAAC;AAAA,MAC5B;AAAA,MACA,UAAU,MAAM,QAAQ,UAAU,EAAE,UAAU,UAAU;AAAA,IAC1D,EAAE,IACF,CAAC;AAAA,EACP;AAEO,EAAMA,MAAA,SAAS,CAAC,MAAuD;AAC5E,UAAM,EAAE,IAAI,MAAM,SAAS,eAAe,UAAU,QAAQ,QAAQ,SAAS,KAAK,IAAI;AACtF,WAAO,EAAE,IAAI,MAAM,SAAS,eAAe,UAAU,QAAQ,QAAQ,SAAS,KAAK;AAAA,EACrF;AAEA,QAAM,aAAa,CACjB,OAC0F;AAAA,IAC1F,GAAG;AAAA,IACH,QAAQ,MAAM,OAAO,mBAAmB,CAAC;AAAA,EAC3C;AAAA,GA1Ce;",
   "names": ["from"]
 }

package/dist/utils/schema-utils.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,20 +15,16 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 schema_utils_exports = {};
 __export(schema_utils_exports, {
   mapZodToJsonSchema: () => mapZodToJsonSchema
 });
 module.exports = __toCommonJS(schema_utils_exports);
-var import_zod_to_json_schema = __toESM(require("@bpinternal/zod-to-json-schema"));
-const isObjectSchema = (schema) => schema?.type === "object";
+var import_sdk = require("@botpress/sdk");
+const isObjectSchema = (schema) => schema.type === "object";
 function mapZodToJsonSchema(definition) {
-  const schema = (0, import_zod_to_json_schema.default)(definition.schema, { errorMessages: true });
+  const schema = import_sdk.transforms.zuiToJsonSchema(definition.schema, { target: "jsonSchema7" });
   if (!isObjectSchema(schema) || !definition.ui) {
     return schema;
   }
@@ -40,9 +34,11 @@ function mapZodToJsonSchema(definition) {
       continue;
     }
     if (!!value?.title) {
+      ;
       property.title = value.title;
     }
     if (!!value?.examples) {
+      ;
       property.examples = value.examples;
     }
   }

package/dist/utils/schema-utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/schema-utils.ts"],
-  "sourcesContent": ["import zodToJsonSchema from '@bpinternal/zod-to-json-schema'\nimport type { JsonSchema7Type } from '@bpinternal/zod-to-json-schema/src/parseDef'\nimport type { JsonSchema7ObjectType } from '@bpinternal/zod-to-json-schema/src/parsers/object'\nimport { z } from 'zod'\n\ntype SchemaOptions = {\n  title?: string\n  examples?: any[]\n}\n\ntype SchemaDefinition = {\n  schema: z.ZodObject<any>\n  ui?: Record<string, SchemaOptions | undefined>\n}\n\nconst isObjectSchema = (schema: JsonSchema7Type): schema is JsonSchema7ObjectType => (schema as any)?.type === 'object'\n\nexport function mapZodToJsonSchema(definition: SchemaDefinition): ReturnType<typeof zodToJsonSchema> {\n  const schema = zodToJsonSchema(definition.schema, { errorMessages: true })\n  if (!isObjectSchema(schema) || !definition.ui) {\n    return schema\n  }\n\n  for (const [key, value] of Object.entries(definition.ui ?? {})) {\n    const property = schema.properties?.[key] as (JsonSchema7Type & { title?: string; examples?: any[] }) | undefined\n\n    if (!property) {\n      continue\n    }\n\n    if (!!value?.title) {\n      property.title = value.title\n    }\n\n    if (!!value?.examples) {\n      property.examples = value.examples\n    }\n  }\n\n  return schema\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAA4B;AAe5B,MAAM,iBAAiB,CAAC,WAA8D,QAAgB,SAAS;AAExG,SAAS,mBAAmB,YAAkE;AACnG,QAAM,aAAS,0BAAAA,SAAgB,WAAW,QAAQ,EAAE,eAAe,KAAK,CAAC;AACzE,MAAI,CAAC,eAAe,MAAM,KAAK,CAAC,WAAW,IAAI;AAC7C,WAAO;AAAA,EACT;AAEA,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,WAAW,MAAM,CAAC,CAAC,GAAG;AAC9D,UAAM,WAAW,OAAO,aAAa;AAErC,QAAI,CAAC,UAAU;AACb;AAAA,IACF;AAEA,QAAI,CAAC,CAAC,OAAO,OAAO;AAClB,eAAS,QAAQ,MAAM;AAAA,IACzB;AAEA,QAAI,CAAC,CAAC,OAAO,UAAU;AACrB,eAAS,WAAW,MAAM;AAAA,IAC5B;AAAA,EACF;AAEA,SAAO;AACT;",
-  "names": ["zodToJsonSchema"]
+  "sourcesContent": ["import { z, transforms } from '@botpress/sdk'\n\ntype ZuiToJsonSchema = typeof transforms.zuiToJsonSchema\ntype JsonSchema = ReturnType<ZuiToJsonSchema>\ntype ObjectJsonSchema = Extract<JsonSchema, { type: 'object' }>\n\ntype SchemaOptions = {\n  title?: string\n  examples?: any[]\n}\n\ntype SchemaDefinition = {\n  schema: z.ZodObject<any>\n  ui?: Record<string, SchemaOptions | undefined>\n}\n\nconst isObjectSchema = (schema: JsonSchema): schema is ObjectJsonSchema => schema.type === 'object'\n\nexport function mapZodToJsonSchema(definition: SchemaDefinition): ReturnType<typeof transforms.zuiToJsonSchema> {\n  const schema = transforms.zuiToJsonSchema(definition.schema, { target: 'jsonSchema7' })\n  if (!isObjectSchema(schema) || !definition.ui) {\n    return schema\n  }\n\n  for (const [key, value] of Object.entries(definition.ui ?? {})) {\n    const property = schema.properties?.[key]\n\n    if (!property) {\n      continue\n    }\n\n    if (!!value?.title) {\n      ;(property as any).title = value.title\n    }\n\n    if (!!value?.examples) {\n      ;(property as any).examples = value.examples\n    }\n  }\n\n  return schema\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAA8B;AAgB9B,MAAM,iBAAiB,CAAC,WAAmD,OAAO,SAAS;AAEpF,SAAS,mBAAmB,YAA6E;AAC9G,QAAM,SAAS,sBAAW,gBAAgB,WAAW,QAAQ,EAAE,QAAQ,cAAc,CAAC;AACtF,MAAI,CAAC,eAAe,MAAM,KAAK,CAAC,WAAW,IAAI;AAC7C,WAAO;AAAA,EACT;AAEA,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,WAAW,MAAM,CAAC,CAAC,GAAG;AAC9D,UAAM,WAAW,OAAO,aAAa;AAErC,QAAI,CAAC,UAAU;AACb;AAAA,IACF;AAEA,QAAI,CAAC,CAAC,OAAO,OAAO;AAClB;AAAC,MAAC,SAAiB,QAAQ,MAAM;AAAA,IACnC;AAEA,QAAI,CAAC,CAAC,OAAO,UAAU;AACrB;AAAC,MAAC,SAAiB,WAAW,MAAM;AAAA,IACtC;AAAA,EACF;AAEA,SAAO;AACT;",
+  "names": []
 }

package/dist/worker/config.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,10 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 config_exports = {};
 __export(config_exports, {
@@ -28,18 +22,18 @@ __export(config_exports, {
   configSchema: () => configSchema
 });
 module.exports = __toCommonJS(config_exports);
-var import_zod = __toESM(require("zod"));
+var import_sdk = require("@botpress/sdk");
 const CONFIG_ENV_KEY = "CHILD_PROCESS_CONFIGURATION";
-const configSchema = import_zod.default.union([
-  import_zod.default.object({
-    type: import_zod.default.literal("code"),
-    code: import_zod.default.string(),
-    env: import_zod.default.record(import_zod.default.string(), import_zod.default.string()).optional()
+const configSchema = import_sdk.z.union([
+  import_sdk.z.object({
+    type: import_sdk.z.literal("code"),
+    code: import_sdk.z.string(),
+    env: import_sdk.z.record(import_sdk.z.string(), import_sdk.z.string()).optional()
   }),
-  import_zod.default.object({
-    type: import_zod.default.literal("file"),
-    file: import_zod.default.string(),
-    env: import_zod.default.record(import_zod.default.string(), import_zod.default.string()).optional()
+  import_sdk.z.object({
+    type: import_sdk.z.literal("file"),
+    file: import_sdk.z.string(),
+    env: import_sdk.z.record(import_sdk.z.string(), import_sdk.z.string()).optional()
   })
 ]);
 // Annotate the CommonJS export names for ESM import in node:

package/dist/worker/config.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/worker/config.ts"],
-  "sourcesContent": ["import zod from 'zod'\n\nexport const CONFIG_ENV_KEY = 'CHILD_PROCESS_CONFIGURATION'\n\nexport type Config = zod.infer<typeof configSchema>\nexport const configSchema = zod.union([\n  zod.object({\n    type: zod.literal('code'),\n    code: zod.string(),\n    env: zod.record(zod.string(), zod.string()).optional(),\n  }),\n  zod.object({\n    type: zod.literal('file'),\n    file: zod.string(),\n    env: zod.record(zod.string(), zod.string()).optional(),\n  }),\n])\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAAgB;AAET,MAAM,iBAAiB;AAGvB,MAAM,eAAe,WAAAA,QAAI,MAAM;AAAA,EACpC,WAAAA,QAAI,OAAO;AAAA,IACT,MAAM,WAAAA,QAAI,QAAQ,MAAM;AAAA,IACxB,MAAM,WAAAA,QAAI,OAAO;AAAA,IACjB,KAAK,WAAAA,QAAI,OAAO,WAAAA,QAAI,OAAO,GAAG,WAAAA,QAAI,OAAO,CAAC,EAAE,SAAS;AAAA,EACvD,CAAC;AAAA,EACD,WAAAA,QAAI,OAAO;AAAA,IACT,MAAM,WAAAA,QAAI,QAAQ,MAAM;AAAA,IACxB,MAAM,WAAAA,QAAI,OAAO;AAAA,IACjB,KAAK,WAAAA,QAAI,OAAO,WAAAA,QAAI,OAAO,GAAG,WAAAA,QAAI,OAAO,CAAC,EAAE,SAAS;AAAA,EACvD,CAAC;AACH,CAAC;",
-  "names": ["zod"]
+  "sourcesContent": ["import { z } from '@botpress/sdk'\n\nexport const CONFIG_ENV_KEY = 'CHILD_PROCESS_CONFIGURATION'\n\nexport type Config = z.infer<typeof configSchema>\nexport const configSchema = z.union([\n  z.object({\n    type: z.literal('code'),\n    code: z.string(),\n    env: z.record(z.string(), z.string()).optional(),\n  }),\n  z.object({\n    type: z.literal('file'),\n    file: z.string(),\n    env: z.record(z.string(), z.string()).optional(),\n  }),\n])\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAAkB;AAEX,MAAM,iBAAiB;AAGvB,MAAM,eAAe,aAAE,MAAM;AAAA,EAClC,aAAE,OAAO;AAAA,IACP,MAAM,aAAE,QAAQ,MAAM;AAAA,IACtB,MAAM,aAAE,OAAO;AAAA,IACf,KAAK,aAAE,OAAO,aAAE,OAAO,GAAG,aAAE,OAAO,CAAC,EAAE,SAAS;AAAA,EACjD,CAAC;AAAA,EACD,aAAE,OAAO;AAAA,IACP,MAAM,aAAE,QAAQ,MAAM;AAAA,IACtB,MAAM,aAAE,OAAO;AAAA,IACf,KAAK,aAAE,OAAO,aAAE,OAAO,GAAG,aAAE,OAAO,CAAC,EAAE,SAAS;AAAA,EACjD,CAAC;AACH,CAAC;",
+  "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",
@@ -24,7 +24,6 @@
     "@bpinternal/const": "^0.0.20",
     "@bpinternal/tunnel": "^0.1.1",
     "@bpinternal/yargs-extra": "^0.0.3",
-    "@bpinternal/zod-to-json-schema": "^3.21.4",
     "@parcel/watcher": "^2.1.0",
     "@types/lodash": "^4.14.191",
     "@types/node": "^18.11.17",
@@ -45,11 +44,10 @@
     "typescript": "^4.9.4",
     "uuid": "^9.0.0",
     "verror": "^1.10.1",
-    "winston": "^3.8.2",
-    "zod": "^3.20.6"
+    "winston": "^3.8.2"
   },
   "devDependencies": {
-    "@botpress/sdk": "0.7.0",
+    "@botpress/sdk": "0.8.0",
     "@bpinternal/log4bot": "^0.0.4",
     "@types/bluebird": "^3.5.38",
     "@types/json-schema": "^7.0.11",

package/templates/echo-bot/package.json

@@ -9,8 +9,7 @@
   "license": "MIT",
   "dependencies": {
     "@botpress/client": "0.14.0",
-    "@botpress/sdk": "0.7.0",
-    "zod": "^3.20.6"
+    "@botpress/sdk": "0.8.0"
   },
   "devDependencies": {
     "@types/node": "^18.11.17",

package/templates/echo-bot/src/index.ts

@@ -1,5 +1,4 @@
-import { Bot } from '@botpress/sdk'
-import { z } from 'zod'
+import { Bot, z } from '@botpress/sdk'
 // import * as botpress from '.botpress' /** uncomment to get generated code */
 
 const bot = new Bot({

package/templates/empty-integration/package.json

@@ -10,8 +10,7 @@
   "license": "MIT",
   "dependencies": {
     "@botpress/client": "0.14.0",
-    "@botpress/sdk": "0.7.0",
-    "zod": "^3.20.6"
+    "@botpress/sdk": "0.8.0"
   },
   "devDependencies": {
     "@types/node": "^18.11.17",