@scout9/app 1.0.0-alpha.0.3.6 → 1.0.0-alpha.0.3.8

package/dist/{index-0b4fa4ce.cjs → index-4b5094a1.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var spirits = require("./spirits-5c9243a1.cjs");
-var dev = require("./dev-689cc6fd.cjs");
-var macros = require("./macros-7c18e049.cjs");
+var dev = require("./dev-0876e8d1.cjs");
+var macros = require("./macros-e4105c56.cjs");
 var require$$0 = require('fs');
 var require$$2$1 = require('events');
 var require$$1 = require('path');
@@ -29483,7 +29483,7 @@ class Body {
     }
     const {
       toFormData
-    } = await Promise.resolve().then(function () { return require("./multipart-parser-4603e570.cjs"); });
+    } = await Promise.resolve().then(function () { return require("./multipart-parser-723d74f7.cjs"); });
     return toFormData(this.body, ct);
   }
 
@@ -31176,14 +31176,6 @@ function fixResponseChunkedTransferBadEnding(request, errorCallback) {
   });
 }
 
-/**
- * @param {unknown} err
- * @return {Error}
- */
-function coalesceToError(err) {
-  return err instanceof Error || err && /** @type {any} */err.name && /** @type {any} */err.message ? /** @type {Error} */err : new Error(JSON.stringify(err));
-}
-
 var fileType$6 = input => {
   const buf = new Uint8Array(input);
   if (!(buf && buf.length > 1)) {
@@ -41892,7 +41884,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-0b4fa4ce.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-4b5094a1.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context.t1 = _context.sent;
           pkg = _context.t0.parse.call(_context.t0, _context.t1);
@@ -43115,7 +43107,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-0b4fa4ce.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-4b5094a1.js', document.baseURI).href)));
 var __dirname$1 = path__default["default"].dirname(__filename$1);
 function zipDirectory(source, out) {
   var archive = archiver$1('tar', {
@@ -43330,7 +43322,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-0b4fa4ce.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-4b5094a1.js', document.baseURI).href))), 'utf-8');
         case 14:
           _context4.t1 = _context4.sent;
           packageTemplate = _context4.t0.parse.call(_context4.t0, _context4.t1);
@@ -44436,7 +44428,7 @@ var Scout9Platform = {
     return run;
   }(),
   handleError: function handleError(e) {
-    var error = coalesceToError(e);
+    var error = dev.coalesceToError(e);
     switch (error.name) {
       case 'AxiosError':
         var request = error.request,

package/dist/index.cjs

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require("./index-0b4fa4ce.cjs");
-var dev = require("./dev-689cc6fd.cjs");
+var index = require("./index-4b5094a1.cjs");
+var dev = require("./dev-0876e8d1.cjs");
 require("./spirits-5c9243a1.cjs");
-require("./macros-7c18e049.cjs");
+require("./macros-e4105c56.cjs");
 require('fs');
 require('events');
 require('path');

package/dist/{macros-7c18e049.cjs → macros-e4105c56.cjs}

@@ -4580,6 +4580,7 @@ exports.WorkflowResponseSchema = WorkflowResponseSchema;
 exports.WorkflowResponseSlotBaseSchema = WorkflowResponseSlotBaseSchema;
 exports.WorkflowResponseSlotSchema = WorkflowResponseSlotSchema;
 exports.WorkflowsConfigurationSchema = WorkflowsConfigurationSchema;
+exports.ZodIssueCode = ZodIssueCode;
 exports.apiFunctionSchema = apiFunctionSchema;
 exports.deleteApiFunctionSchema = deleteApiFunctionSchema;
 exports.eventResponseSchema = eventResponseSchema;

package/dist/{multipart-parser-4603e570.cjs → multipart-parser-723d74f7.cjs}

@@ -2,9 +2,9 @@
 
 require('node:fs');
 require('node:path');
-var index = require("./index-0b4fa4ce.cjs");
+var index = require("./index-4b5094a1.cjs");
 require("./spirits-5c9243a1.cjs");
-require("./dev-689cc6fd.cjs");
+require("./dev-0876e8d1.cjs");
 require('util');
 require('stream');
 require('path');
@@ -25,7 +25,7 @@ require('node:stream');
 require('node:string_decoder');
 require('node:readline');
 require('node:process');
-require("./macros-7c18e049.cjs");
+require("./macros-e4105c56.cjs");
 require('node:os');
 require('fs/promises');
 require('constants');

package/dist/schemas.cjs

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

package/dist/testing-tools.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require("./dev-689cc6fd.cjs");
+var dev = require("./dev-0876e8d1.cjs");
 require("./spirits-5c9243a1.cjs");
 require('util');
 require('stream');
@@ -26,7 +26,7 @@ require('node:stream');
 require('node:string_decoder');
 require('node:readline');
 require('node:process');
-require("./macros-7c18e049.cjs");
+require("./macros-e4105c56.cjs");
 require('node:os');
 require('fs/promises');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scout9/app",
-  "version": "1.0.0-alpha.0.3.6",
+  "version": "1.0.0-alpha.0.3.8",
   "description": "Build and deploy your Scout9 app for SMS auto replies",
   "publishConfig": {
     "access": "public"
@@ -102,7 +102,8 @@
     "polka": "^0.5.2",
     "sade": "^1.8.1",
     "sirv": "^2.0.4",
-    "zod": "^3.22.4"
+    "zod": "^3.22.4",
+    "zod-validation-error": "^3.4.0"
   },
   "engines": {
     "node": ">=18.13"

package/src/core/templates/app.js

@@ -15,6 +15,9 @@ import projectApp from './src/app.js';
 import config from './config.js';
 import { readdir } from 'fs/promises';
 import { ZodError } from 'zod';
+import { fromError } from 'zod-validation-error';
+
+
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -71,8 +74,15 @@ const scout9 = new Scout9Api(configuration);
 const cache = new ServerCache();
 cache.reset();
 
+const simplifyZodError = (error, tag = undefined) => {
+  const validationError = fromError(error);
+  if (tag) {
+    validationError.message = validationError.message.replace('Validation error', tag);
+  }
+  return validationError;
+}
 
-const handleError = (e, res = undefined, tag = undefined) => {
+const handleError = (e, res = undefined, tag = undefined, body = undefined) => {
   let name = e?.name || 'Runtime Error';
   let message = e?.message || 'Unknown error';
   let code = typeof e?.code === 'number'
@@ -94,14 +104,22 @@ const handleError = (e, res = undefined, tag = undefined) => {
       message = response.body;
     }
   }
+  if (body) {
+    console.log(colors.grey(JSON.stringify(body, null, 2)));
+  }
   if (tag && typeof tag === 'string') {
     message = `${tag}: ${message}`;
   }
+  if (typeof e?.constructor?.name === 'string') {
+    message = `(${e?.constructor?.name}) ${message}`;
+  }
   console.log(colors.red(`${colors.bold(`${code} Error`)}: ${message}`));
   if ('stack' in e) {
-    console.log(colors.grey(e.stack));
+    console.log('STACK:', colors.grey(e.stack));
+  }
+  if (body) {
+    console.log('INPUT:', colors.grey(JSON.stringify(body, null, 2)));
   }
-  console.log(colors);
   if (res) {
     res.writeHead(code, {'Content-Type': 'application/json'});
     res.end(JSON.stringify({
@@ -115,22 +133,24 @@ const handleError = (e, res = undefined, tag = undefined) => {
 const handleZodError = ({error, res = undefined, code = 500, status, name, bodyLabel = 'Provided Input', body = undefined, action = ''}) => {
   res?.writeHead?.(code, {'Content-Type': 'application/json'});
   if (error instanceof ZodError) {
-    const formattedErrors = JSON.stringify(error.format(), null, 2);
+    const formattedError = simplifyZodError(error);
     res?.end?.(JSON.stringify({
       status,
-      errors: formattedErrors
+      error: formattedError.message,
+      errors: [formattedError.message]
     }));
     console.log(colors.red(`${colors.bold(`${name}`)}:`));
     if (body) {
       console.log(colors.grey(`${bodyLabel}:`));
       console.log(colors.grey(JSON.stringify(body, null, 2)));
     }
-    console.log(colors.red(`${action}${formattedErrors}`));
+    console.log(colors.red(`${action}${formattedError}`));
   } else {
     console.error(error);
     error.message = `${name}: ` + error.message;
     res?.end?.(JSON.stringify({
       status,
+      error: error.message,
       errors: [error.message]
     }));
     throw new Error(`${name}: Provided error was not a ZodError`);
@@ -216,13 +236,13 @@ app.post(dev ? '/dev/workflow' : '/', async (req, res) => {
         status: 'Invalid WorkflowEvent Input'
       });
     } else {
-      handleError(error, res, 'Workflow Template Event Parse Error');
+      handleError(error, res, 'Workflow Template Event Parse Error', req.body.event);
     }
     return;
   }
 
   if (!workflowEvent) {
-    handleError(new Error('No workflowEvent defined'), res);
+    handleError(new Error('No workflowEvent defined'), res, req.body.event, 'Workflow Template Event No Event');
   }
   let response;
   try {
@@ -235,7 +255,19 @@ app.post(dev ? '/dev/workflow' : '/', async (req, res) => {
         }
       })
   } catch (error) {
-    handleError(error, res, 'Workflow Template Runtime Error');
+    if (error instanceof ZodError) {
+      handleZodError({
+        error,
+        name: 'Workflow Template Event Request Parse Error',
+        body: req.body.event,
+        bodyLabel: 'Provided WorkflowEvent',
+        code: 400,
+        res,
+        status: 'Invalid WorkflowEvent Input'
+      });
+    } else {
+      handleError(error, res, 'Workflow Template Runtime Error', workflowEvent);
+    }
     return;
   }
 
@@ -263,7 +295,7 @@ app.post(dev ? '/dev/workflow' : '/', async (req, res) => {
         status: 'Invalid WorkflowResponse Output'
       });
     } else {
-      handleError(error, res, 'Workflow Template Runtime Parse Error');
+      handleError(error, res, 'Workflow Template Runtime Parse Error', response);
     }
   }
 });

package/src/runtime/macros/event.js

@@ -1,5 +1,6 @@
 import { WorkflowResponseSlotBaseSchema, WorkflowResponseSlotSchema } from '../schemas/workflow.js';
 import { MacroUtils } from './utils.js';
+import { simplifyError } from '../../utils/index.js';
 
 
 /**
@@ -79,12 +80,19 @@ function EventMacrosFactory() {
 
     /**
      * Sets context into the conversation context for later use
-     * @param {Record<string, any>} updates
+     * @param {Record<string, string | boolean | null | number | Array<string | boolean | null | number>>} updates
      * @return {EventMacros}
      */
     upsert(updates) {
-      const slot = {contextUpsert: updates}
-      slots.push(WorkflowResponseSlotSchema.parse(slot));
+      const slot = {contextUpsert: updates};
+      try {
+        slots.push(WorkflowResponseSlotSchema.parse(slot));
+      } catch (e) {
+        throw simplifyError(
+          e,
+          'Invalid upsert, input must be a Record<string, string | boolean | null | number | Array<string | boolean | null | number>>'
+        );
+      }
       return this;
     },
 
@@ -99,7 +107,8 @@ function EventMacrosFactory() {
     followup(instruction, options) {
       let slot;
       if (!options) {
-        throw new Error('Missing second argument in followup(instruction, options) \'options\' argument needs to be included')
+        throw new Error(
+          'Missing second argument in followup(instruction, options) \'options\' argument needs to be included');
       }
       // Check if it's date value
       const {success, ...rest} = MacroUtils.scheduledToUnixSafe(options);
@@ -116,7 +125,7 @@ function EventMacrosFactory() {
           followup: {
             scheduled: MacroUtils.scheduledToUnix(options.scheduled)
           }
-        }
+        };
         if (options.literal) {
           slot.followup.message = instruction;
         } else {
@@ -136,10 +145,14 @@ function EventMacrosFactory() {
             instructions: instruction,
             scheduled: rest.data
           }
-        }
+        };
 
       }
-      slots.push(WorkflowResponseSlotSchema.parse(slot));
+      try {
+        slots.push(WorkflowResponseSlotSchema.parse(slot));
+      } catch (e) {
+        throw simplifyError(e, 'Invalid followup() input');
+      }
       return this;
     },
 
@@ -158,7 +171,7 @@ function EventMacrosFactory() {
     anticipate(instruction, yes, no) {
       const slot = {
         anticipate: []
-      }
+      };
       if (Array.isArray(instruction)) {
         for (const _slot of instruction) {
           if (!Array.isArray(_slot.keywords) || _slot.keywords.length < 1) {
@@ -173,41 +186,61 @@ function EventMacrosFactory() {
         if (!no) {
           throw new Error('Missing "no" option for anticipate');
         }
+        let yesParsed, noParsed;
+        try {
+          yesParsed = WorkflowResponseSlotBaseSchema.parse(yes);
+        } catch (e) {
+          throw simplifyError(e, 'Invalid anticipate.yes input');
+        }
+        try {
+          noParsed = WorkflowResponseSlotBaseSchema.parse(no);
+        } catch (e) {
+          throw simplifyError(e, 'Invalid anticipate.no input');
+        }
+
         slot.anticipate = {
           did: instruction,
-          yes: WorkflowResponseSlotBaseSchema.parse(yes),
-          no: WorkflowResponseSlotBaseSchema.parse(no)
-        }
+          yes: yesParsed,
+          no: noParsed
+        };
       } else {
         throw new Error(`Instruction is not of type "string" or "array"`);
       }
-      slots.push(WorkflowResponseSlotSchema.parse(slot));
+      try {
+        slots.push(WorkflowResponseSlotSchema.parse(slot));
+      } catch (e) {
+        throw simplifyError(e, 'Invalid anticipate() input');
+      }
       return this;
     },
 
     /**
      * Return instructions to guide next auto reply response
      * @param {string} instruction
-     * @param {OptionsFollowup} [options]
+     * @param {OptionsInstruct} [options]
      * @return {EventMacros}
      */
     instruct(instruction, options = {}) {
       const slot = {};
       if (Object.keys(options).length > 0) {
         const instructionObj = {
-          content: instruction,
-        }
+          content: instruction
+        };
         if (options.id) {
-          instructionObj.id = options.id
+          instructionObj.id = options.id;
         }
         if (typeof options.persist === 'boolean') {
-          instructionObj.persist = options.persist
+          instructionObj.persist = options.persist;
         }
         slot.instructions = instructionObj;
       } else {
         slot.instructions = instruction;
       }
-      slots.push(WorkflowResponseSlotSchema.parse(slot));
+      try {
+        slots.push(WorkflowResponseSlotSchema.parse(slot));
+      } catch (e) {
+        throw simplifyError(e, 'Invalid instruct() input');
+      }
       return this;
     },
     /**
@@ -232,7 +265,11 @@ function EventMacrosFactory() {
           slot.secondsDelay = delay;
         }
       }
-      slots.push(WorkflowResponseSlotSchema.parse(slot));
+      try {
+        slots.push(WorkflowResponseSlotSchema.parse(slot));
+      } catch (e) {
+        throw simplifyError(e, 'Invalid reply() input');
+      }
       return this;
     },
     /**
@@ -250,7 +287,7 @@ function EventMacrosFactory() {
             note: message ?? defaultForward
           },
           forwardNote: message ?? defaultForward
-        }
+        };
         if (options.to) {
           slot.forward.to = options.to;
         }
@@ -261,9 +298,13 @@ function EventMacrosFactory() {
         slot = {
           forward: true,
           forwardNote: message ?? defaultForward
-        }
+        };
+      }
+      try {
+        slots.push(WorkflowResponseSlotSchema.parse(slot));
+      } catch (e) {
+        throw simplifyError(e, 'Invalid forward() input');
       }
-      slots.push(WorkflowResponseSlotSchema.parse(slot));
       return this;
     },
     /**
@@ -279,7 +320,7 @@ function EventMacrosFactory() {
       } else {
         return slots;
       }
-    },
+    }
   };
 }
 

package/src/utils/error.js

@@ -1,3 +1,13 @@
+import { fromError } from 'zod-validation-error';
+
+export function simplifyError(error, tag = undefined) {
+  const validationError = fromError(error);
+  if (tag) {
+    validationError.message = validationError.message.replace('Validation error', tag);
+  }
+  return validationError;
+}
+
 /**
  * @param {unknown} err
  * @return {Error}