@chatbotkit/cli 1.9.0 → 1.9.1

package/dist/cjs/command/solution/index.cjs

@@ -40,6 +40,7 @@ exports.solutionSync = new commander_1.Command()
     .action(async (name) => {
     const solution = await index_js_1.Solution.load(name);
     await solution.sync();
+    await index_js_1.Solution.save(name, solution);
 });
 exports.command = new commander_1.Command()
     .name('solution')

package/dist/cjs/solution/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getArrayBackedObject = exports.ArrayBackedObject = exports.Solution = exports.SitemapIntegrationResource = exports.WidgetIntegrationResource = exports.SkillsetResource = exports.DatasetResource = exports.BotResource = exports.Resource = exports.SolutionConfigSchema = exports.ResourceConfigSchema = exports.SitemapIntegrationResourceConfigSchema = exports.WidgetIntegrationResourceConfigSchema = exports.SkillsetResourceConfigSchema = exports.DatasetResourceConfigSchema = exports.BotResourceConfigSchema = exports.BasicResourceConfigSchema = exports.getSolutionFileNameAndPath = exports.getSolutionFilePath = exports.getSolutionFileName = exports.getSolutionFolderPath = void 0;
+exports.getArrayBackedObject = exports.ArrayBackedObject = exports.Solution = exports.SitemapIntegrationResource = exports.WidgetIntegrationResource = exports.SkillsetResource = exports.DatasetResource = exports.BotResource = exports.Resource = exports.SolutionConfigSchema = exports.ResourceConfigSchema = exports.SitemapIntegrationResourceConfigSchema = exports.WidgetIntegrationResourceConfigSchema = exports.SkillsetResourceConfigSchema = exports.DatasetResourceConfigSchema = exports.BotResourceConfigSchema = exports.BasicResourceConfigSchema = exports.replaceEnvVars = exports.getSolutionFileNameAndPath = exports.getSolutionFilePath = exports.getSolutionFileName = exports.getSolutionFolderPath = void 0;
 const tslib_1 = require("tslib");
 const env_js_1 = require("../env.cjs");
 const output_js_1 = require("../output.cjs");
@@ -30,10 +30,32 @@ function getSolutionFileNameAndPath(name) {
     return { fileName, filePath };
 }
 exports.getSolutionFileNameAndPath = getSolutionFileNameAndPath;
