@botpress/adk-cli 1.5.3 → 1.5.4

package/dist/bp-cli/dist/code-generation/generators.js

@@ -43,7 +43,7 @@ var prettier = __toESM(require("prettier"));
 var utils = __toESM(require("../utils"));
 var consts = __toESM(require("./consts"));
 const zuiSchemaToTypeScriptType = async (zuiSchema, name) => {
-  let code = zuiSchema.toTypescriptType();
+  let code = zuiSchema.toTypescriptType({ treatDefaultAsOptional: true });
   code = `export type ${name} = ${code}`;
   code = await prettier.format(code, { parser: "typescript" });
   return [

package/dist/bp-cli/dist/code-generation/generators.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/code-generation/generators.ts"],
-  "sourcesContent": ["import * as sdk from '@botpress/sdk'\nimport { JSONSchema7 } from 'json-schema'\nimport _ from 'lodash'\nimport * as prettier from 'prettier'\nimport * as utils from '../utils'\nimport * as consts from './consts'\n\nexport type Primitive = string | number | boolean | null | undefined\n\nexport const zuiSchemaToTypeScriptType = async (zuiSchema: sdk.z.Schema, name: string): Promise<string> => {\n  let code = zuiSchema.toTypescriptType()\n  code = `export type ${name} = ${code}`\n  code = await prettier.format(code, { parser: 'typescript' })\n  return [\n    //\n    consts.GENERATED_HEADER,\n    code,\n  ].join('\\n')\n}\n\nexport const jsonSchemaToTypescriptZuiSchema = async (\n  schema: JSONSchema7,\n  name: string,\n  extraProps: Record<string, string> = {}\n): Promise<string> => {\n  schema = await utils.schema.dereferenceSchema(schema)\n  const zuiSchema = sdk.transforms.fromJSONSchemaLegacy(schema)\n\n  const allProps = {\n    ...extraProps,\n    schema: zuiSchema.toTypescriptSchema(),\n  }\n\n  let code = [\n    consts.GENERATED_HEADER,\n    'import { z } from \"@botpress/sdk\"',\n    `export const ${name} = ${typescriptValuesToRecordString(allProps)}`,\n  ].join('\\n')\n  code = await prettier.format(code, { parser: 'typescript' })\n  return code\n}\n\nexport const stringifySingleLine = (x: object): string => {\n  return JSON.stringify(x, null, 1).replace(/\\n */g, ' ')\n}\n\nexport function primitiveToTypescriptValue(x: Primitive): string {\n  if (typeof x === 'undefined') {\n    return 'undefined'\n  }\n  return JSON.stringify(x)\n}\n\nexport function primitiveRecordToTypescriptValues(x: Record<string, Primitive>): Record<string, string> {\n  return _(x)\n    .toPairs()\n    .filter(([_key, value]) => value !== undefined)\n    .map(([key, value]) => [key, primitiveToTypescriptValue(value)])\n    .fromPairs()\n    .value()\n}\n\nexport const primitiveRecordToRecordString = (record: Record<string, Primitive>): string =>\n  typescriptValuesToRecordString(primitiveRecordToTypescriptValues(record))\n\nexport const typescriptValuesToRecordString = (record: Record<string, string>): string =>\n  ['{', ...Object.entries(record).map(([key, value]) => `  ${key}: ${value},`), '}'].join('\\n')\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,UAAqB;AAErB,oBAAc;AACd,eAA0B;AAC1B,YAAuB;AACvB,aAAwB;AAIjB,MAAM,4BAA4B,OAAO,WAAyB,SAAkC;AACzG,MAAI,OAAO,UAAU,iBAAiB;AACtC,SAAO,eAAe,IAAI,MAAM,IAAI;AACpC,SAAO,MAAM,SAAS,OAAO,MAAM,EAAE,QAAQ,aAAa,CAAC;AAC3D,SAAO;AAAA;AAAA,IAEL,OAAO;AAAA,IACP;AAAA,EACF,EAAE,KAAK,IAAI;AACb;AAEO,MAAM,kCAAkC,OAC7C,QACA,MACA,aAAqC,CAAC,MAClB;AACpB,WAAS,MAAM,MAAM,OAAO,kBAAkB,MAAM;AACpD,QAAM,YAAY,IAAI,WAAW,qBAAqB,MAAM;AAE5D,QAAM,WAAW;AAAA,IACf,GAAG;AAAA,IACH,QAAQ,UAAU,mBAAmB;AAAA,EACvC;AAEA,MAAI,OAAO;AAAA,IACT,OAAO;AAAA,IACP;AAAA,IACA,gBAAgB,IAAI,MAAM,+BAA+B,QAAQ,CAAC;AAAA,EACpE,EAAE,KAAK,IAAI;AACX,SAAO,MAAM,SAAS,OAAO,MAAM,EAAE,QAAQ,aAAa,CAAC;AAC3D,SAAO;AACT;AAEO,MAAM,sBAAsB,CAAC,MAAsB;AACxD,SAAO,KAAK,UAAU,GAAG,MAAM,CAAC,EAAE,QAAQ,SAAS,GAAG;AACxD;AAEO,SAAS,2BAA2B,GAAsB;AAC/D,MAAI,OAAO,MAAM,aAAa;AAC5B,WAAO;AAAA,EACT;AACA,SAAO,KAAK,UAAU,CAAC;AACzB;AAEO,SAAS,kCAAkC,GAAsD;AACtG,aAAO,cAAAA,SAAE,CAAC,EACP,QAAQ,EACR,OAAO,CAAC,CAAC,MAAM,KAAK,MAAM,UAAU,MAAS,EAC7C,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,2BAA2B,KAAK,CAAC,CAAC,EAC9D,UAAU,EACV,MAAM;AACX;AAEO,MAAM,gCAAgC,CAAC,WAC5C,+BAA+B,kCAAkC,MAAM,CAAC;AAEnE,MAAM,iCAAiC,CAAC,WAC7C,CAAC,KAAK,GAAG,OAAO,QAAQ,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM,KAAK,GAAG,KAAK,KAAK,GAAG,GAAG,GAAG,EAAE,KAAK,IAAI;",
+  "sourcesContent": ["import * as sdk from '@botpress/sdk'\nimport { JSONSchema7 } from 'json-schema'\nimport _ from 'lodash'\nimport * as prettier from 'prettier'\nimport * as utils from '../utils'\nimport * as consts from './consts'\n\nexport type Primitive = string | number | boolean | null | undefined\n\nexport const zuiSchemaToTypeScriptType = async (zuiSchema: sdk.z.Schema, name: string): Promise<string> => {\n  let code = zuiSchema.toTypescriptType({ treatDefaultAsOptional: true })\n  code = `export type ${name} = ${code}`\n  code = await prettier.format(code, { parser: 'typescript' })\n  return [\n    //\n    consts.GENERATED_HEADER,\n    code,\n  ].join('\\n')\n}\n\nexport const jsonSchemaToTypescriptZuiSchema = async (\n  schema: JSONSchema7,\n  name: string,\n  extraProps: Record<string, string> = {}\n): Promise<string> => {\n  schema = await utils.schema.dereferenceSchema(schema)\n  const zuiSchema = sdk.transforms.fromJSONSchemaLegacy(schema)\n\n  const allProps = {\n    ...extraProps,\n    schema: zuiSchema.toTypescriptSchema(),\n  }\n\n  let code = [\n    consts.GENERATED_HEADER,\n    'import { z } from \"@botpress/sdk\"',\n    `export const ${name} = ${typescriptValuesToRecordString(allProps)}`,\n  ].join('\\n')\n  code = await prettier.format(code, { parser: 'typescript' })\n  return code\n}\n\nexport const stringifySingleLine = (x: object): string => {\n  return JSON.stringify(x, null, 1).replace(/\\n */g, ' ')\n}\n\nexport function primitiveToTypescriptValue(x: Primitive): string {\n  if (typeof x === 'undefined') {\n    return 'undefined'\n  }\n  return JSON.stringify(x)\n}\n\nexport function primitiveRecordToTypescriptValues(x: Record<string, Primitive>): Record<string, string> {\n  return _(x)\n    .toPairs()\n    .filter(([_key, value]) => value !== undefined)\n    .map(([key, value]) => [key, primitiveToTypescriptValue(value)])\n    .fromPairs()\n    .value()\n}\n\nexport const primitiveRecordToRecordString = (record: Record<string, Primitive>): string =>\n  typescriptValuesToRecordString(primitiveRecordToTypescriptValues(record))\n\nexport const typescriptValuesToRecordString = (record: Record<string, string>): string =>\n  ['{', ...Object.entries(record).map(([key, value]) => `  ${key}: ${value},`), '}'].join('\\n')\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,UAAqB;AAErB,oBAAc;AACd,eAA0B;AAC1B,YAAuB;AACvB,aAAwB;AAIjB,MAAM,4BAA4B,OAAO,WAAyB,SAAkC;AACzG,MAAI,OAAO,UAAU,iBAAiB,EAAE,wBAAwB,KAAK,CAAC;AACtE,SAAO,eAAe,IAAI,MAAM,IAAI;AACpC,SAAO,MAAM,SAAS,OAAO,MAAM,EAAE,QAAQ,aAAa,CAAC;AAC3D,SAAO;AAAA;AAAA,IAEL,OAAO;AAAA,IACP;AAAA,EACF,EAAE,KAAK,IAAI;AACb;AAEO,MAAM,kCAAkC,OAC7C,QACA,MACA,aAAqC,CAAC,MAClB;AACpB,WAAS,MAAM,MAAM,OAAO,kBAAkB,MAAM;AACpD,QAAM,YAAY,IAAI,WAAW,qBAAqB,MAAM;AAE5D,QAAM,WAAW;AAAA,IACf,GAAG;AAAA,IACH,QAAQ,UAAU,mBAAmB;AAAA,EACvC;AAEA,MAAI,OAAO;AAAA,IACT,OAAO;AAAA,IACP;AAAA,IACA,gBAAgB,IAAI,MAAM,+BAA+B,QAAQ,CAAC;AAAA,EACpE,EAAE,KAAK,IAAI;AACX,SAAO,MAAM,SAAS,OAAO,MAAM,EAAE,QAAQ,aAAa,CAAC;AAC3D,SAAO;AACT;AAEO,MAAM,sBAAsB,CAAC,MAAsB;AACxD,SAAO,KAAK,UAAU,GAAG,MAAM,CAAC,EAAE,QAAQ,SAAS,GAAG;AACxD;AAEO,SAAS,2BAA2B,GAAsB;AAC/D,MAAI,OAAO,MAAM,aAAa;AAC5B,WAAO;AAAA,EACT;AACA,SAAO,KAAK,UAAU,CAAC;AACzB;AAEO,SAAS,kCAAkC,GAAsD;AACtG,aAAO,cAAAA,SAAE,CAAC,EACP,QAAQ,EACR,OAAO,CAAC,CAAC,MAAM,KAAK,MAAM,UAAU,MAAS,EAC7C,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,2BAA2B,KAAK,CAAC,CAAC,EAC9D,UAAU,EACV,MAAM;AACX;AAEO,MAAM,gCAAgC,CAAC,WAC5C,+BAA+B,kCAAkC,MAAM,CAAC;AAEnE,MAAM,iCAAiC,CAAC,WAC7C,CAAC,KAAK,GAAG,OAAO,QAAQ,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM,KAAK,GAAG,KAAK,KAAK,GAAG,GAAG,GAAG,EAAE,KAAK,IAAI;",
   "names": ["_"]
 }

package/dist/cli.js

@@ -315684,7 +315684,7 @@ var init_internal = __esm(() => {
   });
   init_define_PACKAGE_VERSIONS = __esm2({
     "<define:__PACKAGE_VERSIONS__>"() {
-      define_PACKAGE_VERSIONS_default = { runtime: "1.3.3", adk: "not-installed", sdk: "4.17.0", llmz: "0.0.26", zai: "2.1.16", cognitive: "0.1.47" };
+      define_PACKAGE_VERSIONS_default = { runtime: "1.3.4", adk: "not-installed", sdk: "4.17.0", llmz: "0.0.26", zai: "2.1.16", cognitive: "0.1.47" };
     }
   });
   init_globalThis = __esm2({
@@ -375586,7 +375586,7 @@ var init_Separator = __esm(async () => {
 var require_package3 = __commonJS((exports, module) => {
   module.exports = {
     name: "@botpress/adk",
-    version: "1.3.3",
+    version: "1.3.4",
     description: "Core ADK library for building AI agents on Botpress",
     type: "module",
     main: "dist/index.js",
@@ -375633,7 +375633,7 @@ var require_package3 = __commonJS((exports, module) => {
       "@botpress/cli": "^4.20",
       "@botpress/client": "1.26.0",
       "@botpress/cognitive": "0.1.47",
-      "@botpress/runtime": "^1.3.3",
+      "@botpress/runtime": "^1.3.4",
       "@botpress/sdk": "4.17.0",
       "@bpinternal/yargs-extra": "^0.0.21",
       "@parcel/watcher": "^2.5.1",
@@ -378838,7 +378838,7 @@ function checkRuntimeVersion(agentRoot) {
 `));
   }
 }
-var semver, EXPECTED_RUNTIME_VERSION = "1.3.3";
+var semver, EXPECTED_RUNTIME_VERSION = "1.3.4";
 var init_runtime_version_check = __esm(() => {
   init_source();
   semver = __toESM(require_semver3(), 1);
@@ -394711,7 +394711,7 @@ function formatHelp(cmd, version) {
 // src/cli.ts
 var __filename2 = fileURLToPath9(import.meta.url);
 var __dirname5 = dirname3(__filename2);
-var CLI_VERSION = "1.5.3";
+var CLI_VERSION = "1.5.4";
 program.name("adk").description("Botpress Agent Development Kit (ADK) - CLI for building AI agents").version(CLI_VERSION).option("--no-cache", "Disable caching for integration lookups").configureHelp({
   formatHelp: () => formatHelp(program, CLI_VERSION)
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/adk-cli",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Command-line interface for the Botpress Agent Development Kit (ADK)",
   "type": "module",
   "main": "dist/index.js",
@@ -40,9 +40,9 @@
     "url": "https://github.com/botpress/adk"
   },
   "dependencies": {
-    "@botpress/adk": "^1.3.3",
+    "@botpress/adk": "^1.3.4",
     "@botpress/cli": "^4.20",
-    "@botpress/runtime": "^1.3.3",
+    "@botpress/runtime": "^1.3.4",
     "adm-zip": "^0.5.16",
     "chalk": "^5.4.1",
     "clipboardy": "^4.0.0",