@sprucelabs/spruce-cli 18.1.5 → 18.1.6

package/build/features/view/actions/WatchAction.js

@@ -16,19 +16,13 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _schema = require("@sprucelabs/schema");
 var _spruceEventUtils = require("@sprucelabs/spruce-event-utils");
-var _spruceSkillUtils = require("@sprucelabs/spruce-skill-utils");
 var _AbstractAction2 = _interopRequireDefault(require("../../AbstractAction"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var optionsSchema = (0, _schema.buildSchema)({
   id: 'watchViewsOptions',
   description: 'Watch for view changes and preview them in real time.',
-  fields: {
-    shouldReturnImmediately: {
-      type: 'boolean',
-      hint: "For testing so we don't wait until the process is killed to get the results."
-    }
-  }
+  fields: {}
 });
 var WatchAction = /*#__PURE__*/function (_AbstractAction) {
   (0, _inherits2["default"])(WatchAction, _AbstractAction);
@@ -43,158 +37,63 @@ var WatchAction = /*#__PURE__*/function (_AbstractAction) {
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "commandAliases", ['watch.views']);
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "optionsSchema", optionsSchema);
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "invocationMessage", 'Watching views... 🤩');
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "resolve", void 0);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "bootControls", void 0);
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "skillName", void 0);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "bootMessage", void 0);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "watchFeature", void 0);
     return _this;
   }
   (0, _createClass2["default"])(WatchAction, [{
     key: "execute",
     value: function () {
-      var _execute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(options) {
+      var _execute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var _this2 = this;
-        var _this$validateAndNorm, shouldReturnImmediately, skill, _this$bootControls;
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
+        var skill, commands;
+        return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
-                _this$validateAndNorm = this.validateAndNormalizeOptions(options !== null && options !== void 0 ? options : {}), shouldReturnImmediately = _this$validateAndNorm.shouldReturnImmediately;
-                this.watchFeature = this.featureInstaller.getFeature('watch');
-                _context2.next = 4;
-                return this.watchFeature.startWatching({
-                  delay: 2000
-                });
-              case 4:
-                _context2.next = 6;
+                _context.next = 2;
                 return this.Store('skill').loadCurrentSkill();
-              case 6:
-                skill = _context2.sent;
+              case 2:
+                skill = _context.sent;
                 this.skillName = skill.name;
-                _context2.next = 10;
-                return this.boot();
-              case 10:
-                this.bootControls = _context2.sent;
-                _context2.next = 13;
-                return this.emitter.on('watcher.did-detect-change', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                  var _this2$bootControls;
-                  return _regenerator["default"].wrap(function _callee$(_context) {
-                    while (1) {
-                      switch (_context.prev = _context.next) {
-                        case 0:
-                          (_this2$bootControls = _this2.bootControls) === null || _this2$bootControls === void 0 ? void 0 : _this2$bootControls.kill();
-                          _context.next = 3;
-                          return _this2.boot('Changes detected, rebooting skill...');
-                        case 3:
-                          _this2.bootControls = _context.sent;
-                        case 4:
-                        case "end":
-                          return _context.stop();
-                      }
-                    }
-                  }, _callee);
-                })));
-              case 13:
-                if (shouldReturnImmediately) {
-                  _context2.next = 19;
-                  break;
-                }
-                _context2.next = 16;
-                return new Promise(function (resolve) {
-                  //@ts-ignore
-                  _this2.resolve = resolve;
-                });
-              case 16:
-                _context2.next = 18;
-                return this.watchFeature.stopWatching();
-              case 18:
-                (_this$bootControls = this.bootControls) === null || _this$bootControls === void 0 ? void 0 : _this$bootControls.kill();
-              case 19:
-                return _context2.abrupt("return", {
-                  summaryLines: ["Done watching..."],
-                  meta: {
-                    bootPromise: this.bootControls.bootPromise
+                this.resetUi();
+                commands = this.Service('command');
+                _context.next = 8;
+                return commands.execute('ENABLED_SKILL_FEATURES=view,event SHOULD_REGISTER_EVENTS_AND_LISTENERS=false SHOULD_WATCH_VIEWS=true MAXIMUM_LOG_PREFIXES_LENGTH=0 yarn boot', {
+                  onData: function onData(data) {
+                    var line = _this2.popLastLine(data);
+                    _this2.ui.startLoading(line);
                   }
                 });
-              case 20:
+              case 8:
+                return _context.abrupt("return", {
+                  summaryLines: ["Done watching..."]
+                });
+              case 9:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee, this);
       }));
-      function execute(_x) {
+      function execute() {
         return _execute.apply(this, arguments);
       }
       return execute;
     }()
+  }, {
+    key: "popLastLine",
+    value: function popLastLine(data) {
+      var line = data.trim().split('\n').filter(function (s) {
+        return !!s;
+      }).pop();
+      return line && line.length > 0 ? line.trim() : 'Waiting for changes';
+    }
   }, {
     key: "getPreviewUrl",
     value: function getPreviewUrl() {
       var remote = this.Service('remote').getRemote();
       return _spruceEventUtils.heartwoodRemoteUtil.buildUrl(remote) + '/#views/heartwood.watch';
     }
-  }, {
-    key: "boot",
-    value: function () {
-      var _boot = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        var _this3 = this,
-          _results$meta,
-          _results$meta$bootPro;
-        var bootMessage,
-          results,
-          _args3 = arguments;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                bootMessage = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : 'Booting skill...';
-                this.bootMessage = bootMessage;
-                this.resetUi();
-                _context3.next = 5;
-                return this.Action('skill', 'boot').execute({
-                  shouldReturnImmediately: true,
-                  onData: function onData(msg) {
-                    if (!msg.includes('node build/index') && !msg.includes('yarn run')) {
-                      _this3.ui.stopLoading();
-                      _this3.ui.renderLine(msg.trim());
-                      _this3.ui.startLoading(_this3.bootMessage);
-                    }
-                  },
-                  onError: function onError(msg) {
-                    if (!msg.includes('No license field')) {
-                      _this3.ui.stopLoading();
-                      _this3.ui.renderLine(msg, [_spruceSkillUtils.GraphicsTextEffect.Red]);
-                      _this3.ui.startLoading();
-                    }
-                  }
-                });
-              case 5:
-                results = _context3.sent;
-                (_results$meta = results.meta) === null || _results$meta === void 0 ? void 0 : (_results$meta$bootPro = _results$meta.bootPromise) === null || _results$meta$bootPro === void 0 ? void 0 : _results$meta$bootPro.then(function () {
-                  _this3.bootMessage = 'Skill booted. Waiting for changes...';
-                  _this3.ui.startLoading(_this3.bootMessage);
-                });
-                if (!results.errors) {
-                  _context3.next = 9;
-                  break;
-                }
-                throw results.errors[0];
-              case 9:
-                return _context3.abrupt("return", results.meta);
-              case 10:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-      function boot() {
-        return _boot.apply(this, arguments);
-      }
-      return boot;
-    }()
   }, {
     key: "resetUi",
     value: function resetUi() {
@@ -204,39 +103,7 @@ var WatchAction = /*#__PURE__*/function (_AbstractAction) {
       this.ui.renderLines(['', "Skill: ".concat(this.skillName), "Preview: ".concat(this.getPreviewUrl()), '']);
       this.ui.renderDivider();
       this.ui.renderLine('');
-      this.ui.startLoading(this.bootMessage);
-    }
-  }, {
-    key: "kill",
-    value: function () {
-      var _kill = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var _this$bootControls2, _this$resolve;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return this.watchFeature.stopWatching();
-              case 2:
-                (_this$bootControls2 = this.bootControls) === null || _this$bootControls2 === void 0 ? void 0 : _this$bootControls2.kill();
-                (_this$resolve = this.resolve) === null || _this$resolve === void 0 ? void 0 : _this$resolve.call(this);
-              case 4:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4, this);
-      }));
-      function kill() {
-        return _kill.apply(this, arguments);
-      }
-      return kill;
-    }()
-  }, {
-    key: "getPid",
-    value: function getPid() {
-      var _this$bootControls3;
-      return (_this$bootControls3 = this.bootControls) === null || _this$bootControls3 === void 0 ? void 0 : _this$bootControls3.pid;
+      this.ui.startLoading('Watching for changes');
     }
   }]);
   return WatchAction;

