@sprucelabs/spruce-cli 18.1.8 → 18.3.0

package/build/schemas/v2020_07_22/generatedFile.builder.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _schema = require("@sprucelabs/schema");
+var generatedFileBuilder = (0, _schema.buildSchema)({
+  id: 'generatedFile',
+  fields: {
+    name: {
+      type: 'text',
+      isRequired: true
+    },
+    path: {
+      type: 'text',
+      isRequired: true
+    },
+    description: {
+      type: 'text'
+    },
+    action: {
+      type: 'select',
+      isRequired: true,
+      options: {
+        choices: [{
+          label: 'Skipped',
+          value: 'skipped'
+        }, {
+          label: 'Generated',
+          value: 'generated'
+        }, {
+          label: 'Updated',
+          value: 'updated'
+        }, {
+          label: 'Deleted',
+          value: 'deleted'
+        }]
+      }
+    }
+  }
+});
+var _default = generatedFileBuilder;
+exports["default"] = _default;
+//# sourceMappingURL=generatedFile.builder.js.map

package/build/schemas/v2020_07_22/generatedFile.builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generatedFile.builder.js","names":["generatedFileBuilder","buildSchema","id","fields","name","type","isRequired","path","description","action","options","choices","label","value"],"sources":["../../../src/schemas/v2020_07_22/generatedFile.builder.ts"],"sourcesContent":["import { buildSchema } from '@sprucelabs/schema'\n\nconst generatedFileBuilder = buildSchema({\n\tid: 'generatedFile',\n\tfields: {\n\t\tname: {\n\t\t\ttype: 'text',\n\t\t\tisRequired: true,\n\t\t},\n\t\tpath: {\n\t\t\ttype: 'text',\n\t\t\tisRequired: true,\n\t\t},\n\t\tdescription: {\n\t\t\ttype: 'text',\n\t\t},\n\t\taction: {\n\t\t\ttype: 'select',\n\t\t\tisRequired: true,\n\t\t\toptions: {\n\t\t\t\tchoices: [\n\t\t\t\t\t{\n\t\t\t\t\t\tlabel: 'Skipped',\n\t\t\t\t\t\tvalue: 'skipped',\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\tlabel: 'Generated',\n\t\t\t\t\t\tvalue: 'generated',\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\tlabel: 'Updated',\n\t\t\t\t\t\tvalue: 'updated',\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\tlabel: 'Deleted',\n\t\t\t\t\t\tvalue: 'deleted',\n\t\t\t\t\t},\n\t\t\t\t],\n\t\t\t},\n\t\t},\n\t},\n})\n\nexport default generatedFileBuilder\n"],"mappings":";;;;;;AAAA;AAEA,IAAMA,oBAAoB,GAAG,IAAAC,mBAAW,EAAC;EACxCC,EAAE,EAAE,eAAe;EACnBC,MAAM,EAAE;IACPC,IAAI,EAAE;MACLC,IAAI,EAAE,MAAM;MACZC,UAAU,EAAE;IACb,CAAC;IACDC,IAAI,EAAE;MACLF,IAAI,EAAE,MAAM;MACZC,UAAU,EAAE;IACb,CAAC;IACDE,WAAW,EAAE;MACZH,IAAI,EAAE;IACP,CAAC;IACDI,MAAM,EAAE;MACPJ,IAAI,EAAE,QAAQ;MACdC,UAAU,EAAE,IAAI;MAChBI,OAAO,EAAE;QACRC,OAAO,EAAE,CACR;UACCC,KAAK,EAAE,SAAS;UAChBC,KAAK,EAAE;QACR,CAAC,EACD;UACCD,KAAK,EAAE,WAAW;UAClBC,KAAK,EAAE;QACR,CAAC,EACD;UACCD,KAAK,EAAE,SAAS;UAChBC,KAAK,EAAE;QACR,CAAC,EACD;UACCD,KAAK,EAAE,SAAS;UAChBC,KAAK,EAAE;QACR,CAAC;MAEH;IACD;EACD;AACD,CAAC,CAAC;AAAA,eAEab,oBAAoB;AAAA"}

package/build/schemas/v2020_07_22/watcherDidDetectChangesEmitPayload.builder.js

