@scout9/app 1.0.0-alpha.0.3.2 → 1.0.0-alpha.0.3.3

package/dist/{dev-b57781e5.cjs → dev-f7215614.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var spirits = require("./spirits-d3dafe71.cjs");
+var spirits = require("./spirits-bf93b875.cjs");
 var require$$0$4 = require('util');
 var require$$0$3 = require('stream');
 var require$$1 = require('path');
@@ -26507,13 +26507,13 @@ common.createRequestFunction = createRequestFunction;
       /**
        *
        * @summary Gets a customer
-       * @param {string} id id of entity to query
+       * @param {string} idOrEmailOrPhone Either customers id, phone number or email
        * @param {*} [options] Override http request option.
        * @throws {RequiredError}
        */
-      customer: async (id, options = {}) => {
-        // verify required parameter 'id' is not null or undefined
-        (0, common_1.assertParamExists)('customer', 'id', id);
+      customer: async (idOrEmailOrPhone, options = {}) => {
+        // verify required parameter 'idOrEmailOrPhone' is not null or undefined
+        (0, common_1.assertParamExists)('customer', 'idOrEmailOrPhone', idOrEmailOrPhone);
         const localVarPath = `/v1-customer`;
         // use dummy base URL string because the URL constructor only accepts absolute URLs.
         const localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
@@ -26528,8 +26528,8 @@ common.createRequestFunction = createRequestFunction;
         };
         const localVarHeaderParameter = {};
         const localVarQueryParameter = {};
-        if (id !== undefined) {
-          localVarQueryParameter['id'] = id;
+        if (idOrEmailOrPhone !== undefined) {
+          localVarQueryParameter['idOrEmailOrPhone'] = idOrEmailOrPhone;
         }
         (0, common_1.setSearchParams)(localVarUrlObj, localVarQueryParameter);
         let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
@@ -28198,12 +28198,12 @@ common.createRequestFunction = createRequestFunction;
       /**
        *
        * @summary Gets a customer
-       * @param {string} id id of entity to query
+       * @param {string} idOrEmailOrPhone Either customers id, phone number or email
        * @param {*} [options] Override http request option.
        * @throws {RequiredError}
        */
-      async customer(id, options) {
-        const localVarAxiosArgs = await localVarAxiosParamCreator.customer(id, options);
+      async customer(idOrEmailOrPhone, options) {
+        const localVarAxiosArgs = await localVarAxiosParamCreator.customer(idOrEmailOrPhone, options);
         return (0, common_1.createRequestFunction)(localVarAxiosArgs, axios_1$1.default, base_1.BASE_PATH, configuration);
       },
       /**
@@ -28817,12 +28817,12 @@ common.createRequestFunction = createRequestFunction;
       /**
        *
        * @summary Gets a customer
-       * @param {string} id id of entity to query
+       * @param {string} idOrEmailOrPhone Either customers id, phone number or email
        * @param {*} [options] Override http request option.
        * @throws {RequiredError}
        */
-      customer(id, options) {
-        return localVarFp.customer(id, options).then(request => request(axios, basePath));
+      customer(idOrEmailOrPhone, options) {
+        return localVarFp.customer(idOrEmailOrPhone, options).then(request => request(axios, basePath));
       },
       /**
        *
@@ -29417,13 +29417,13 @@ common.createRequestFunction = createRequestFunction;
     /**
      *
      * @summary Gets a customer
-     * @param {string} id id of entity to query
+     * @param {string} idOrEmailOrPhone Either customers id, phone number or email
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof Scout9Api
      */
-    customer(id, options) {
-      return (0, exports.Scout9ApiFp)(this.configuration).customer(id, options).then(request => request(this.axios, this.basePath));
+    customer(idOrEmailOrPhone, options) {
+      return (0, exports.Scout9ApiFp)(this.configuration).customer(idOrEmailOrPhone, options).then(request => request(this.axios, this.basePath));
     }
     /**
      *
@@ -29993,7 +29993,7 @@ common.createRequestFunction = createRequestFunction;
 var configuration = {};
 
 var name$1 = "@scout9/admin";
-var version$2 = "1.0.0-alpha.0.0.48";
+var version$2 = "1.0.0-alpha.0.0.49";
 var description$1 = "";
 var main$2 = "./build/index.js";
 var types$1 = "./build/index.d.ts";
@@ -35019,7 +35019,7 @@ function _loadUserPackageJson() {
           targetPkgUrl = isTest ? packageTestJsonUrl : packageJsonUrl;
           _context2.t0 = JSON;
           _context2.next = 10;
-          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('dev-b57781e5.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('dev-f7215614.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context2.t1 = _context2.sent;
           pkg = _context2.t0.parse.call(_context2.t0, _context2.t1);
@@ -42221,7 +42221,7 @@ var Scout9Test = /*#__PURE__*/function () {
      */
     spirits._defineProperty(this, "messages", void 0);
     /**
-     * @type {any}
+     * @type {import('@scout9/app').ConversationContext}
      */
     spirits._defineProperty(this, "context", void 0);
     /**
@@ -42426,6 +42426,10 @@ var Scout9Test = /*#__PURE__*/function () {
                   progressInput = function progressInput() {}; // use no-op
                 }
               }
+
+              /**
+               * @type {import('@scout9/app').Message}
+               */
               _message = {
                 id: 'user_mock_' + Math.random().toString(36).slice(2, 11),
                 role: 'customer',
@@ -42683,9 +42687,18 @@ var Scout9Test = /*#__PURE__*/function () {
       return generate;
     }()
     /**
-     * @private
+     * @param {Partial<import('@scout9/app').ConversationContext>} ctx
      */
     )
+  }, {
+    key: "context",
+    set: function set(ctx) {
+      this.context = spirits._objectSpread2(spirits._objectSpread2({}, this.context), ctx);
+    }
+
+    /**
+     * @private
+     */
   }, {
     key: "_loadApp",
     value: (function () {

package/dist/{index-6b64a6ac.cjs → index-c6c0a761.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var spirits = require("./spirits-d3dafe71.cjs");
-var dev = require("./dev-b57781e5.cjs");
+var spirits = require("./spirits-bf93b875.cjs");
+var dev = require("./dev-f7215614.cjs");
 var macros = require("./macros-5be965e9.cjs");
 var require$$0 = require('fs');
 var require$$2$1 = require('events');
@@ -29483,7 +29483,7 @@ class Body {
     }
     const {
       toFormData
-    } = await Promise.resolve().then(function () { return require("./multipart-parser-77660bcb.cjs"); });
+    } = await Promise.resolve().then(function () { return require("./multipart-parser-734db7f7.cjs"); });
     return toFormData(this.body, ct);
   }
 
@@ -41892,7 +41892,7 @@ function _loadUserPackageJson() {
           targetPkgUrl = isTest ? packageTestJsonUrl : packageJsonUrl;
           _context.t0 = JSON;
           _context.next = 10;
-          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-6b64a6ac.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-c6c0a761.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context.t1 = _context.sent;
           pkg = _context.t0.parse.call(_context.t0, _context.t1);
@@ -43098,7 +43098,7 @@ var ProjectFiles = /*#__PURE__*/function () {
   return ProjectFiles;
 }();
 
-var __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-6b64a6ac.js', document.baseURI).href)));
+var __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-c6c0a761.js', document.baseURI).href)));
 var __dirname$1 = path__default["default"].dirname(__filename$1);
 function zipDirectory(source, out) {
   var archive = archiver$1('tar', {
@@ -43313,7 +43313,7 @@ function _buildApp() {
         case 11:
           _context4.t0 = JSON;
           _context4.next = 14;
-          return fs__default["default"].readFile(new URL(templatePackagePath, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-6b64a6ac.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(templatePackagePath, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-c6c0a761.js', document.baseURI).href))), 'utf-8');
         case 14:
           _context4.t1 = _context4.sent;
           packageTemplate = _context4.t0.parse.call(_context4.t0, _context4.t1);

package/dist/index.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require("./index-6b64a6ac.cjs");
-var dev = require("./dev-b57781e5.cjs");
-require("./spirits-d3dafe71.cjs");
+var index = require("./index-c6c0a761.cjs");
+var dev = require("./dev-f7215614.cjs");
+require("./spirits-bf93b875.cjs");
 require("./macros-5be965e9.cjs");
 require('fs');
 require('events');

package/dist/{multipart-parser-77660bcb.cjs → multipart-parser-734db7f7.cjs}

@@ -2,9 +2,9 @@
 
 require('node:fs');
 require('node:path');
-var index = require("./index-6b64a6ac.cjs");
-require("./spirits-d3dafe71.cjs");
-require("./dev-b57781e5.cjs");
+var index = require("./index-c6c0a761.cjs");
+require("./spirits-bf93b875.cjs");
+require("./dev-f7215614.cjs");
 require('util');
 require('stream');
 require('path');

package/dist/{spirits-d3dafe71.cjs → spirits-bf93b875.cjs}

@@ -914,11 +914,21 @@ var Spirits = {
               stagnationCount: conversation.lockAttempts || 0
             }).then(function (res) {
               return Array.isArray(res) ? res : [res];
+            }).then(function (slots) {
+              return slots.reduce(function (accumulator, slot) {
+                if ('toJSON' in slot) {
+                  var slotJson = slot.toJSON();
+                  accumulator.push.apply(accumulator, _toConsumableArray(Array.isArray(slotJson) ? slotJson : [slotJson]));
+                } else {
+                  accumulator.push(slot);
+                }
+                return accumulator;
+              }, []);
             });
           case 43:
             slots = _context2.sent;
             hasNoInstructions = slots.every(function (s) {
-              return !s.instructions || Array.isArray(s) && s.instructions.length === 0;
+              return !s.instructions || Array.isArray(s.instructions) && s.instructions.length === 0;
             });
             hasNoCustomMessage = slots.every(function (s) {
               return !s.message;

package/dist/spirits.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var spirits = require("./spirits-d3dafe71.cjs");
+var spirits = require("./spirits-bf93b875.cjs");
 
 
 

package/dist/testing-tools.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require("./dev-b57781e5.cjs");
-require("./spirits-d3dafe71.cjs");
+var dev = require("./dev-f7215614.cjs");
+require("./spirits-bf93b875.cjs");
 require('util');
 require('stream');
 require('path');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scout9/app",
-  "version": "1.0.0-alpha.0.3.2",
+  "version": "1.0.0-alpha.0.3.3",
   "description": "Build and deploy your Scout9 app for SMS auto replies",
   "publishConfig": {
     "access": "public"

package/src/core/templates/app.js

@@ -363,13 +363,13 @@ async function runEntityApi(req, res) {
     const response = await api({
       params,
       searchParams: req?.query || {}, body: req?.body || undefined,
-      id: params.id
+      id: params?.id
     });
     if (response instanceof EventResponse || !!response.body) {
       const data = response.body ?? response.data();
       res.writeHead(response.status || 200, {'Content-Type': 'application/json'});
       res.end(JSON.stringify(data));
-      console.log(`${req.method} EntityApi.${params.id}:`);
+      console.log(`${req.method} EntityApi.${lastSegment}:`);
       console.log(colors.grey(JSON.stringify(data)));
     } else {
       throw new Error(`Invalid response: not an EventResponse`);

package/src/public.d.ts

@@ -588,7 +588,7 @@ export type WorkflowResponseSlot = WorkflowResponseSlotBase & {
     anticipate?: Anticipate | undefined;
 };
 
-export type WorkflowResponse = WorkflowResponseSlot | WorkflowResponseSlot[];
+export type WorkflowResponse = EventMacros | WorkflowResponseSlot | (WorkflowResponseSlot | EventMacros)[];
 
 export type WorkflowFunction = (event: WorkflowEvent) => WorkflowResponse | Promise<WorkflowResponse>;
 

package/src/testing-tools/dev.js

@@ -1,5 +1,5 @@
 import { Configuration, Scout9Api } from '@scout9/admin';
-import {grey, italic, bgWhite, black} from 'kleur/colors';
+import { grey, italic, bgWhite, black } from 'kleur/colors';
 import { createMockConversation, createMockWorkflowEvent } from './mocks.js';
 import { loadConfig } from '../core/config/index.js';
 import { requireProjectFile } from '../utils/index.js';
@@ -33,7 +33,7 @@ export class Scout9Test {
   messages;
 
   /**
-   * @type {any}
+   * @type {import('@scout9/app').ConversationContext}
    */
   context;
 
@@ -158,7 +158,7 @@ export class Scout9Test {
 
     // Load app configuration (if not already loaded or override true)
     if (override || !this._project) {
-      this._project = await loadConfig({cwd: this._cwd, src: this._src, mode: this._mode})
+      this._project = await loadConfig({cwd: this._cwd, src: this._src, mode: this._mode});
     }
 
     if (override || !this._api) {
@@ -205,7 +205,7 @@ export class Scout9Test {
       const typeStdout = type ? italic(bgWhite(' ' + black(type) + ' ')) : '';
       const messageStdout = grey(message);
       (console.hasOwnProperty(level) ? console[level] : console.log)(`\t${typeStdout ? typeStdout + ' ' : ''}${messageStdout}`);
-    }
+    };
 
     // If custom logger provided, use it, otherwise use default logger
     let progressInput = typeof progress === 'function' ? progress : defaultProgressLogger;
@@ -215,10 +215,14 @@ export class Scout9Test {
       if (!!progress) {
         progressInput = defaultProgressLogger; // use default logger
       } else {
-        progressInput = () => {}; // use no-op
+        progressInput = () => {
+        }; // use no-op
       }
     }
 
+    /**
+     * @type {import('@scout9/app').Message}
+     */
     const _message = {
       id: 'user_mock_' + Math.random().toString(36).slice(2, 11),
       role: 'customer',
@@ -353,6 +357,16 @@ export class Scout9Test {
     }).then((_res => _res.data));
   }
 
+  /**
+   * @param {Partial<import('@scout9/app').ConversationContext>} ctx
+   */
+  set context(ctx) {
+    this.context = {
+      ...this.context,
+      ...ctx
+    };
+  }
+
   /**
    * @private
    */

package/src/testing-tools/spirits.js

@@ -322,6 +322,7 @@ export const Spirits = {
 
     // 3. Run the workflow
     progress('Running workflow', 'info', 'SET_PROCESSING', 'system');
+
     const slots = await workflow({
       messages,
       conversation,
@@ -335,8 +336,18 @@ export const Spirits = {
         initial: conversation.intent || null
       },
       stagnationCount: conversation.lockAttempts || 0
-    }).then((res) => Array.isArray(res) ? res : [res]);
-    const hasNoInstructions = slots.every(s => !s.instructions || (Array.isArray(s) && s.instructions.length === 0));
+    })
+      .then((res) => Array.isArray(res) ? res : [res])
+      .then((slots) => slots.reduce((accumulator, slot) => {
+        if ('toJSON' in slot) {
+          const slotJson = slot.toJSON();
+          accumulator.push(...(Array.isArray(slotJson) ? slotJson : [slotJson]));
+        } else {
+          accumulator.push(slot);
+        }
+        return accumulator;
+      }, []));
+    const hasNoInstructions = slots.every(s => !s.instructions || (Array.isArray(s.instructions) && s.instructions.length === 0));
     const hasNoCustomMessage = slots.every(s => !s.message);
     const previousLockAttempt = conversation.lockAttempts || 0; // Used to track
 

package/types/index.d.ts

@@ -551,7 +551,7 @@ declare module '@scout9/app' {
 	  anticipate?: Anticipate | undefined;
   };
 
-  export type WorkflowResponse = WorkflowResponseSlot | WorkflowResponseSlot[];
+  export type WorkflowResponse = EventMacros | WorkflowResponseSlot | (WorkflowResponseSlot | EventMacros)[];
 
   export type WorkflowFunction = (event: WorkflowEvent) => WorkflowResponse | Promise<WorkflowResponse>;