package/build/features/view/actions/WatchAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"WatchAction.js","names":["optionsSchema","buildSchema","id","description","fields","shouldReturnImmediately","type","hint","WatchAction","options","validateAndNormalizeOptions","watchFeature","featureInstaller","getFeature","startWatching","delay","Store","loadCurrentSkill","skill","skillName","name","boot","bootControls","emitter","on","kill","Promise","resolve","stopWatching","summaryLines","meta","bootPromise","remote","Service","getRemote","heartwoodRemoteUtil","buildUrl","bootMessage","resetUi","Action","execute","onData","msg","includes","ui","stopLoading","renderLine","trim","startLoading","onError","GraphicsTextEffect","Red","results","then","errors","clear","renderHero","renderDivider","renderLines","getPreviewUrl","pid","AbstractAction"],"sources":["../../../../src/features/view/actions/WatchAction.ts"],"sourcesContent":["import { buildSchema, SchemaValues } from '@sprucelabs/schema'\nimport { heartwoodRemoteUtil } from '@sprucelabs/spruce-event-utils'\nimport { GraphicsTextEffect } from '@sprucelabs/spruce-skill-utils'\nimport AbstractAction from '../../AbstractAction'\nimport { FeatureActionResponse } from '../../features.types'\nimport { BootMeta } from '../../skill/actions/BootAction'\nimport WatchFeature from '../../watch/WatchFeature'\n\nconst optionsSchema = buildSchema({\n\tid: 'watchViewsOptions',\n\tdescription: 'Watch for view changes and preview them in real time.',\n\tfields: {\n\t\tshouldReturnImmediately: {\n\t\t\ttype: 'boolean',\n\t\t\thint: \"For testing so we don't wait until the process is killed to get the results.\",\n\t\t},\n\t},\n})\n\ntype OptionsSchema = typeof optionsSchema\ntype Options = SchemaValues<OptionsSchema>\n\nexport default class WatchAction extends AbstractAction<OptionsSchema> {\n\tpublic commandAliases = ['watch.views']\n\tpublic optionsSchema: OptionsSchema = optionsSchema\n\tpublic invocationMessage = 'Watching views... 🤩'\n\tprivate resolve?: () => void\n\tprivate bootControls?: BootMeta\n\tprivate skillName!: string\n\tprivate bootMessage!: string\n\tprivate watchFeature!: WatchFeature\n\n\tpublic async execute(options?: Options): Promise<FeatureActionResponse> {\n\t\tconst { shouldReturnImmediately } = this.validateAndNormalizeOptions(\n\t\t\toptions ?? {}\n\t\t)\n\n\t\tthis.watchFeature = this.featureInstaller.getFeature('watch')\n\t\tawait this.watchFeature.startWatching({ delay: 2000 })\n\n\t\tconst skill = await this.Store('skill').loadCurrentSkill()\n\n\t\tthis.skillName = skill.name\n\t\tthis.bootControls = await this.boot()\n\n\t\tawait this.emitter.on('watcher.did-detect-change', async () => {\n\t\t\tthis.bootControls?.kill()\n\t\t\tthis.bootControls = await this.boot(\n\t\t\t\t'Changes detected, rebooting skill...'\n\t\t\t)\n\t\t})\n\n\t\tif (!shouldReturnImmediately) {\n\t\t\tawait new Promise((resolve) => {\n\t\t\t\t//@ts-ignore\n\t\t\t\tthis.resolve = resolve\n\t\t\t})\n\n\t\t\tawait this.watchFeature.stopWatching()\n\t\t\tthis.bootControls?.kill()\n\t\t}\n\n\t\treturn {\n\t\t\tsummaryLines: [`Done watching...`],\n\t\t\tmeta: {\n\t\t\t\tbootPromise: this.bootControls.bootPromise,\n\t\t\t},\n\t\t}\n\t}\n\n\tprivate getPreviewUrl() {\n\t\tconst remote = this.Service('remote').getRemote() as any\n\t\treturn heartwoodRemoteUtil.buildUrl(remote) + '/#views/heartwood.watch'\n\t}\n\n\tprivate async boot(bootMessage = 'Booting skill...') {\n\t\tthis.bootMessage = bootMessage\n\t\tthis.resetUi()\n\n\t\tconst results = await this.Action('skill', 'boot').execute({\n\t\t\tshouldReturnImmediately: true,\n\t\t\tonData: (msg: string) => {\n\t\t\t\tif (!msg.includes('node build/index') && !msg.includes('yarn run')) {\n\t\t\t\t\tthis.ui.stopLoading()\n\t\t\t\t\tthis.ui.renderLine(msg.trim())\n\t\t\t\t\tthis.ui.startLoading(this.bootMessage)\n\t\t\t\t}\n\t\t\t},\n\t\t\tonError: (msg: string) => {\n\t\t\t\tif (!msg.includes('No license field')) {\n\t\t\t\t\tthis.ui.stopLoading()\n\t\t\t\t\tthis.ui.renderLine(msg, [GraphicsTextEffect.Red])\n\t\t\t\t\tthis.ui.startLoading()\n\t\t\t\t}\n\t\t\t},\n\t\t})\n\n\t\tresults.meta?.bootPromise?.then(() => {\n\t\t\tthis.bootMessage = 'Skill booted. Waiting for changes...'\n\t\t\tthis.ui.startLoading(this.bootMessage)\n\t\t})\n\n\t\tif (results.errors) {\n\t\t\tthrow results.errors[0]\n\t\t}\n\n\t\treturn results.meta as BootMeta\n\t}\n\n\tprivate resetUi() {\n\t\tthis.ui.clear()\n\t\tthis.ui.renderHero('Heartwood')\n\t\tthis.ui.renderDivider()\n\t\tthis.ui.renderLines([\n\t\t\t'',\n\t\t\t`Skill: ${this.skillName}`,\n\t\t\t`Preview: ${this.getPreviewUrl()}`,\n\t\t\t'',\n\t\t])\n\t\tthis.ui.renderDivider()\n\t\tthis.ui.renderLine('')\n\t\tthis.ui.startLoading(this.bootMessage)\n\t}\n\n\tpublic async kill() {\n\t\tawait this.watchFeature.stopWatching()\n\t\tthis.bootControls?.kill()\n\t\tthis.resolve?.()\n\t}\n\n\tpublic getPid() {\n\t\treturn this.bootControls?.pid\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"WatchAction.js","names":["optionsSchema","buildSchema","id","description","fields","WatchAction","Store","loadCurrentSkill","skill","skillName","name","resetUi","commands","Service","execute","onData","data","line","popLastLine","ui","startLoading","summaryLines","trim","split","filter","s","pop","length","remote","getRemote","heartwoodRemoteUtil","buildUrl","clear","renderHero","renderDivider","renderLines","getPreviewUrl","renderLine","AbstractAction"],"sources":["../../../../src/features/view/actions/WatchAction.ts"],"sourcesContent":["import { buildSchema } from '@sprucelabs/schema'\nimport { heartwoodRemoteUtil } from '@sprucelabs/spruce-event-utils'\nimport AbstractAction from '../../AbstractAction'\nimport { FeatureActionResponse } from '../../features.types'\n\nconst optionsSchema = buildSchema({\n\tid: 'watchViewsOptions',\n\tdescription: 'Watch for view changes and preview them in real time.',\n\tfields: {},\n})\n\ntype OptionsSchema = typeof optionsSchema\n\nexport default class WatchAction extends AbstractAction<OptionsSchema> {\n\tpublic commandAliases = ['watch.views']\n\tpublic optionsSchema: OptionsSchema = optionsSchema\n\tpublic invocationMessage = 'Watching views... 🤩'\n\tprivate skillName!: string\n\n\tpublic async execute(): Promise<FeatureActionResponse> {\n\t\tconst skill = await this.Store('skill').loadCurrentSkill()\n\t\tthis.skillName = skill.name\n\n\t\tthis.resetUi()\n\t\tconst commands = this.Service('command')\n\t\tawait commands.execute(\n\t\t\t'ENABLED_SKILL_FEATURES=view,event SHOULD_REGISTER_EVENTS_AND_LISTENERS=false SHOULD_WATCH_VIEWS=true MAXIMUM_LOG_PREFIXES_LENGTH=0 yarn boot',\n\t\t\t{\n\t\t\t\tonData: (data) => {\n\t\t\t\t\tconst line = this.popLastLine(data)\n\t\t\t\t\tthis.ui.startLoading(line)\n\t\t\t\t},\n\t\t\t}\n\t\t)\n\n\t\treturn {\n\t\t\tsummaryLines: [`Done watching...`],\n\t\t}\n\t}\n\n\tprivate popLastLine(data: string) {\n\t\tconst line = data\n\t\t\t.trim()\n\t\t\t.split('\\n')\n\t\t\t.filter((s) => !!s)\n\t\t\t.pop()\n\n\t\treturn line && line.length > 0 ? line.trim() : 'Waiting for changes'\n\t}\n\n\tprivate getPreviewUrl() {\n\t\tconst remote = this.Service('remote').getRemote() as any\n\t\treturn heartwoodRemoteUtil.buildUrl(remote) + '/#views/heartwood.watch'\n\t}\n\n\tprivate resetUi() {\n\t\tthis.ui.clear()\n\t\tthis.ui.renderHero('Heartwood')\n\t\tthis.ui.renderDivider()\n\t\tthis.ui.renderLines([\n\t\t\t'',\n\t\t\t`Skill: ${this.skillName}`,\n\t\t\t`Preview: ${this.getPreviewUrl()}`,\n\t\t\t'',\n\t\t])\n\t\tthis.ui.renderDivider()\n\t\tthis.ui.renderLine('')\n\t\tthis.ui.startLoading('Watching for changes')\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AACA;AACA;AAAiD;AAAA;AAGjD,IAAMA,aAAa,GAAG,IAAAC,mBAAW,EAAC;EACjCC,EAAE,EAAE,mBAAmB;EACvBC,WAAW,EAAE,uDAAuD;EACpEC,MAAM,EAAE,CAAC;AACV,CAAC,CAAC;AAAA,IAImBC,WAAW;EAAA;EAAA;EAAA;IAAA;IAAA;IAAA;MAAA;IAAA;IAAA;IAAA,mGACP,CAAC,aAAa,CAAC;IAAA,kGACDL,aAAa;IAAA,sGACxB,sBAAsB;IAAA;IAAA;EAAA;EAAA;IAAA;IAAA;MAAA,6FAGjD;QAAA;QAAA;QAAA;UAAA;YAAA;cAAA;gBAAA;gBAAA,OACqB,IAAI,CAACM,KAAK,CAAC,OAAO,CAAC,CAACC,gBAAgB,EAAE;cAAA;gBAApDC,KAAK;gBACX,IAAI,CAACC,SAAS,GAAGD,KAAK,CAACE,IAAI;gBAE3B,IAAI,CAACC,OAAO,EAAE;gBACRC,QAAQ,GAAG,IAAI,CAACC,OAAO,CAAC,SAAS,CAAC;gBAAA;gBAAA,OAClCD,QAAQ,CAACE,OAAO,CACrB,8IAA8I,EAC9I;kBACCC,MAAM,EAAE,gBAACC,IAAI,EAAK;oBACjB,IAAMC,IAAI,GAAG,MAAI,CAACC,WAAW,CAACF,IAAI,CAAC;oBACnC,MAAI,CAACG,EAAE,CAACC,YAAY,CAACH,IAAI,CAAC;kBAC3B;gBACD,CAAC,CACD;cAAA;gBAAA,iCAEM;kBACNI,YAAY,EAAE;gBACf,CAAC;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA,CACD;MAAA;QAAA;MAAA;MAAA;IAAA;EAAA;IAAA;IAAA,OAED,qBAAoBL,IAAY,EAAE;MACjC,IAAMC,IAAI,GAAGD,IAAI,CACfM,IAAI,EAAE,CACNC,KAAK,CAAC,IAAI,CAAC,CACXC,MAAM,CAAC,UAACC,CAAC;QAAA,OAAK,CAAC,CAACA,CAAC;MAAA,EAAC,CAClBC,GAAG,EAAE;MAEP,OAAOT,IAAI,IAAIA,IAAI,CAACU,MAAM,GAAG,CAAC,GAAGV,IAAI,CAACK,IAAI,EAAE,GAAG,qBAAqB;IACrE;EAAC;IAAA;IAAA,OAED,yBAAwB;MACvB,IAAMM,MAAM,GAAG,IAAI,CAACf,OAAO,CAAC,QAAQ,CAAC,CAACgB,SAAS,EAAS;MACxD,OAAOC,qCAAmB,CAACC,QAAQ,CAACH,MAAM,CAAC,GAAG,yBAAyB;IACxE;EAAC;IAAA;IAAA,OAED,mBAAkB;MACjB,IAAI,CAACT,EAAE,CAACa,KAAK,EAAE;MACf,IAAI,CAACb,EAAE,CAACc,UAAU,CAAC,WAAW,CAAC;MAC/B,IAAI,CAACd,EAAE,CAACe,aAAa,EAAE;MACvB,IAAI,CAACf,EAAE,CAACgB,WAAW,CAAC,CACnB,EAAE,mBACQ,IAAI,CAAC1B,SAAS,sBACZ,IAAI,CAAC2B,aAAa,EAAE,GAChC,EAAE,CACF,CAAC;MACF,IAAI,CAACjB,EAAE,CAACe,aAAa,EAAE;MACvB,IAAI,CAACf,EAAE,CAACkB,UAAU,CAAC,EAAE,CAAC;MACtB,IAAI,CAAClB,EAAE,CAACC,YAAY,CAAC,sBAAsB,CAAC;IAC7C;EAAC;EAAA;AAAA,EAvDuCkB,2BAAc;AAAA"}

package/build/services/CommandService.d.ts

@@ -2,12 +2,6 @@
 /// <reference types="node" />
 import { SpawnOptions } from 'child_process';
 import { Writable } from 'stream';
-interface MockResponse {
-    code: number;
-    stdout?: string;
-    stderr?: string;
-    callback?: (executable: string, args: any[]) => void;
-}
 export default class CommandService {
     cwd: string;
     private activeChildProcess;
@@ -34,4 +28,10 @@ export default class CommandService {
     static fakeCommand(command: string | RegExp, response: MockResponse): void;
     static clearMockResponses(): void;
 }
+interface MockResponse {
+    code: number;
+    stdout?: string;
+    stderr?: string;
+    callback?: (executable: string, args: any[]) => void;
+}
 export {};

package/build/services/CommandService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandService.js","names":["process","setMaxListeners","CommandService","cwd","activeChildProcess","pid","ignoreCloseErrors","treeKill","cmd","options","args","stringArgv","executable","shift","boundKill","kill","bind","Error","getMockResponse","mockResponse","mockKey","commandsRunCapturedByMockResponses","push","callback","code","SpruceError","join","stdout","stderr","on","Promise","resolve","reject","spawnOptions","shouldStream","stdio","env","PATH","IS_CLI","FORCE_COLOR","forceColor","shell","child","spawn","outStream","pipe","addListener","data","onData","toString","onError","closeHandler","off","undefined","setTimeout","removeAllListeners","ignoreErrors","search","escapeRegExp","ERROR_DIVIDER","stderrParts","split","err","AbstractSpruceError","parse","trim","commands","mockResponses","match","find","r","command","RegExp","replace","response","unshift"],"sources":["../../src/services/CommandService.ts"],"sourcesContent":["import { spawn, SpawnOptions, ChildProcess } from 'child_process'\nimport { Writable } from 'stream'\nimport AbstractSpruceError from '@sprucelabs/error'\nimport { ERROR_DIVIDER } from '@sprucelabs/spruce-skill-utils'\nimport escapeRegExp from 'lodash/escapeRegExp'\nimport stringArgv from 'string-argv'\nimport treeKill from 'tree-kill'\nimport SpruceError from '../errors/SpruceError'\n\nprocess.setMaxListeners(100)\n\ninterface MockResponse {\n\tcode: number\n\tstdout?: string\n\tstderr?: string\n\tcallback?: (executable: string, args: any[]) => void\n}\n\nexport default class CommandService {\n\tpublic cwd: string\n\tprivate activeChildProcess: ChildProcess | undefined\n\tprivate ignoreCloseErrors = false\n\tprivate static mockResponses: {\n\t\tcommand: string | RegExp\n\t\tresponse: MockResponse\n\t}[] = []\n\tprivate static commandsRunCapturedByMockResponses: string[] = []\n\n\tpublic constructor(cwd: string) {\n\t\tthis.cwd = cwd\n\t}\n\n\tpublic async execute(\n\t\tcmd: string,\n\t\toptions?: {\n\t\t\tignoreErrors?: boolean\n\t\t\targs?: string[]\n\t\t\tshouldStream?: boolean\n\t\t\toutStream?: Writable\n\t\t\tonError?: (error: string) => void\n\t\t\tonData?: (data: string) => void\n\t\t\tspawnOptions?: SpawnOptions\n\t\t\tforceColor?: boolean\n\t\t\tenv?: Record<string, any>\n\t\t}\n\t): Promise<{\n\t\tstdout: string\n\t}> {\n\t\tconst cwd = this.cwd\n\t\tconst args = options?.args || stringArgv(cmd)\n\t\tconst executable = options?.args ? cmd : args.shift()\n\t\tconst boundKill = this.kill.bind(this)\n\n\t\tif (!executable) {\n\t\t\tthrow new Error('Bad params sent to command service')\n\t\t}\n\n\t\tconst { mockResponse, mockKey } = this.getMockResponse(executable, args)\n\n\t\tif (mockResponse) {\n\t\t\tCommandService.commandsRunCapturedByMockResponses.push(mockKey)\n\t\t\tmockResponse.callback?.(executable, args)\n\n\t\t\tif (mockResponse.code !== 0) {\n\t\t\t\tthrow new SpruceError({\n\t\t\t\t\tcode: 'EXECUTING_COMMAND_FAILED',\n\t\t\t\t\tcmd: `${executable} ${args.join(' ')}`,\n\t\t\t\t\tcwd,\n\t\t\t\t\tstdout: mockResponse.stdout,\n\t\t\t\t\tstderr: mockResponse.stderr,\n\t\t\t\t})\n\t\t\t}\n\n\t\t\treturn { stdout: mockResponse.stdout ?? '' }\n\t\t}\n\n\t\tprocess.on('exit', boundKill)\n\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tlet stdout = ''\n\t\t\tlet stderr = ''\n\t\t\tconst spawnOptions: SpawnOptions = options?.shouldStream\n\t\t\t\t? {\n\t\t\t\t\t\tstdio: 'inherit',\n\t\t\t\t\t\tcwd,\n\t\t\t\t\t\tenv: {\n\t\t\t\t\t\t\tPATH: process.env.PATH,\n\t\t\t\t\t\t\tIS_CLI: 'true',\n\t\t\t\t\t\t\tFORCE_COLOR: options?.forceColor ? '1' : '0',\n\t\t\t\t\t\t\t...options?.env,\n\t\t\t\t\t\t},\n\t\t\t\t  }\n\t\t\t\t: {\n\t\t\t\t\t\tcwd,\n\t\t\t\t\t\tenv: {\n\t\t\t\t\t\t\tPATH: process.env.PATH,\n\t\t\t\t\t\t\tIS_CLI: 'true',\n\t\t\t\t\t\t\tFORCE_COLOR: options?.forceColor ? '1' : '0',\n\t\t\t\t\t\t\t...options?.env,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tshell: true,\n\t\t\t\t\t\t...options?.spawnOptions,\n\t\t\t\t  }\n\n\t\t\tconst child = spawn(executable, args, spawnOptions)\n\t\t\tthis.activeChildProcess = child\n\n\t\t\tif (options?.outStream) {\n\t\t\t\tchild.stdout?.pipe(options.outStream)\n\t\t\t}\n\n\t\t\tchild.stdout?.addListener('data', (data) => {\n\t\t\t\toptions?.onData?.(data.toString())\n\t\t\t\tstdout += data\n\t\t\t})\n\n\t\t\tchild.stderr?.addListener('data', (data) => {\n\t\t\t\toptions?.onError?.(data.toString())\n\t\t\t\tstderr += data\n\t\t\t})\n\n\t\t\tconst closeHandler = (code: number) => {\n\t\t\t\tprocess.off('exit', boundKill)\n\n\t\t\t\tif (!this.activeChildProcess) {\n\t\t\t\t\treturn\n\t\t\t\t}\n\t\t\t\tthis.activeChildProcess = undefined\n\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tchild.stdout?.removeAllListeners()\n\t\t\t\t\tchild.stderr?.removeAllListeners()\n\t\t\t\t\tchild.removeAllListeners()\n\n\t\t\t\t\tif (code === 0 || this.ignoreCloseErrors || options?.ignoreErrors) {\n\t\t\t\t\t\tresolve({ stdout })\n\t\t\t\t\t\tthis.ignoreCloseErrors = false\n\t\t\t\t\t} else {\n\t\t\t\t\t\tif (stderr.search(escapeRegExp(ERROR_DIVIDER)) > -1) {\n\t\t\t\t\t\t\tconst stderrParts = stderr.split(ERROR_DIVIDER)\n\t\t\t\t\t\t\tconst err = AbstractSpruceError.parse(stderrParts[1], SpruceError)\n\t\t\t\t\t\t\treject(err)\n\t\t\t\t\t\t\treturn\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\treject(\n\t\t\t\t\t\t\tnew SpruceError({\n\t\t\t\t\t\t\t\tcode: 'EXECUTING_COMMAND_FAILED',\n\t\t\t\t\t\t\t\tcmd: `${executable} ${args.join(' ')}`,\n\t\t\t\t\t\t\t\tcwd,\n\t\t\t\t\t\t\t\tstdout,\n\t\t\t\t\t\t\t\tstderr,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t)\n\t\t\t\t\t}\n\t\t\t\t}, 0)\n\t\t\t}\n\n\t\t\tchild.addListener('close', closeHandler)\n\t\t\tchild.addListener('exit', closeHandler)\n\t\t})\n\t}\n\n\tpublic kill = () => {\n\t\tif (this.activeChildProcess?.pid) {\n\t\t\tthis.ignoreCloseErrors = true\n\t\t\ttreeKill(this.activeChildProcess.pid, 'SIGTERM')\n\t\t}\n\t}\n\n\tpublic pid = () => {\n\t\treturn this.activeChildProcess?.pid\n\t}\n\n\tprivate getMockResponse(executable: string, args: string[]) {\n\t\tconst mockKey = `${executable} ${args.join(' ')}`.trim()\n\t\tconst commands = CommandService.mockResponses\n\t\tconst match = commands.find((r) =>\n\t\t\tr.command instanceof RegExp\n\t\t\t\t? mockKey.search(r.command) > -1\n\t\t\t\t: r.command.replace(/ +/gis, '') === mockKey.replace(/ +/gis, '')\n\t\t)\n\n\t\treturn { mockResponse: match?.response, mockKey }\n\t}\n\n\tpublic static fakeCommand(command: string | RegExp, response: MockResponse) {\n\t\tthis.mockResponses.unshift({\n\t\t\tcommand,\n\t\t\tresponse,\n\t\t})\n\t}\n\n\tpublic static clearMockResponses() {\n\t\tthis.mockResponses = []\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"CommandService.js","names":["process","setMaxListeners","CommandService","cwd","activeChildProcess","pid","ignoreCloseErrors","treeKill","cmd","options","args","stringArgv","executable","shift","boundKill","kill","bind","Error","getMockResponse","mockResponse","mockKey","commandsRunCapturedByMockResponses","push","callback","code","SpruceError","join","stdout","stderr","on","Promise","resolve","reject","spawnOptions","shouldStream","stdio","env","PATH","IS_CLI","FORCE_COLOR","forceColor","shell","child","spawn","outStream","pipe","addListener","data","onData","toString","onError","closeHandler","off","undefined","setTimeout","removeAllListeners","ignoreErrors","search","escapeRegExp","ERROR_DIVIDER","stderrParts","split","err","AbstractSpruceError","parse","trim","commands","mockResponses","match","find","r","command","RegExp","replace","response","unshift"],"sources":["../../src/services/CommandService.ts"],"sourcesContent":["import { spawn, SpawnOptions, ChildProcess } from 'child_process'\nimport { Writable } from 'stream'\nimport AbstractSpruceError from '@sprucelabs/error'\nimport { ERROR_DIVIDER } from '@sprucelabs/spruce-skill-utils'\nimport escapeRegExp from 'lodash/escapeRegExp'\nimport stringArgv from 'string-argv'\nimport treeKill from 'tree-kill'\nimport SpruceError from '../errors/SpruceError'\n\nprocess.setMaxListeners(100)\n\nexport default class CommandService {\n\tpublic cwd: string\n\tprivate activeChildProcess: ChildProcess | undefined\n\tprivate ignoreCloseErrors = false\n\tprivate static mockResponses: {\n\t\tcommand: string | RegExp\n\t\tresponse: MockResponse\n\t}[] = []\n\tprivate static commandsRunCapturedByMockResponses: string[] = []\n\n\tpublic constructor(cwd: string) {\n\t\tthis.cwd = cwd\n\t}\n\n\tpublic async execute(\n\t\tcmd: string,\n\t\toptions?: {\n\t\t\tignoreErrors?: boolean\n\t\t\targs?: string[]\n\t\t\tshouldStream?: boolean\n\t\t\toutStream?: Writable\n\t\t\tonError?: (error: string) => void\n\t\t\tonData?: (data: string) => void\n\t\t\tspawnOptions?: SpawnOptions\n\t\t\tforceColor?: boolean\n\t\t\tenv?: Record<string, any>\n\t\t}\n\t): Promise<{\n\t\tstdout: string\n\t}> {\n\t\tconst cwd = this.cwd\n\t\tconst args = options?.args || stringArgv(cmd)\n\t\tconst executable = options?.args ? cmd : args.shift()\n\t\tconst boundKill = this.kill.bind(this)\n\n\t\tif (!executable) {\n\t\t\tthrow new Error('Bad params sent to command service')\n\t\t}\n\n\t\tconst { mockResponse, mockKey } = this.getMockResponse(executable, args)\n\n\t\tif (mockResponse) {\n\t\t\tCommandService.commandsRunCapturedByMockResponses.push(mockKey)\n\t\t\tmockResponse.callback?.(executable, args)\n\n\t\t\tif (mockResponse.code !== 0) {\n\t\t\t\tthrow new SpruceError({\n\t\t\t\t\tcode: 'EXECUTING_COMMAND_FAILED',\n\t\t\t\t\tcmd: `${executable} ${args.join(' ')}`,\n\t\t\t\t\tcwd,\n\t\t\t\t\tstdout: mockResponse.stdout,\n\t\t\t\t\tstderr: mockResponse.stderr,\n\t\t\t\t})\n\t\t\t}\n\n\t\t\treturn { stdout: mockResponse.stdout ?? '' }\n\t\t}\n\n\t\tprocess.on('exit', boundKill)\n\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tlet stdout = ''\n\t\t\tlet stderr = ''\n\t\t\tconst spawnOptions: SpawnOptions = options?.shouldStream\n\t\t\t\t? {\n\t\t\t\t\t\tstdio: 'inherit',\n\t\t\t\t\t\tcwd,\n\t\t\t\t\t\tenv: {\n\t\t\t\t\t\t\tPATH: process.env.PATH,\n\t\t\t\t\t\t\tIS_CLI: 'true',\n\t\t\t\t\t\t\tFORCE_COLOR: options?.forceColor ? '1' : '0',\n\t\t\t\t\t\t\t...options?.env,\n\t\t\t\t\t\t},\n\t\t\t\t  }\n\t\t\t\t: {\n\t\t\t\t\t\tcwd,\n\t\t\t\t\t\tenv: {\n\t\t\t\t\t\t\tPATH: process.env.PATH,\n\t\t\t\t\t\t\tIS_CLI: 'true',\n\t\t\t\t\t\t\tFORCE_COLOR: options?.forceColor ? '1' : '0',\n\t\t\t\t\t\t\t...options?.env,\n\t\t\t\t\t\t},\n\t\t\t\t\t\tshell: true,\n\t\t\t\t\t\t...options?.spawnOptions,\n\t\t\t\t  }\n\n\t\t\tconst child = spawn(executable, args, spawnOptions)\n\t\t\tthis.activeChildProcess = child\n\n\t\t\tif (options?.outStream) {\n\t\t\t\tchild.stdout?.pipe(options.outStream)\n\t\t\t}\n\n\t\t\tchild.stdout?.addListener('data', (data) => {\n\t\t\t\toptions?.onData?.(data.toString())\n\t\t\t\tstdout += data\n\t\t\t})\n\n\t\t\tchild.stderr?.addListener('data', (data) => {\n\t\t\t\toptions?.onError?.(data.toString())\n\t\t\t\tstderr += data\n\t\t\t})\n\n\t\t\tconst closeHandler = (code: number) => {\n\t\t\t\tprocess.off('exit', boundKill)\n\n\t\t\t\tif (!this.activeChildProcess) {\n\t\t\t\t\treturn\n\t\t\t\t}\n\t\t\t\tthis.activeChildProcess = undefined\n\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tchild.stdout?.removeAllListeners()\n\t\t\t\t\tchild.stderr?.removeAllListeners()\n\t\t\t\t\tchild.removeAllListeners()\n\n\t\t\t\t\tif (code === 0 || this.ignoreCloseErrors || options?.ignoreErrors) {\n\t\t\t\t\t\tresolve({ stdout })\n\t\t\t\t\t\tthis.ignoreCloseErrors = false\n\t\t\t\t\t} else {\n\t\t\t\t\t\tif (stderr.search(escapeRegExp(ERROR_DIVIDER)) > -1) {\n\t\t\t\t\t\t\tconst stderrParts = stderr.split(ERROR_DIVIDER)\n\t\t\t\t\t\t\tconst err = AbstractSpruceError.parse(stderrParts[1], SpruceError)\n\t\t\t\t\t\t\treject(err)\n\t\t\t\t\t\t\treturn\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\treject(\n\t\t\t\t\t\t\tnew SpruceError({\n\t\t\t\t\t\t\t\tcode: 'EXECUTING_COMMAND_FAILED',\n\t\t\t\t\t\t\t\tcmd: `${executable} ${args.join(' ')}`,\n\t\t\t\t\t\t\t\tcwd,\n\t\t\t\t\t\t\t\tstdout,\n\t\t\t\t\t\t\t\tstderr,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t)\n\t\t\t\t\t}\n\t\t\t\t}, 0)\n\t\t\t}\n\n\t\t\tchild.addListener('close', closeHandler)\n\t\t\tchild.addListener('exit', closeHandler)\n\t\t})\n\t}\n\n\tpublic kill = () => {\n\t\tif (this.activeChildProcess?.pid) {\n\t\t\tthis.ignoreCloseErrors = true\n\t\t\ttreeKill(this.activeChildProcess.pid, 'SIGTERM')\n\t\t}\n\t}\n\n\tpublic pid = () => {\n\t\treturn this.activeChildProcess?.pid\n\t}\n\n\tprivate getMockResponse(executable: string, args: string[]) {\n\t\tconst mockKey = `${executable} ${args.join(' ')}`.trim()\n\t\tconst commands = CommandService.mockResponses\n\t\tconst match = commands.find((r) =>\n\t\t\tr.command instanceof RegExp\n\t\t\t\t? mockKey.search(r.command) > -1\n\t\t\t\t: r.command.replace(/ +/gis, '') === mockKey.replace(/ +/gis, '')\n\t\t)\n\n\t\treturn { mockResponse: match?.response, mockKey }\n\t}\n\n\tpublic static fakeCommand(command: string | RegExp, response: MockResponse) {\n\t\tthis.mockResponses.unshift({\n\t\t\tcommand,\n\t\t\tresponse,\n\t\t})\n\t}\n\n\tpublic static clearMockResponses() {\n\t\tthis.mockResponses = []\n\t}\n}\n\ninterface MockResponse {\n\tcode: number\n\tstdout?: string\n\tstderr?: string\n\tcallback?: (executable: string, args: any[]) => void\n}\n"],"mappings":"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"}

package/node_modules/@typescript-eslint/parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/parser",
-  "version": "5.42.1",
+  "version": "5.43.0",
   "description": "An ESLint custom parser which leverages TypeScript ESTree",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,9 +45,9 @@
     "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@typescript-eslint/scope-manager": "5.42.1",
-    "@typescript-eslint/types": "5.42.1",
-    "@typescript-eslint/typescript-estree": "5.42.1",
+    "@typescript-eslint/scope-manager": "5.43.0",
+    "@typescript-eslint/types": "5.43.0",
+    "@typescript-eslint/typescript-estree": "5.43.0",
     "debug": "^4.3.4"
   },
   "devDependencies": {
@@ -71,5 +71,5 @@
       ]
     }
   },
-  "gitHead": "b8b24c211695c00317c93e1da1bf80b6d9c6837c"
+  "gitHead": "8af1b4d970438b27ea041717bddadc41af8fc72a"
 }

package/node_modules/@typescript-eslint/scope-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/scope-manager",
-  "version": "5.42.1",
+  "version": "5.43.0",
   "description": "TypeScript scope analyser for ESLint",
   "keywords": [
     "eslint",
@@ -38,12 +38,12 @@
     "typecheck": "cd ../../ && nx typecheck @typescript-eslint/scope-manager"
   },
   "dependencies": {
-    "@typescript-eslint/types": "5.42.1",
-    "@typescript-eslint/visitor-keys": "5.42.1"
+    "@typescript-eslint/types": "5.43.0",
+    "@typescript-eslint/visitor-keys": "5.43.0"
   },
   "devDependencies": {
     "@types/glob": "*",
-    "@typescript-eslint/typescript-estree": "5.42.1",
+    "@typescript-eslint/typescript-estree": "5.43.0",
     "glob": "*",
     "jest-specific-snapshot": "*",
     "make-dir": "*",
@@ -63,5 +63,5 @@
       ]
     }
   },