+function replaceEnvVars(value) {
+    if (!value) {
+        return value;
+    }
+    if (typeof value === 'string') {
+        return value.replace(/\${env\.([A-Z_]+)}/g, (_, name) => {
+            const envValue = process.env[name];
+            if (envValue === undefined) {
+                throw new output_js_1.CommandError(`Environment variable ${name} is not set`);
+            }
+            return envValue;
+        });
+    }
+    if (Array.isArray(value)) {
+        return value.map(replaceEnvVars);
+    }
+    if (typeof value === 'object') {
+        return Object.fromEntries(Object.entries(value).map(([key, value]) => [key, replaceEnvVars(value)]));
+    }
+    return value;
+}
+exports.replaceEnvVars = replaceEnvVars;
 exports.BasicResourceConfigSchema = zod_1.z.object({
     type: zod_1.z.string(),
     slug: zod_1.z.string().optional(),
-    id: zod_1.z.string(),
+    id: zod_1.z.string().optional(),
     name: zod_1.z.string(),
     description: zod_1.z.string().optional(),
     properties: zod_1.z.record(zod_1.z.unknown()),
@@ -110,11 +132,21 @@ class Resource {
         throw new Error('Not implemented');
     }
     async sync() {
-        this.client.update(this.config.id, {
-            ...this.config.properties,
-            name: this.config.name,
-            description: this.config.description,
-        });
+        if (this.config.id) {
+            await this.client.update(this.config.id, {
+                ...this.config.properties,
+                name: this.config.name,
+                description: this.config.description,
+            });
+        }
+        else {
+            const { id } = await this.client.create({
+                ...this.config.properties,
+                name: this.config.name,
+                description: this.config.description,
+            });
+            this.config.id = id;
+        }
     }
 }
 exports.Resource = Resource;
@@ -265,8 +297,13 @@ Solution.load = async function (config) {
     if (!parsedConfig.success) {
         throw new output_js_1.CommandError(`Invalid solution configuration`);
     }
+    parsedConfig.data = replaceEnvVars(parsedConfig.data);
     return new Solution(parsedConfig.data);
 };
+Solution.save = async function (name, solution) {
+    const filePath = getSolutionFilePath(name);
+    await promises_1.default.writeFile(filePath, JSON.stringify(solution.config, null, 2));
+};
 class ArrayBackedObject {
     constructor(array) {
         this.array = array;

package/dist/cjs/solution/index.d.ts

@@ -5,13 +5,14 @@ export function getSolutionFileNameAndPath(name: string): {
     fileName: string;
     filePath: string;
 };
+export function replaceEnvVars(value: any): any;
 export function getArrayBackedObject<T>(array: T[]): {
     [key: string]: T;
 };
 export const BasicResourceConfigSchema: z.ZodObject<{
     type: z.ZodString;
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     properties: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -32,7 +33,7 @@ export const BasicResourceConfigSchema: z.ZodObject<{
 }>;
 export const BotResourceConfigSchema: z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"bot">;
@@ -89,7 +90,7 @@ export const BotResourceConfigSchema: z.ZodObject<{
 }>;
 export const DatasetResourceConfigSchema: z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"dataset">;
@@ -111,7 +112,7 @@ export const DatasetResourceConfigSchema: z.ZodObject<{
 }>;
 export const SkillsetResourceConfigSchema: z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"skillset">;
@@ -133,7 +134,7 @@ export const SkillsetResourceConfigSchema: z.ZodObject<{
 }>;
 export const WidgetIntegrationResourceConfigSchema: z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"widgetIntegration">;
@@ -155,7 +156,7 @@ export const WidgetIntegrationResourceConfigSchema: z.ZodObject<{
 }>;
 export const SitemapIntegrationResourceConfigSchema: z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"sitemapIntegration">;
@@ -192,7 +193,7 @@ export const SitemapIntegrationResourceConfigSchema: z.ZodObject<{
 }>;
 export const ResourceConfigSchema: z.ZodUnion<[z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"bot">;
@@ -248,7 +249,7 @@ export const ResourceConfigSchema: z.ZodUnion<[z.ZodObject<{
     };
 }>, z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"dataset">;
@@ -269,7 +270,7 @@ export const ResourceConfigSchema: z.ZodUnion<[z.ZodObject<{
     properties?: {};
 }>, z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"skillset">;
@@ -290,7 +291,7 @@ export const ResourceConfigSchema: z.ZodUnion<[z.ZodObject<{
     properties?: {};
 }>, z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"widgetIntegration">;
@@ -311,7 +312,7 @@ export const ResourceConfigSchema: z.ZodUnion<[z.ZodObject<{
     properties?: {};
 }>, z.ZodObject<{
     slug: z.ZodOptional<z.ZodString>;
-    id: z.ZodString;
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<"sitemapIntegration">;
@@ -350,7 +351,7 @@ export const SolutionConfigSchema: z.ZodObject<{
     version: z.ZodLiteral<1>;
     resources: z.ZodArray<z.ZodUnion<[z.ZodObject<{
         slug: z.ZodOptional<z.ZodString>;
-        id: z.ZodString;
+        id: z.ZodOptional<z.ZodString>;
         name: z.ZodString;
         description: z.ZodOptional<z.ZodString>;
         type: z.ZodLiteral<"bot">;
@@ -406,7 +407,7 @@ export const SolutionConfigSchema: z.ZodObject<{
         };
     }>, z.ZodObject<{
         slug: z.ZodOptional<z.ZodString>;
-        id: z.ZodString;
+        id: z.ZodOptional<z.ZodString>;
         name: z.ZodString;
         description: z.ZodOptional<z.ZodString>;
         type: z.ZodLiteral<"dataset">;
@@ -427,7 +428,7 @@ export const SolutionConfigSchema: z.ZodObject<{
         properties?: {};
     }>, z.ZodObject<{
         slug: z.ZodOptional<z.ZodString>;
-        id: z.ZodString;
+        id: z.ZodOptional<z.ZodString>;
         name: z.ZodString;
         description: z.ZodOptional<z.ZodString>;
         type: z.ZodLiteral<"skillset">;
@@ -448,7 +449,7 @@ export const SolutionConfigSchema: z.ZodObject<{
         properties?: {};
     }>, z.ZodObject<{
         slug: z.ZodOptional<z.ZodString>;
-        id: z.ZodString;
+        id: z.ZodOptional<z.ZodString>;
         name: z.ZodString;
         description: z.ZodOptional<z.ZodString>;
         type: z.ZodLiteral<"widgetIntegration">;
@@ -469,7 +470,7 @@ export const SolutionConfigSchema: z.ZodObject<{
         properties?: {};
     }>, z.ZodObject<{
         slug: z.ZodOptional<z.ZodString>;
-        id: z.ZodString;
+        id: z.ZodOptional<z.ZodString>;
         name: z.ZodString;
         description: z.ZodOptional<z.ZodString>;
         type: z.ZodLiteral<"sitemapIntegration">;
@@ -656,7 +657,12 @@ export class Resource {
     get description(): string;
     get baseClient(): ChatBotKit;
     get client(): {
-        update: (id: string, properties: Record<string, unknown>) => void;
+        create: (properties: Record<string, any>) => Promise<{
+            id: string;
+        }>;
+        update: (id: string, properties: Record<string, any>) => Promise<{
+            id: string;
+        }>;
     };
     sync(): Promise<void>;
 }
@@ -673,7 +679,7 @@ export class WidgetIntegrationResource extends Resource {
     override get client(): any;
 }
 export class SitemapIntegrationResource extends Resource {
-    override get client(): any;
+    get client(): any;
 }
 export class Solution {
     constructor(config: SolutionConfig);
@@ -804,6 +810,7 @@ export namespace Solution {
             };
         })[];
     }): Promise<Solution>;
+    export function save(name: string, solution: Solution): Promise<void>;
 }
 export class ArrayBackedObject<T> {
     constructor(array: T[]);

package/dist/esm/command/solution/index.js

@@ -36,6 +36,7 @@ export const solutionSync = new Command()
     .action(async (name) => {
     const solution = await Solution.load(name);
     await solution.sync();
+    await Solution.save(name, solution);
 });
 export const command = new Command()
     .name('solution')