@@ -1,45 +1,12 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 var _schema = require("@sprucelabs/schema");
-var fieldsSchema = (0, _schema.buildSchema)({
-  id: 'generatedFileFields',
-  fields: {
-    name: {
-      type: 'text',
-      isRequired: true
-    },
-    path: {
-      type: 'text',
-      isRequired: true
-    },
-    description: {
-      type: 'text'
-    },
-    action: {
-      type: 'select',
-      isRequired: true,
-      options: {
-        choices: [{
-          label: 'Skipped',
-          value: 'skipped'
-        }, {
-          label: 'Generated',
-          value: 'generated'
-        }, {
-          label: 'Updated',
-          value: 'updated'
-        }, {
-          label: 'Deleted',
-          value: 'deleted'
-        }]
-      }
-    }
-  }
-});
+var _generatedFile = _interopRequireDefault(require("./generatedFile.builder"));
 var _default = (0, _schema.buildSchema)({
   id: 'watcherDidDetectChangesEmitPayload',
   name: 'Watcher did detect changes emit payload',
@@ -49,12 +16,9 @@ var _default = (0, _schema.buildSchema)({
       isRequired: true,
       isArray: true,
       options: {
-        schemas: [(0, _schema.buildSchema)({
-          id: 'generatedFile',
-          fields: fieldsSchema.fields
-        }), (0, _schema.buildSchema)({
+        schemas: [_generatedFile["default"], (0, _schema.buildSchema)({
           id: 'generatedDir',
-          fields: fieldsSchema.fields
+          fields: _generatedFile["default"].fields
         })]
       }
     }

package/build/schemas/v2020_07_22/watcherDidDetectChangesEmitPayload.builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcherDidDetectChangesEmitPayload.builder.js","names":["fieldsSchema","buildSchema","id","fields","name","type","isRequired","path","description","action","options","choices","label","value","changes","isArray","schemas"],"sources":["../../../src/schemas/v2020_07_22/watcherDidDetectChangesEmitPayload.builder.ts"],"sourcesContent":["import { buildSchema } from '@sprucelabs/schema'\n\nconst fieldsSchema = buildSchema({\n\tid: 'generatedFileFields',\n\tfields: {\n\t\tname: {\n\t\t\ttype: 'text',\n\t\t\tisRequired: true,\n\t\t},\n\t\tpath: {\n\t\t\ttype: 'text',\n\t\t\tisRequired: true,\n\t\t},\n\t\tdescription: {\n\t\t\ttype: 'text',\n\t\t},\n\t\taction: {\n\t\t\ttype: 'select',\n\t\t\tisRequired: true,\n\t\t\toptions: {\n\t\t\t\tchoices: [\n\t\t\t\t\t{\n\t\t\t\t\t\tlabel: 'Skipped',\n\t\t\t\t\t\tvalue: 'skipped',\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\tlabel: 'Generated',\n\t\t\t\t\t\tvalue: 'generated',\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\tlabel: 'Updated',\n\t\t\t\t\t\tvalue: 'updated',\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\tlabel: 'Deleted',\n\t\t\t\t\t\tvalue: 'deleted',\n\t\t\t\t\t},\n\t\t\t\t],\n\t\t\t},\n\t\t},\n\t},\n})\n\nexport default buildSchema({\n\tid: 'watcherDidDetectChangesEmitPayload',\n\tname: 'Watcher did detect changes emit payload',\n\tfields: {\n\t\tchanges: {\n\t\t\ttype: 'schema',\n\t\t\tisRequired: true,\n\t\t\tisArray: true,\n\t\t\toptions: {\n\t\t\t\tschemas: [\n\t\t\t\t\tbuildSchema({\n\t\t\t\t\t\tid: 'generatedFile',\n\t\t\t\t\t\tfields: fieldsSchema.fields,\n\t\t\t\t\t}),\n\t\t\t\t\tbuildSchema({\n\t\t\t\t\t\tid: 'generatedDir',\n\t\t\t\t\t\tfields: fieldsSchema.fields,\n\t\t\t\t\t}),\n\t\t\t\t],\n\t\t\t},\n\t\t},\n\t},\n})\n"],"mappings":";;;;;;AAAA;AAEA,IAAMA,YAAY,GAAG,IAAAC,mBAAW,EAAC;EAChCC,EAAE,EAAE,qBAAqB;EACzBC,MAAM,EAAE;IACPC,IAAI,EAAE;MACLC,IAAI,EAAE,MAAM;MACZC,UAAU,EAAE;IACb,CAAC;IACDC,IAAI,EAAE;MACLF,IAAI,EAAE,MAAM;MACZC,UAAU,EAAE;IACb,CAAC;IACDE,WAAW,EAAE;MACZH,IAAI,EAAE;IACP,CAAC;IACDI,MAAM,EAAE;MACPJ,IAAI,EAAE,QAAQ;MACdC,UAAU,EAAE,IAAI;MAChBI,OAAO,EAAE;QACRC,OAAO,EAAE,CACR;UACCC,KAAK,EAAE,SAAS;UAChBC,KAAK,EAAE;QACR,CAAC,EACD;UACCD,KAAK,EAAE,WAAW;UAClBC,KAAK,EAAE;QACR,CAAC,EACD;UACCD,KAAK,EAAE,SAAS;UAChBC,KAAK,EAAE;QACR,CAAC,EACD;UACCD,KAAK,EAAE,SAAS;UAChBC,KAAK,EAAE;QACR,CAAC;MAEH;IACD;EACD;AACD,CAAC,CAAC;AAAA,eAEa,IAAAZ,mBAAW,EAAC;EAC1BC,EAAE,EAAE,oCAAoC;EACxCE,IAAI,EAAE,yCAAyC;EAC/CD,MAAM,EAAE;IACPW,OAAO,EAAE;MACRT,IAAI,EAAE,QAAQ;MACdC,UAAU,EAAE,IAAI;MAChBS,OAAO,EAAE,IAAI;MACbL,OAAO,EAAE;QACRM,OAAO,EAAE,CACR,IAAAf,mBAAW,EAAC;UACXC,EAAE,EAAE,eAAe;UACnBC,MAAM,EAAEH,YAAY,CAACG;QACtB,CAAC,CAAC,EACF,IAAAF,mBAAW,EAAC;UACXC,EAAE,EAAE,cAAc;UAClBC,MAAM,EAAEH,YAAY,CAACG;QACtB,CAAC,CAAC;MAEJ;IACD;EACD;AACD,CAAC,CAAC;AAAA"}
+{"version":3,"file":"watcherDidDetectChangesEmitPayload.builder.js","names":["buildSchema","id","name","fields","changes","type","isRequired","isArray","options","schemas","generatedFileBuilder"],"sources":["../../../src/schemas/v2020_07_22/watcherDidDetectChangesEmitPayload.builder.ts"],"sourcesContent":["import { buildSchema } from '@sprucelabs/schema'\nimport generatedFileBuilder from './generatedFile.builder'\n\nexport default buildSchema({\n\tid: 'watcherDidDetectChangesEmitPayload',\n\tname: 'Watcher did detect changes emit payload',\n\tfields: {\n\t\tchanges: {\n\t\t\ttype: 'schema',\n\t\t\tisRequired: true,\n\t\t\tisArray: true,\n\t\t\toptions: {\n\t\t\t\tschemas: [\n\t\t\t\t\tgeneratedFileBuilder,\n\t\t\t\t\tbuildSchema({\n\t\t\t\t\t\tid: 'generatedDir',\n\t\t\t\t\t\tfields: generatedFileBuilder.fields,\n\t\t\t\t\t}),\n\t\t\t\t],\n\t\t\t},\n\t\t},\n\t},\n})\n"],"mappings":";;;;;;;AAAA;AACA;AAA0D,eAE3C,IAAAA,mBAAW,EAAC;EAC1BC,EAAE,EAAE,oCAAoC;EACxCC,IAAI,EAAE,yCAAyC;EAC/CC,MAAM,EAAE;IACPC,OAAO,EAAE;MACRC,IAAI,EAAE,QAAQ;MACdC,UAAU,EAAE,IAAI;MAChBC,OAAO,EAAE,IAAI;MACbC,OAAO,EAAE;QACRC,OAAO,EAAE,CACRC,yBAAoB,EACpB,IAAAV,mBAAW,EAAC;UACXC,EAAE,EAAE,cAAc;UAClBE,MAAM,EAAEO,yBAAoB,CAACP;QAC9B,CAAC,CAAC;MAEJ;IACD;EACD;AACD,CAAC,CAAC;AAAA"}

package/build/services/CommandService.d.ts

@@ -6,7 +6,7 @@ export default class CommandService {
     cwd: string;
     private activeChildProcess;
     private ignoreCloseErrors;
-    private static mockResponses;
+    private static fakeResponses;
     private static commandsRunCapturedByMockResponses;
     constructor(cwd: string);
     execute(cmd: string, options?: {
@@ -26,7 +26,7 @@ export default class CommandService {
     pid: () => number | undefined;
     private getMockResponse;
     static fakeCommand(command: string | RegExp, response: MockResponse): void;
-    static clearMockResponses(): void;
+    static clearFakedResponses(): void;
 }
 interface MockResponse {
     code: number;

package/build/services/CommandService.js

@@ -173,7 +173,7 @@ var CommandService = /*#__PURE__*/function () {
     key: "getMockResponse",
     value: function getMockResponse(executable, args) {
       var mockKey = "".concat(executable, " ").concat(args.join(' ')).trim();
-      var commands = CommandService.mockResponses;
+      var commands = CommandService.fakeResponses;
       var match = commands.find(function (r) {
         return r.command instanceof RegExp ? mockKey.search(r.command) > -1 : r.command.replace(/ +/gi, '') === mockKey.replace(/ +/gi, '');
       });
@@ -185,20 +185,20 @@ var CommandService = /*#__PURE__*/function () {
   }], [{
     key: "fakeCommand",
     value: function fakeCommand(command, response) {
-      this.mockResponses.unshift({
+      this.fakeResponses.unshift({
         command: command,
         response: response
       });
     }
   }, {
-    key: "clearMockResponses",
-    value: function clearMockResponses() {
-      this.mockResponses = [];
+    key: "clearFakedResponses",
+    value: function clearFakedResponses() {
+      this.fakeResponses = [];
     }
   }]);
   return CommandService;
 }();
 exports["default"] = CommandService;
-(0, _defineProperty2["default"])(CommandService, "mockResponses", []);
+(0, _defineProperty2["default"])(CommandService, "fakeResponses", []);
 (0, _defineProperty2["default"])(CommandService, "commandsRunCapturedByMockResponses", []);
 //# sourceMappingURL=CommandService.js.map

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\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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"}
+{"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","fakeResponses","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 fakeResponses: {\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.fakeResponses\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.fakeResponses.unshift({\n\t\t\tcommand,\n\t\t\tresponse,\n\t\t})\n\t}\n\n\tpublic static clearFakedResponses() {\n\t\tthis.fakeResponses = []\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/build/services/PkgService.d.ts

@@ -16,5 +16,6 @@ export default class PkgService extends BasePkgService {
         executable: string;
         args: any[];
     };
+    getSkillNamespace(): any;
     uninstall(pkg: string[] | string): Promise<void>;
 }

package/build/services/PkgService.js

@@ -123,6 +123,11 @@ var PkgService = /*#__PURE__*/function (_BasePkgService) {
       }
       return install;
     }()
+  }, {
+    key: "getSkillNamespace",
+    value: function getSkillNamespace() {
+      return this.get('skill.namespace');
+    }
   }, {
     key: "uninstall",
     value: function () {

package/build/services/PkgService.js.map

@@ -1 +1 @@
-{"version":3,"file":"PkgService.js","names":["PkgService","cwd","commandService","pkg","options","shouldCleanupLockFiles","deleteLockFile","bind","execute","args","totalInstalled","totalSkipped","packages","Array","isArray","toInstall","labsModules","thisPackage","isInstalled","shouldForceInstall","startsWith","push","stripLatest","buildCommandAndArgs","executable","diskUtil","doesDirExist","pathUtil","join","_parsedPkg","undefined","length","install","isCi","createRandomTempDir","filter","a","isDev","BasePkgService"],"sources":["../../src/services/PkgService.ts"],"sourcesContent":["import pathUtil from 'path'\nimport {\n\tdiskUtil,\n\tPkgService as BasePkgService,\n} from '@sprucelabs/spruce-skill-utils'\nimport isCi from '../utilities/isCi'\nimport CommandService from './CommandService'\n\nexport interface AddOptions {\n\tisDev?: boolean\n\tshouldForceInstall?: boolean\n\tshouldCleanupLockFiles?: boolean\n}\n\nexport default class PkgService extends BasePkgService {\n\tprivate commandService: CommandService\n\n\tpublic constructor(cwd: string, commandService: CommandService) {\n\t\tsuper(cwd)\n\t\tthis.commandService = commandService\n\t}\n\n\tpublic async install(pkg?: string[] | string, options?: AddOptions) {\n\t\tconst shouldCleanupLockFiles = options?.shouldCleanupLockFiles !== false\n\t\tconst deleteLockFile = shouldCleanupLockFiles\n\t\t\t? this.deleteLockFile.bind(this)\n\t\t\t: () => {}\n\n\t\tif (!pkg) {\n\t\t\tawait this.commandService.execute('yarn', { args: ['install'] })\n\t\t\tdeleteLockFile()\n\t\t\treturn { totalInstalled: -1, totalSkipped: -1 }\n\t\t}\n\n\t\tdeleteLockFile()\n\n\t\tconst packages = Array.isArray(pkg) ? pkg : [pkg]\n\t\tconst toInstall = []\n\t\tconst labsModules: string[] = []\n\n\t\tlet totalInstalled = 0\n\t\tlet totalSkipped = 0\n\n\t\tfor (const thisPackage of packages) {\n\t\t\tconst isInstalled =\n\t\t\t\t!options?.shouldForceInstall && this.isInstalled(thisPackage)\n\t\t\tif (thisPackage.startsWith('@sprucelabs/') || !isInstalled) {\n\t\t\t\ttoInstall.push(this.stripLatest(thisPackage))\n\t\t\t\ttotalInstalled++\n\t\t\t} else {\n\t\t\t\ttotalSkipped++\n\t\t\t}\n\t\t}\n\n\t\tif (totalInstalled > 0) {\n\t\t\tconst { executable, args } = PkgService.buildCommandAndArgs(\n\t\t\t\ttoInstall,\n\t\t\t\toptions\n\t\t\t)\n\n\t\t\tawait this.commandService.execute(executable, {\n\t\t\t\targs,\n\t\t\t})\n\t\t} else if (\n\t\t\t!diskUtil.doesDirExist(pathUtil.join(this.cwd, 'node_modules'))\n\t\t) {\n\t\t\tawait this.commandService.execute('yarn', { args: ['install'] })\n\t\t}\n\n\t\tdeleteLockFile()\n\n\t\tthis._parsedPkg = undefined\n\n\t\treturn { totalInstalled: totalInstalled + labsModules.length, totalSkipped }\n\t}\n\n\tpublic static buildCommandAndArgs(\n\t\ttoInstall: string[],\n\t\toptions: AddOptions | undefined\n\t) {\n\t\tconst args: any[] = [\n\t\t\tisCi() && '--cache-folder',\n\t\t\tisCi() && diskUtil.createRandomTempDir(),\n\t\t\t'add',\n\t\t\t...toInstall,\n\t\t].filter((a) => !!a)\n\n\t\tif (options?.isDev) {\n\t\t\targs.push('-D')\n\t\t}\n\n\t\tconst executable = 'yarn'\n\t\treturn { executable, args }\n\t}\n\n\tpublic async uninstall(pkg: string[] | string) {\n\t\tconst packages = Array.isArray(pkg) ? pkg : [pkg]\n\t\tconst args: string[] = ['uninstall', ...packages]\n\t\tawait this.commandService.execute('npm', {\n\t\t\targs,\n\t\t})\n\n\t\tthis._parsedPkg = undefined\n\n\t\tawait this.install()\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"PkgService.js","names":["PkgService","cwd","commandService","pkg","options","shouldCleanupLockFiles","deleteLockFile","bind","execute","args","totalInstalled","totalSkipped","packages","Array","isArray","toInstall","labsModules","thisPackage","isInstalled","shouldForceInstall","startsWith","push","stripLatest","buildCommandAndArgs","executable","diskUtil","doesDirExist","pathUtil","join","_parsedPkg","undefined","length","get","install","isCi","createRandomTempDir","filter","a","isDev","BasePkgService"],"sources":["../../src/services/PkgService.ts"],"sourcesContent":["import pathUtil from 'path'\nimport {\n\tdiskUtil,\n\tPkgService as BasePkgService,\n} from '@sprucelabs/spruce-skill-utils'\nimport isCi from '../utilities/isCi'\nimport CommandService from './CommandService'\n\nexport interface AddOptions {\n\tisDev?: boolean\n\tshouldForceInstall?: boolean\n\tshouldCleanupLockFiles?: boolean\n}\n\nexport default class PkgService extends BasePkgService {\n\tprivate commandService: CommandService\n\n\tpublic constructor(cwd: string, commandService: CommandService) {\n\t\tsuper(cwd)\n\t\tthis.commandService = commandService\n\t}\n\n\tpublic async install(pkg?: string[] | string, options?: AddOptions) {\n\t\tconst shouldCleanupLockFiles = options?.shouldCleanupLockFiles !== false\n\t\tconst deleteLockFile = shouldCleanupLockFiles\n\t\t\t? this.deleteLockFile.bind(this)\n\t\t\t: () => {}\n\n\t\tif (!pkg) {\n\t\t\tawait this.commandService.execute('yarn', { args: ['install'] })\n\t\t\tdeleteLockFile()\n\t\t\treturn { totalInstalled: -1, totalSkipped: -1 }\n\t\t}\n\n\t\tdeleteLockFile()\n\n\t\tconst packages = Array.isArray(pkg) ? pkg : [pkg]\n\t\tconst toInstall = []\n\t\tconst labsModules: string[] = []\n\n\t\tlet totalInstalled = 0\n\t\tlet totalSkipped = 0\n\n\t\tfor (const thisPackage of packages) {\n\t\t\tconst isInstalled =\n\t\t\t\t!options?.shouldForceInstall && this.isInstalled(thisPackage)\n\t\t\tif (thisPackage.startsWith('@sprucelabs/') || !isInstalled) {\n\t\t\t\ttoInstall.push(this.stripLatest(thisPackage))\n\t\t\t\ttotalInstalled++\n\t\t\t} else {\n\t\t\t\ttotalSkipped++\n\t\t\t}\n\t\t}\n\n\t\tif (totalInstalled > 0) {\n\t\t\tconst { executable, args } = PkgService.buildCommandAndArgs(\n\t\t\t\ttoInstall,\n\t\t\t\toptions\n\t\t\t)\n\n\t\t\tawait this.commandService.execute(executable, {\n\t\t\t\targs,\n\t\t\t})\n\t\t} else if (\n\t\t\t!diskUtil.doesDirExist(pathUtil.join(this.cwd, 'node_modules'))\n\t\t) {\n\t\t\tawait this.commandService.execute('yarn', { args: ['install'] })\n\t\t}\n\n\t\tdeleteLockFile()\n\n\t\tthis._parsedPkg = undefined\n\n\t\treturn { totalInstalled: totalInstalled + labsModules.length, totalSkipped }\n\t}\n\n\tpublic static buildCommandAndArgs(\n\t\ttoInstall: string[],\n\t\toptions: AddOptions | undefined\n\t) {\n\t\tconst args: any[] = [\n\t\t\tisCi() && '--cache-folder',\n\t\t\tisCi() && diskUtil.createRandomTempDir(),\n\t\t\t'add',\n\t\t\t...toInstall,\n\t\t].filter((a) => !!a)\n\n\t\tif (options?.isDev) {\n\t\t\targs.push('-D')\n\t\t}\n\n\t\tconst executable = 'yarn'\n\t\treturn { executable, args }\n\t}\n\n\tpublic getSkillNamespace() {\n\t\treturn this.get('skill.namespace')\n\t}\n\n\tpublic async uninstall(pkg: string[] | string) {\n\t\tconst packages = Array.isArray(pkg) ? pkg : [pkg]\n\t\tconst args: string[] = ['uninstall', ...packages]\n\t\tawait this.commandService.execute('npm', {\n\t\t\targs,\n\t\t})\n\n\t\tthis._parsedPkg = undefined\n\n\t\tawait this.install()\n\t}\n}\n"],"mappings":"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"}

package/build/tests/AbstractCliTest.d.ts

@@ -11,6 +11,7 @@ import ServiceFactory, { Service, ServiceMap } from '../services/ServiceFactory'
 import StoreFactory, { StoreCode, CreateStoreOptions, StoreFactoryOptions, StoreMap } from '../stores/StoreFactory';
 import { ApiClientFactoryOptions } from '../types/apiClient.types';
 import { OptionOverrides } from '../types/cli.types';
+import WriterFactory from '../writers/WriterFactory';
 import CommandFaker from './CommandFaker';
 import FeatureFixture, { FeatureFixtureOptions } from './fixtures/FeatureFixture';
 import MercuryFixture from './fixtures/MercuryFixture';
@@ -18,9 +19,6 @@ import OrganizationFixture from './fixtures/OrganizationFixture';
 import PersonFixture from './fixtures/PersonFixture';
 import SkillFixture from './fixtures/SkillFixture';
 import ViewFixture from './fixtures/ViewFixture';
-declare type ExecuterOptions = Partial<ActionExecuterOptions> & {
-    optionOverrides?: OptionOverrides;
-};
 export default abstract class AbstractCliTest extends AbstractSpruceTest {
     protected static cliRoot: string;
     protected static homeDir: string;
@@ -34,6 +32,7 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
     private static _featureInstaller?;
     private static viewFixture?;
     private static originalEnv;
+    private static _writers?;
     protected static beforeAll(): Promise<void>;
     protected static beforeEach(): Promise<void>;
     protected static afterEach(): Promise<void>;
@@ -53,6 +52,7 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
     protected static getMercuryFixture(): MercuryFixture;
     protected static get people(): PersonFixture;
     protected static getViewFixture(): ViewFixture;
+    protected static get writers(): WriterFactory;
     private static WriterFactory;
     protected static skipInstallSkillPrompts<E extends () => Promise<FeatureActionResponse>>(execute?: E): Promise<E extends undefined ? undefined : FeatureActionResponse>;
     protected static getOrganizationFixture(): OrganizationFixture;
@@ -66,6 +66,7 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
     protected static waitForInput(): Promise<void>;
     protected static assertIsFeatureInstalled(code: FeatureCode): Promise<void>;
     protected static assertValidActionResponseFiles(results: FeatureActionResponse): Promise<void>;
+    protected static assertFilePassesTypeChecks(file: string): Promise<void>;
     protected static connectToApi(options?: ApiClientFactoryOptions): Promise<import("../types/apiClient.types").ApiClient>;
     protected static openInVsCode(options?: {
         file?: string;
@@ -82,4 +83,7 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
     protected static ActionExecuter(options?: ExecuterOptions): ActionExecuter;
     protected static selectOptionBasedOnLabel(label: string): void;
 }
+declare type ExecuterOptions = Partial<ActionExecuterOptions> & {
+    optionOverrides?: OptionOverrides;
+};
 export {};

package/build/tests/AbstractCliTest.js

@@ -104,6 +104,9 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
                 _context2.next = 2;
                 return (0, _get2["default"])((0, _getPrototypeOf2["default"])(AbstractCliTest), "beforeEach", this).call(this);
               case 2:
+                delete this._writers;
+                _ActionFactory["default"].clearActionOverrides();
+
                 //@ts-ignore
                 process.env = _objectSpread({}, this.originalEnv);
                 _test["default"].startLogTimer();
@@ -123,11 +126,11 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
                 _ImportService["default"].clearCache();
                 _SkillStore["default"].clearCurrentSkill();
                 _EventStore["default"].clearCache();
-                _CommandService["default"].clearMockResponses();
+                _CommandService["default"].clearFakedResponses();
                 _mercuryClient.MercuryClientFactory.reset();
                 _mercuryClient.MercuryClientFactory.setIsTestMode(false);
                 this.commandFaker = new _CommandFaker["default"]();
-              case 21:
+              case 23:
               case "end":
                 return _context2.stop();
             }
@@ -170,7 +173,10 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
                 if (_spruceSkillUtils.diskUtil.doesDirExist(this.homeDir) && _test["default"].shouldClearCache()) {
                   _spruceSkillUtils.diskUtil.deleteDir(this.homeDir);
                 }
-              case 11:
+                if (_test["default"].shouldCleanupAfterEach()) {
+                  _FeatureFixture2["default"].deleteOldSkillDirs();
+                }
+              case 12:
               case "end":
                 return _context3.stop();
             }
@@ -193,7 +199,7 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
                 _context4.next = 2;
                 return (0, _get2["default"])((0, _getPrototypeOf2["default"])(AbstractCliTest), "afterAll", this).call(this);
               case 2:
-                if (_test["default"].shouldCleanupTestSkillDirs()) {
+                if (_test["default"].shouldCleanupAfterAll()) {
                   _FeatureFixture2["default"].deleteOldSkillDirs();
                 }
               case 3:
@@ -388,14 +394,21 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
     key: "getViewFixture",
     value: function getViewFixture() {
       if (!this.viewFixture) {
-        var writerFactory = this.WriterFactory();
-        var viewWriter = writerFactory.Writer('view', {
+        var viewWriter = this.writers.Writer('view', {
           fileDescriptions: []
         });
         this.viewFixture = new _ViewFixture["default"](this.cwd, viewWriter, this.Action('view', 'sync'));
       }
       return this.viewFixture;
     }
+  }, {
+    key: "writers",
+    get: function get() {
+      if (!this._writers) {
+        this._writers = this.WriterFactory();
+      }
+      return this._writers;
+    }
   }, {
     key: "WriterFactory",
     value: function WriterFactory() {
@@ -571,7 +584,7 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
     value: function () {
       var _assertValidActionResponseFiles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(results) {
         var _results$files;
-        var _iterator2, _step2, file, checker;
+        var _iterator2, _step2, file;
         return _regenerator["default"].wrap(function _callee11$(_context11) {
           while (1) {
             switch (_context11.prev = _context11.next) {
@@ -581,33 +594,32 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
                 _iterator2.s();
               case 3:
                 if ((_step2 = _iterator2.n()).done) {
-                  _context11.next = 10;
+                  _context11.next = 9;
                   break;
                 }
                 file = _step2.value;
-                checker = this.Service('typeChecker');
-                _context11.next = 8;
-                return checker.check(file.path);
-              case 8:
+                _context11.next = 7;
+                return this.assertFilePassesTypeChecks(file.path);
+              case 7:
                 _context11.next = 3;
                 break;
-              case 10:
-                _context11.next = 15;
+              case 9:
+                _context11.next = 14;
                 break;
-              case 12:
-                _context11.prev = 12;
+              case 11:
+                _context11.prev = 11;
                 _context11.t0 = _context11["catch"](1);
                 _iterator2.e(_context11.t0);
-              case 15:
-                _context11.prev = 15;
+              case 14:
+                _context11.prev = 14;
                 _iterator2.f();
-                return _context11.finish(15);
-              case 18:
+                return _context11.finish(14);
+              case 17:
               case "end":
                 return _context11.stop();
             }
           }
-        }, _callee11, this, [[1, 12, 15, 18]]);
+        }, _callee11, this, [[1, 11, 14, 17]]);
       }));
       function assertValidActionResponseFiles(_x9) {
         return _assertValidActionResponseFiles.apply(this, arguments);
@@ -615,22 +627,46 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
       return assertValidActionResponseFiles;
     }()
   }, {
-    key: "connectToApi",
+    key: "assertFilePassesTypeChecks",
     value: function () {
-      var _connectToApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(options) {
+      var _assertFilePassesTypeChecks = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(file) {
+        var checker;
         return _regenerator["default"].wrap(function _callee12$(_context12) {
           while (1) {
             switch (_context12.prev = _context12.next) {
               case 0:
-                return _context12.abrupt("return", this.getMercuryFixture().connectToApi(options));
-              case 1:
+                checker = this.Service('typeChecker');
+                _context12.next = 3;
+                return checker.check(file);
+              case 3:
               case "end":
                 return _context12.stop();
             }
           }
         }, _callee12, this);
       }));
-      function connectToApi(_x10) {
+      function assertFilePassesTypeChecks(_x10) {
+        return _assertFilePassesTypeChecks.apply(this, arguments);
+      }
+      return assertFilePassesTypeChecks;
+    }()
+  }, {
+    key: "connectToApi",
+    value: function () {
+      var _connectToApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(options) {
+        return _regenerator["default"].wrap(function _callee13$(_context13) {
+          while (1) {
+            switch (_context13.prev = _context13.next) {
+              case 0:
+                return _context13.abrupt("return", this.getMercuryFixture().connectToApi(options));
+              case 1:
+              case "end":
+                return _context13.stop();
+            }
+          }
+        }, _callee13, this);
+      }));
+      function connectToApi(_x11) {
         return _connectToApi.apply(this, arguments);
       }
       return connectToApi;
@@ -638,30 +674,30 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
   }, {
     key: "openInVsCode",
     value: function () {
-      var _openInVsCode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(options) {
+      var _openInVsCode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14(options) {
         var _ref, _options$file, _options$timeout;
-        return _regenerator["default"].wrap(function _callee13$(_context13) {
+        return _regenerator["default"].wrap(function _callee14$(_context14) {
           while (1) {
-            switch (_context13.prev = _context13.next) {
+            switch (_context14.prev = _context14.next) {
               case 0:
-                _context13.next = 2;
+                _context14.next = 2;
                 return this.Action('vscode', 'setup').execute({
                   all: true
                 });
               case 2:
-                _context13.next = 4;
+                _context14.next = 4;
                 return this.Service('command').execute("code ".concat((_ref = (_options$file = options === null || options === void 0 ? void 0 : options.file) !== null && _options$file !== void 0 ? _options$file : options === null || options === void 0 ? void 0 : options.dir) !== null && _ref !== void 0 ? _ref : this.cwd));
               case 4:
-                _context13.next = 6;
+                _context14.next = 6;
                 return this.wait((_options$timeout = options === null || options === void 0 ? void 0 : options.timeout) !== null && _options$timeout !== void 0 ? _options$timeout : 99999999);
               case 6:
               case "end":
-                return _context13.stop();
+                return _context14.stop();
             }
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
-      function openInVsCode(_x11) {
+      function openInVsCode(_x12) {
         return _openInVsCode.apply(this, arguments);
       }
       return openInVsCode;
@@ -669,25 +705,25 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
   }, {
     key: "openInFinder",
     value: function () {
-      var _openInFinder = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14(options) {
+      var _openInFinder = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(options) {
         var _ref2, _options$file2, _options$timeout2;
-        return _regenerator["default"].wrap(function _callee14$(_context14) {
+        return _regenerator["default"].wrap(function _callee15$(_context15) {
           while (1) {
-            switch (_context14.prev = _context14.next) {
+            switch (_context15.prev = _context15.next) {
               case 0:
-                _context14.next = 2;
+                _context15.next = 2;
                 return this.Service('command').execute("open ".concat((_ref2 = (_options$file2 = options === null || options === void 0 ? void 0 : options.file) !== null && _options$file2 !== void 0 ? _options$file2 : options === null || options === void 0 ? void 0 : options.dir) !== null && _ref2 !== void 0 ? _ref2 : this.cwd));
               case 2:
-                _context14.next = 4;
+                _context15.next = 4;
                 return this.wait((_options$timeout2 = options === null || options === void 0 ? void 0 : options.timeout) !== null && _options$timeout2 !== void 0 ? _options$timeout2 : 99999999);
               case 4:
               case "end":
-                return _context14.stop();
+                return _context15.stop();
             }
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
-      function openInFinder(_x12) {
+      function openInFinder(_x13) {
         return _openInFinder.apply(this, arguments);
       }
       return openInFinder;
@@ -718,9 +754,8 @@ var AbstractCliTest = /*#__PURE__*/function (_AbstractSpruceTest) {
     value: function ActionExecuter(options) {
       var _this = this;
       var serviceFactory = this.ServiceFactory();
-      var writerFactory = this.WriterFactory();
       var actionFactory = new _ActionFactory["default"]({
-        writerFactory: writerFactory,
+        writerFactory: this.writers,
         ui: this.ui,
         emitter: this.emitter,
         apiClientFactory: this.getMercuryFixture().getApiClientFactory(),
@@ -773,4 +808,5 @@ exports["default"] = AbstractCliTest;
 (0, _defineProperty2["default"])(AbstractCliTest, "_featureInstaller", void 0);
 (0, _defineProperty2["default"])(AbstractCliTest, "viewFixture", void 0);
 (0, _defineProperty2["default"])(AbstractCliTest, "originalEnv", void 0);
+(0, _defineProperty2["default"])(AbstractCliTest, "_writers", void 0);
 //# sourceMappingURL=AbstractCliTest.js.map