-  "gitHead": "b8b24c211695c00317c93e1da1bf80b6d9c6837c"
+  "gitHead": "8af1b4d970438b27ea041717bddadc41af8fc72a"
 }

package/node_modules/@typescript-eslint/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/types",
-  "version": "5.42.1",
+  "version": "5.43.0",
   "description": "Types for the TypeScript-ESTree AST spec",
   "keywords": [
     "eslint",
@@ -80,5 +80,5 @@
   "devDependencies": {
     "typescript": "*"
   },
-  "gitHead": "b8b24c211695c00317c93e1da1bf80b6d9c6837c"
+  "gitHead": "8af1b4d970438b27ea041717bddadc41af8fc72a"
 }

package/node_modules/@typescript-eslint/typescript-estree/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/typescript-estree",
-  "version": "5.42.1",
+  "version": "5.43.0",
   "description": "A parser that converts TypeScript source code into an ESTree compatible form",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -42,8 +42,8 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/types": "5.42.1",
-    "@typescript-eslint/visitor-keys": "5.42.1",
+    "@typescript-eslint/types": "5.43.0",
+    "@typescript-eslint/visitor-keys": "5.43.0",
     "debug": "^4.3.4",
     "globby": "^11.1.0",
     "is-glob": "^4.0.3",
@@ -59,7 +59,7 @@
     "@types/is-glob": "*",
     "@types/semver": "*",
     "@types/tmp": "*",
