@botpress/cli 2.2.1 → 2.2.3

package/dist/utils/path-utils.js

@@ -31,12 +31,14 @@ __export(path_utils_exports, {
   PathStore: () => PathStore,
   absoluteFrom: () => absoluteFrom,
   cwd: () => cwd,
-  isAbsolutePath: () => isAbsolutePath,
   isPath: () => isPath,
+  isPlatformSpecificAbsolutePath: () => isPlatformSpecificAbsolutePath,
+  isPlatformSpecificPath: () => isPlatformSpecificPath,
   join: () => join,
   posix: () => posix,
   relativeFrom: () => relativeFrom,
   rmExtension: () => rmExtension,
+  toNormalizedPosixPath: () => toNormalizedPosixPath,
   toUnix: () => toUnix,
   win32: () => win32
 });
@@ -55,10 +57,10 @@ var win32;
   win322.isPath = (path) => (0, win322.isAbsolutePath)(path) || (0, win322.isRelativePath)(path);
   win322.isRelativePath = (path) => path.startsWith(".\\") || path.startsWith("..\\");
   win322.isAbsolutePath = (path) => /^[a-zA-Z]:\\/.test(path);
-  win322.escapeBackslashes = (path) => path.includes("\\\\") ? path : path.replaceAll("\\", "\\\\");
 })(win32 || (win32 = {}));