-    "@typescript-eslint/shared-fixtures": "5.42.1",
+    "@typescript-eslint/shared-fixtures": "5.43.0",
     "glob": "*",
     "jest-specific-snapshot": "*",
     "make-dir": "*",
@@ -82,5 +82,5 @@
       ]
     }
   },
-  "gitHead": "b8b24c211695c00317c93e1da1bf80b6d9c6837c"
+  "gitHead": "8af1b4d970438b27ea041717bddadc41af8fc72a"
 }

package/node_modules/@typescript-eslint/visitor-keys/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/visitor-keys",
-  "version": "5.42.1",
+  "version": "5.43.0",
   "description": "Visitor keys used to help traverse the TypeScript-ESTree AST",
   "keywords": [
     "eslint",
@@ -39,7 +39,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/types": "5.42.1",
+    "@typescript-eslint/types": "5.43.0",
     "eslint-visitor-keys": "^3.3.0"
   },
   "devDependencies": {
@@ -56,5 +56,5 @@
       ]
     }
   },
-  "gitHead": "b8b24c211695c00317c93e1da1bf80b6d9c6837c"
+  "gitHead": "8af1b4d970438b27ea041717bddadc41af8fc72a"
 }

package/package.json

@@ -18,7 +18,7 @@
     ]
   },
   "license": "MIT",
-  "version": "18.1.5",
+  "version": "18.1.6",
   "bin": {
     "spruce": "./build/index.js"
   },
@@ -86,7 +86,7 @@
     "@sprucelabs/spruce-core-schemas": "^35.1.51",
     "@sprucelabs/spruce-event-utils": "^29.1.54",
     "@sprucelabs/spruce-skill-utils": "^28.0.47",
-    "@sprucelabs/spruce-templates": "^18.1.5",
+    "@sprucelabs/spruce-templates": "^18.1.6",
     "@typescript-eslint/eslint-plugin": "^5.27.1",
     "@typescript-eslint/parser": "^5.27.1",
     "cfonts": "^3.1.1",
@@ -561,5 +561,5 @@
       "terminal-kit"
     ]
   },
-  "gitHead": "79c031341a14adef0924d8cef423bbc99400ddbd"
+  "gitHead": "29344d4c0e5571279c2c87dc7c036a2d7dec5a97"
 }