-const isPath = (path) => import_os.default.platform() === "win32" ? win32.isPath(path) : posix.isPath(path);
-const isAbsolutePath = (path) => import_os.default.platform() === "win32" ? win32.isAbsolutePath(path) : posix.isAbsolutePath(path);
+const isPath = (path) => win32.isPath(path) || posix.isPath(path);
+const isPlatformSpecificPath = (path) => import_os.default.platform() === "win32" ? win32.isPath(path) : posix.isPath(path);
+const isPlatformSpecificAbsolutePath = (path) => import_os.default.platform() === "win32" ? win32.isAbsolutePath(path) : posix.isAbsolutePath(path);
 const cwd = () => process.cwd();
 const join = (abs, ...paths) => {
   const joined = import_path.default.join(abs, ...paths);
@@ -66,15 +68,16 @@ const join = (abs, ...paths) => {
 };
 const rmExtension = (filename) => filename.replace(/\.[^/.]+$/, "");
 const toUnix = (path) => path.split(import_path.default.sep).join(import_path.default.posix.sep);
+const toNormalizedPosixPath = (path) => (path.startsWith("./") ? "./" : "") + import_path.default.posix.normalize(path.replaceAll(/\\/g, "/")).replace(/\/\.$/, "");
 const absoluteFrom = (rootdir, target) => {
-  if (isAbsolutePath(target)) {
+  if (isPlatformSpecificAbsolutePath(target)) {
     return target;
   }
   return import_path.default.join(rootdir, target);
 };
 const relativeFrom = (rootdir, target) => {
   let absPath;
-  if (isAbsolutePath(target)) {
+  if (isPlatformSpecificAbsolutePath(target)) {
     absPath = target;
   } else {
     absPath = import_path.default.resolve(import_path.default.join(rootdir, target));
@@ -94,12 +97,14 @@ class PathStore {
   PathStore,
   absoluteFrom,
   cwd,
-  isAbsolutePath,
   isPath,
+  isPlatformSpecificAbsolutePath,
+  isPlatformSpecificPath,
   join,
   posix,
   relativeFrom,
   rmExtension,
+  toNormalizedPosixPath,
   toUnix,
   win32
 });

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/path-utils.ts"],
-  "sourcesContent": ["import _ from 'lodash'\nimport oslib from 'os'\nimport pathlib from 'path'\n\nexport namespace posix {\n  export type AbsolutePath = `/${string}`\n  export const isPath = (path: string) => isAbsolutePath(path) || isRelativePath(path)\n  export const isRelativePath = (path: string) => path.startsWith('./') || path.startsWith('../')\n  export const isAbsolutePath = (path: string): path is AbsolutePath => pathlib.posix.isAbsolute(path)\n}\n\nexport namespace win32 {\n  export type AbsolutePath = `${string}:\\\\${string}` // C:\\path\n  export const isPath = (path: string) => isAbsolutePath(path) || isRelativePath(path)\n  export const isRelativePath = (path: string) => path.startsWith('.\\\\') || path.startsWith('..\\\\')\n  export const isAbsolutePath = (path: string): path is AbsolutePath => /^[a-zA-Z]:\\\\/.test(path) // bp cli does not allow omitting the drive letter\n  export const escapeBackslashes = (path: string) => (path.includes('\\\\\\\\') ? path : path.replaceAll('\\\\', '\\\\\\\\')) // idempotent function\n}\n\nexport type AbsolutePath = posix.AbsolutePath | win32.AbsolutePath\nexport const isPath = (path: string) => (oslib.platform() === 'win32' ? win32.isPath(path) : posix.isPath(path))\nexport const isAbsolutePath = (path: string): path is AbsolutePath =>\n  oslib.platform() === 'win32' ? win32.isAbsolutePath(path) : posix.isAbsolutePath(path)\n\nexport const cwd = (): AbsolutePath => process.cwd() as AbsolutePath\nexport const join = (abs: AbsolutePath, ...paths: string[]): AbsolutePath => {\n  const joined = pathlib.join(abs, ...paths)\n  return pathlib.normalize(joined) as AbsolutePath\n}\n\nexport const rmExtension = (filename: string) => filename.replace(/\\.[^/.]+$/, '')\n\nexport const toUnix = (path: string) => path.split(pathlib.sep).join(pathlib.posix.sep)\n\nexport const absoluteFrom = (rootdir: AbsolutePath, target: string): AbsolutePath => {\n  if (isAbsolutePath(target)) {\n    return target\n  }\n  return pathlib.join(rootdir, target) as AbsolutePath\n}\n\nexport const relativeFrom = (rootdir: AbsolutePath, target: string) => {\n  let absPath: string\n\n  if (isAbsolutePath(target)) {\n    absPath = target\n  } else {\n    absPath = pathlib.resolve(pathlib.join(rootdir, target))\n  }\n\n  return pathlib.relative(rootdir, absPath)\n}\n\nexport class PathStore<P extends string> {\n  public constructor(public readonly abs: Record<P, AbsolutePath>) {}\n  public rel(from: Extract<P, `${string}Dir`>) {\n    return _.mapValues(this.abs, (to) => relativeFrom(this.abs[from], to))\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAc;AACd,gBAAkB;AAClB,kBAAoB;AAEb,IAAU;AAAA,CAAV,CAAUA,WAAV;AAEE,EAAMA,OAAA,SAAS,CAAC,aAAiBA,OAAA,gBAAe,IAAI,SAAKA,OAAA,gBAAe,IAAI;AAC5E,EAAMA,OAAA,iBAAiB,CAAC,SAAiB,KAAK,WAAW,IAAI,KAAK,KAAK,WAAW,KAAK;AACvF,EAAMA,OAAA,iBAAiB,CAAC,SAAuC,YAAAC,QAAQ,MAAM,WAAW,IAAI;AAAA,GAJpF;AAOV,IAAU;AAAA,CAAV,CAAUC,WAAV;AAEE,EAAMA,OAAA,SAAS,CAAC,aAAiBA,OAAA,gBAAe,IAAI,SAAKA,OAAA,gBAAe,IAAI;AAC5E,EAAMA,OAAA,iBAAiB,CAAC,SAAiB,KAAK,WAAW,KAAK,KAAK,KAAK,WAAW,MAAM;AACzF,EAAMA,OAAA,iBAAiB,CAAC,SAAuC,eAAe,KAAK,IAAI;AACvF,EAAMA,OAAA,oBAAoB,CAAC,SAAkB,KAAK,SAAS,MAAM,IAAI,OAAO,KAAK,WAAW,MAAM,MAAM;AAAA,GALhG;AASV,MAAM,SAAS,CAAC,SAAkB,UAAAC,QAAM,SAAS,MAAM,UAAU,MAAM,OAAO,IAAI,IAAI,MAAM,OAAO,IAAI;AACvG,MAAM,iBAAiB,CAAC,SAC7B,UAAAA,QAAM,SAAS,MAAM,UAAU,MAAM,eAAe,IAAI,IAAI,MAAM,eAAe,IAAI;AAEhF,MAAM,MAAM,MAAoB,QAAQ,IAAI;AAC5C,MAAM,OAAO,CAAC,QAAsB,UAAkC;AAC3E,QAAM,SAAS,YAAAF,QAAQ,KAAK,KAAK,GAAG,KAAK;AACzC,SAAO,YAAAA,QAAQ,UAAU,MAAM;AACjC;AAEO,MAAM,cAAc,CAAC,aAAqB,SAAS,QAAQ,aAAa,EAAE;AAE1E,MAAM,SAAS,CAAC,SAAiB,KAAK,MAAM,YAAAA,QAAQ,GAAG,EAAE,KAAK,YAAAA,QAAQ,MAAM,GAAG;AAE/E,MAAM,eAAe,CAAC,SAAuB,WAAiC;AACnF,MAAI,eAAe,MAAM,GAAG;AAC1B,WAAO;AAAA,EACT;AACA,SAAO,YAAAA,QAAQ,KAAK,SAAS,MAAM;AACrC;AAEO,MAAM,eAAe,CAAC,SAAuB,WAAmB;AACrE,MAAI;AAEJ,MAAI,eAAe,MAAM,GAAG;AAC1B,cAAU;AAAA,EACZ,OAAO;AACL,cAAU,YAAAA,QAAQ,QAAQ,YAAAA,QAAQ,KAAK,SAAS,MAAM,CAAC;AAAA,EACzD;AAEA,SAAO,YAAAA,QAAQ,SAAS,SAAS,OAAO;AAC1C;AAEO,MAAM,UAA4B;AAAA,EAChC,YAA4B,KAA8B;AAA9B;AAAA,EAA+B;AAAA,EAC3D,IAAI,MAAkC;AAC3C,WAAO,cAAAG,QAAE,UAAU,KAAK,KAAK,CAAC,OAAO,aAAa,KAAK,IAAI,IAAI,GAAG,EAAE,CAAC;AAAA,EACvE;AACF;",
+  "sourcesContent": ["import _ from 'lodash'\nimport oslib from 'os'\nimport pathlib from 'path'\n\nexport namespace posix {\n  export type AbsolutePath = `/${string}`\n  export const isPath = (path: string) => isAbsolutePath(path) || isRelativePath(path)\n  export const isRelativePath = (path: string) => path.startsWith('./') || path.startsWith('../')\n  export const isAbsolutePath = (path: string): path is AbsolutePath => pathlib.posix.isAbsolute(path)\n}\n\nexport namespace win32 {\n  export type AbsolutePath = `${string}:\\\\${string}` // C:\\path\n  export const isPath = (path: string) => isAbsolutePath(path) || isRelativePath(path)\n  export const isRelativePath = (path: string) => path.startsWith('.\\\\') || path.startsWith('..\\\\')\n  export const isAbsolutePath = (path: string): path is AbsolutePath => /^[a-zA-Z]:\\\\/.test(path) // bp cli does not allow omitting the drive letter\n}\n\nexport type AbsolutePath = posix.AbsolutePath | win32.AbsolutePath\nexport const isPath = (path: string) => win32.isPath(path) || posix.isPath(path)\nexport const isPlatformSpecificPath = (path: string) =>\n  oslib.platform() === 'win32' ? win32.isPath(path) : posix.isPath(path)\nexport const isPlatformSpecificAbsolutePath = (path: string): path is AbsolutePath =>\n  oslib.platform() === 'win32' ? win32.isAbsolutePath(path) : posix.isAbsolutePath(path)\n\nexport const cwd = (): AbsolutePath => process.cwd() as AbsolutePath\nexport const join = (abs: AbsolutePath, ...paths: string[]): AbsolutePath => {\n  const joined = pathlib.join(abs, ...paths)\n  return pathlib.normalize(joined) as AbsolutePath\n}\n\nexport const rmExtension = (filename: string) => filename.replace(/\\.[^/.]+$/, '')\n\nexport const toUnix = (path: string) => path.split(pathlib.sep).join(pathlib.posix.sep)\n\nexport const toNormalizedPosixPath = (path: string) =>\n  (path.startsWith('./') ? './' : '') + pathlib.posix.normalize(path.replaceAll(/\\\\/g, '/')).replace(/\\/\\.$/, '')\n\nexport const absoluteFrom = (rootdir: AbsolutePath, target: string): AbsolutePath => {\n  if (isPlatformSpecificAbsolutePath(target)) {\n    return target\n  }\n  return pathlib.join(rootdir, target) as AbsolutePath\n}\n\nexport const relativeFrom = (rootdir: AbsolutePath, target: string) => {\n  let absPath: string\n\n  if (isPlatformSpecificAbsolutePath(target)) {\n    absPath = target\n  } else {\n    absPath = pathlib.resolve(pathlib.join(rootdir, target))\n  }\n\n  return pathlib.relative(rootdir, absPath)\n}\n\nexport class PathStore<P extends string> {\n  public constructor(public readonly abs: Record<P, AbsolutePath>) {}\n  public rel(from: Extract<P, `${string}Dir`>) {\n    return _.mapValues(this.abs, (to) => relativeFrom(this.abs[from], to))\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAc;AACd,gBAAkB;AAClB,kBAAoB;AAEb,IAAU;AAAA,CAAV,CAAUA,WAAV;AAEE,EAAMA,OAAA,SAAS,CAAC,aAAiBA,OAAA,gBAAe,IAAI,SAAKA,OAAA,gBAAe,IAAI;AAC5E,EAAMA,OAAA,iBAAiB,CAAC,SAAiB,KAAK,WAAW,IAAI,KAAK,KAAK,WAAW,KAAK;AACvF,EAAMA,OAAA,iBAAiB,CAAC,SAAuC,YAAAC,QAAQ,MAAM,WAAW,IAAI;AAAA,GAJpF;AAOV,IAAU;AAAA,CAAV,CAAUC,WAAV;AAEE,EAAMA,OAAA,SAAS,CAAC,aAAiBA,OAAA,gBAAe,IAAI,SAAKA,OAAA,gBAAe,IAAI;AAC5E,EAAMA,OAAA,iBAAiB,CAAC,SAAiB,KAAK,WAAW,KAAK,KAAK,KAAK,WAAW,MAAM;AACzF,EAAMA,OAAA,iBAAiB,CAAC,SAAuC,eAAe,KAAK,IAAI;AAAA,GAJ/E;AAQV,MAAM,SAAS,CAAC,SAAiB,MAAM,OAAO,IAAI,KAAK,MAAM,OAAO,IAAI;AACxE,MAAM,yBAAyB,CAAC,SACrC,UAAAC,QAAM,SAAS,MAAM,UAAU,MAAM,OAAO,IAAI,IAAI,MAAM,OAAO,IAAI;AAChE,MAAM,iCAAiC,CAAC,SAC7C,UAAAA,QAAM,SAAS,MAAM,UAAU,MAAM,eAAe,IAAI,IAAI,MAAM,eAAe,IAAI;AAEhF,MAAM,MAAM,MAAoB,QAAQ,IAAI;AAC5C,MAAM,OAAO,CAAC,QAAsB,UAAkC;AAC3E,QAAM,SAAS,YAAAF,QAAQ,KAAK,KAAK,GAAG,KAAK;AACzC,SAAO,YAAAA,QAAQ,UAAU,MAAM;AACjC;AAEO,MAAM,cAAc,CAAC,aAAqB,SAAS,QAAQ,aAAa,EAAE;AAE1E,MAAM,SAAS,CAAC,SAAiB,KAAK,MAAM,YAAAA,QAAQ,GAAG,EAAE,KAAK,YAAAA,QAAQ,MAAM,GAAG;AAE/E,MAAM,wBAAwB,CAAC,UACnC,KAAK,WAAW,IAAI,IAAI,OAAO,MAAM,YAAAA,QAAQ,MAAM,UAAU,KAAK,WAAW,OAAO,GAAG,CAAC,EAAE,QAAQ,SAAS,EAAE;AAEzG,MAAM,eAAe,CAAC,SAAuB,WAAiC;AACnF,MAAI,+BAA+B,MAAM,GAAG;AAC1C,WAAO;AAAA,EACT;AACA,SAAO,YAAAA,QAAQ,KAAK,SAAS,MAAM;AACrC;AAEO,MAAM,eAAe,CAAC,SAAuB,WAAmB;AACrE,MAAI;AAEJ,MAAI,+BAA+B,MAAM,GAAG;AAC1C,cAAU;AAAA,EACZ,OAAO;AACL,cAAU,YAAAA,QAAQ,QAAQ,YAAAA,QAAQ,KAAK,SAAS,MAAM,CAAC;AAAA,EACzD;AAEA,SAAO,YAAAA,QAAQ,SAAS,SAAS,OAAO;AAC1C;AAEO,MAAM,UAA4B;AAAA,EAChC,YAA4B,KAA8B;AAA9B;AAAA,EAA+B;AAAA,EAC3D,IAAI,MAAkC;AAC3C,WAAO,cAAAG,QAAE,UAAU,KAAK,KAAK,CAAC,OAAO,aAAa,KAAK,IAAI,IAAI,GAAG,EAAE,CAAC;AAAA,EACvE;AACF;",
   "names": ["posix", "pathlib", "win32", "oslib", "_"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",
@@ -22,7 +22,7 @@
     "@apidevtools/json-schema-ref-parser": "^11.7.0",
     "@botpress/chat": "0.4.7",
     "@botpress/client": "0.41.0",
-    "@botpress/sdk": "2.4.1",
+    "@botpress/sdk": "2.4.3",
     "@bpinternal/const": "^0.0.20",
     "@bpinternal/tunnel": "^0.1.1",
     "@bpinternal/yargs-extra": "^0.0.3",

package/templates/empty-bot/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "dependencies": {
     "@botpress/client": "0.41.0",
-    "@botpress/sdk": "2.4.1"
+    "@botpress/sdk": "2.4.3"
   },
   "devDependencies": {
     "@types/node": "^18.19.67",

package/templates/empty-integration/package.json

@@ -7,7 +7,7 @@
   "private": true,
   "dependencies": {
     "@botpress/client": "0.41.0",
-    "@botpress/sdk": "2.4.1"
+    "@botpress/sdk": "2.4.3"
   },
   "devDependencies": {
     "@types/node": "^18.19.67",