@sprucelabs/spruce-cli 14.21.9 → 14.21.13

package/build/types/graphicsInterface.types.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "GraphicsInterface", {
+  enumerable: true,
+  get: function get() {
+    return _spruceSkillUtils.GraphicsInterface;
+  }
+});
 Object.defineProperty(exports, "GraphicsTextEffect", {
   enumerable: true,
   get: function get() {
@@ -27,12 +33,6 @@ Object.defineProperty(exports, "ProgressBarUpdateOptions", {
     return _spruceSkillUtils.ProgressBarUpdateOptions;
   }
 });
-Object.defineProperty(exports, "GraphicsInterface", {
-  enumerable: true,
-  get: function get() {
-    return _spruceSkillUtils.GraphicsInterface;
-  }
-});
 
 var _spruceSkillUtils = require("@sprucelabs/spruce-skill-utils");
 //# sourceMappingURL=graphicsInterface.types.js.map

package/build/widgets/types/factory.types.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.contractRegistry = exports.widgetRegistry = void 0;
+exports.widgetRegistry = exports.contractRegistry = void 0;
 
 var _TKButtonWidget = _interopRequireDefault(require("../terminalKit/TKButtonWidget"));
 

package/package.json

@@ -17,7 +17,7 @@
     ]
   },
   "license": "MIT",
-  "version": "14.21.9",
+  "version": "14.21.13",
   "bin": {
     "spruce": "./build/index.js"
   },
@@ -72,40 +72,40 @@
   },
   "dependencies": {
     "@babel/cli": "^7.15.7",
-    "@babel/plugin-proposal-decorators": "^7.15.4",
+    "@babel/plugin-proposal-decorators": "^7.15.8",
     "@babel/runtime": "^7.15.4",
-    "@jest/reporters": "^27.2.4",
-    "@sprucelabs/error": "^5.0.194",
-    "@sprucelabs/heartwood-view-controllers": "^33.0.463",
-    "@sprucelabs/jest-json-reporter": "^6.0.174",
-    "@sprucelabs/mercury-client": "^16.10.162",
-    "@sprucelabs/mercury-event-emitter": "^16.10.162",
-    "@sprucelabs/mercury-types": "^26.1.299",
-    "@sprucelabs/schema": "^25.3.241",
-    "@sprucelabs/spruce-core-schemas": "^22.5.307",
-    "@sprucelabs/spruce-event-plugin": "^5.4.124",
-    "@sprucelabs/spruce-event-utils": "^16.0.333",
-    "@sprucelabs/spruce-skill-booter": "^5.4.124",
-    "@sprucelabs/spruce-skill-utils": "^20.6.176",
-    "@sprucelabs/spruce-templates": "^14.21.9",
+    "@jest/reporters": "^27.2.5",
+    "@sprucelabs/error": "^5.0.215",
+    "@sprucelabs/heartwood-view-controllers": "^33.0.540",
+    "@sprucelabs/jest-json-reporter": "^6.0.192",
+    "@sprucelabs/mercury-client": "^16.11.7",
+    "@sprucelabs/mercury-event-emitter": "^16.11.7",
+    "@sprucelabs/mercury-types": "^26.1.336",
+    "@sprucelabs/schema": "^25.3.269",
+    "@sprucelabs/spruce-core-schemas": "^22.5.337",
+    "@sprucelabs/spruce-event-plugin": "^5.4.133",
+    "@sprucelabs/spruce-event-utils": "^16.0.373",
+    "@sprucelabs/spruce-skill-booter": "^5.4.133",
+    "@sprucelabs/spruce-skill-utils": "^20.6.207",
+    "@sprucelabs/spruce-templates": "^14.21.13",
     "cfonts": "^2.10.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "cli-table3": "^0.6.0",
     "commander": "^7.2.0",
-    "core-js": "^3.18.1",
+    "core-js": "^3.18.2",
     "emphasize": "^4.2.0",
     "fs-extra": "^10.0.0",
     "gifwrap": "SimenB/gifwrap#patch-1",
     "globby": "^11.0.4",
     "inflection": "^1.13.1",
-    "inquirer": "^8.1.5",
+    "inquirer": "^8.2.0",
     "inquirer-file-tree-selection-prompt": "^1.0.12",
     "js-tetris-cli": "^0.0.3",
     "jsonwebtoken": "^8.5.1",
     "lodash-es": "^4.17.21",
     "md5": "^2.3.0",
-    "open": "^8.2.1",
+    "open": "^8.3.0",
     "ora": "^5.4.1",
     "semver": "^7.3.5",
     "string-argv": "^0.3.1",
@@ -116,18 +116,18 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@sprucelabs/data-stores": "^6.1.215",
-    "@sprucelabs/jest-sheets-reporter": "^1.2.184",
-    "@sprucelabs/mercury-core-events": "^1.2.340",
-    "@sprucelabs/resolve-path-aliases": "^1.0.196",
-    "@sprucelabs/spruce-conversation-plugin": "^5.4.124",
-    "@sprucelabs/spruce-deploy-plugin": "^5.4.124",
-    "@sprucelabs/spruce-store-plugin": "^5.4.124",
-    "@sprucelabs/spruce-test-fixtures": "^5.4.124",
-    "@sprucelabs/test": "^7.7.175",
-    "@sprucelabs/test-utils": "^3.0.160",
+    "@sprucelabs/data-stores": "^6.1.251",
+    "@sprucelabs/jest-sheets-reporter": "^1.2.201",
+    "@sprucelabs/mercury-core-events": "^1.2.406",
+    "@sprucelabs/resolve-path-aliases": "^1.0.209",
+    "@sprucelabs/spruce-conversation-plugin": "^5.4.133",
+    "@sprucelabs/spruce-deploy-plugin": "^5.4.133",
+    "@sprucelabs/spruce-store-plugin": "^5.4.133",
+    "@sprucelabs/spruce-test-fixtures": "^5.4.133",
+    "@sprucelabs/test": "^7.7.192",
+    "@sprucelabs/test-utils": "^3.0.181",
     "@types/blessed": "^0.1.19",
-    "@types/eslint": "^7.28.0",
+    "@types/eslint": "^7.28.1",
     "@types/fs-extra": "^9.0.13",
     "@types/inflection": "^1.13.0",
     "@types/inquirer": "^8.1.3",
@@ -135,7 +135,7 @@
     "@types/lodash": "^4.14.175",
     "@types/md5": "^2.3.1",
     "@types/mkdirp": "^1.0.2",
-    "@types/node": "^16.10.2",
+    "@types/node": "^16.10.3",
     "@types/promise.allsettled": "^1.0.3",
     "@types/ps-node": "^0.1.1",
     "@types/rimraf": "^3.0.2",
@@ -149,12 +149,12 @@
     "concurrently": "^6.3.0",
     "conventional-changelog-sprucelabs": "^1.1.2",
     "dotenv": "^10.0.0",
-    "eslint": "^7.32.0",
-    "eslint-config-spruce": "^10.10.13",
+    "eslint": "^8.0.0",
+    "eslint-config-spruce": "^10.10.14",
     "find-process": "^1.4.5",
-    "jest": "^27.2.4",
-    "jest-circus": "^27.2.4",
-    "jest-junit": "^12.3.0",
+    "jest": "^27.2.5",
+    "jest-circus": "^27.2.5",
+    "jest-junit": "^13.0.0",
     "jest-reporters": "^0.0.2",
     "prettier": "^2.4.1",
     "ps-node": "^0.1.6",
@@ -569,7 +569,8 @@
             "upgradingSkillSyncsEvents": "I251",
             "upgradeCallsUpdateDependencies": "I252",
             "canAlwaysSkipFiles": "I264",
-            "upgradingWritesExpectedFiles": "I289"
+            "upgradingWritesExpectedFiles": "I289",
+            "globalEmitterEmitsSEquentally": "I328"
           }
         }
       ],
@@ -590,5 +591,5 @@
       "ora"
     ]
   },
-  "gitHead": "a6141ff3e87fed55939251a7d21fa97af4f729dc"
+  "gitHead": "e3bf627c9f60f4731dff4dbb10bff6766fffdc3f"
 }

package/src/GlobalEmitter.ts

@@ -168,6 +168,8 @@ export type GlobalEmitter = MercuryEventEmitter<GlobalEventContract>
 
 export default class CliGlobalEmitter extends AbstractEventEmitter<GlobalEventContract> {
 	public static Emitter() {
-		return new CliGlobalEmitter(globalContract) as GlobalEmitter
+		return new CliGlobalEmitter(globalContract, {
+			shouldEmitSequentally: true,
+		}) as GlobalEmitter
 	}
 }

package/src/__tests__/behavioral/SettingLogTransportsInASkill.test.ts

@@ -69,8 +69,8 @@ export default class SettingLogTransportsInASkillTest extends AbstractSkillTest
 		`
 
 		await this.createTransportWithContents(transportContents, 'File')
-
 		await this.Service('build').build()
+
 		const boot = await this.Action('skill', 'boot').execute({})
 
 		await boot.meta?.kill()

package/src/__tests__/behavioral/WatchingSkillViews.test.ts

@@ -195,6 +195,7 @@ export default class WatchingSkillViewsTest extends AbstractSkillTest {
 		})
 
 		await this.Action('view', 'sync').execute({})
+
 		await this.Service('build').build()
 
 		const watchAction = this.Action('view', 'watch') as WatchAction

package/src/__tests__/behavioral/events/CreatingAListener.test.ts

@@ -194,6 +194,12 @@ export default class CreatingAListenerTest extends AbstractEventTest {
 				}
 			)
 
+		const currentClient = await this.connectToApi({
+			shouldAuthAsCurrentSkill: true,
+		})
+
+		await currentClient.disconnect()
+
 		const boot = await this.Action('skill', 'boot').execute({ local: true })
 
 		assert.isFalsy(boot.errors)

package/src/__tests__/implementation/GlobalEmitter.ts

@@ -0,0 +1,12 @@
+import { test, assert } from '@sprucelabs/test'
+import AbstractCliTest from '../../tests/AbstractCliTest'
+
+export default class GlobalEmitterTest extends AbstractCliTest {
+	@test()
+	protected static async globalEmitterEmitsSEquentally() {
+		const emitter = this.getEmitter()
+
+		//@ts-ignore
+		assert.isTrue(emitter.shouldEmitSequentally)
+	}
+}

package/src/__tests__/testDirsAndFiles/mercury-types-package.json

@@ -58,8 +58,8 @@
         "chokidar-cli": "^2.1.0",
         "concurrently": "^5.3.0",
         "conventional-changelog-sprucelabs": "^1.1.2",
-        "eslint": "^7.14.0",
-        "eslint-config-spruce": "10.9.135",
+        "eslint": "^8.0.0",
+        "eslint-config-spruce": "^10.10.14",
         "jest": "^26.6.3",
         "jest-circus": "^26.6.3",
         "prettier": "^2.2.0",

package/src/errors/SpruceError.ts

@@ -69,6 +69,13 @@ export default class SpruceError extends AbstractSpruceError<ErrorOptions> {
 
 			case 'LINT_FAILED':
 				message = `Lint failed on pattern ${options.pattern}.`
+
+				if (options.originalError) {
+					message += `\n\nOriginal error:${
+						options.originalError.stack ?? options.originalError.message
+					}`
+				}
+
 				break
 
 			case 'EXECUTING_COMMAND_FAILED':

package/src/features/test/TestReporter.ts

@@ -219,7 +219,7 @@ export default class TestReporter {
 	private updateOrientation() {
 		const frame = this.window.getFrame()
 
-		if (frame.width * 0.6 > frame.height) {
+		if (frame.width * 0.5 > frame.height) {
 			this.orientation = 'landscape'
 		} else {
 			this.orientation = 'portrait'

package/src/features/vscode/actions/SetupAction.ts

@@ -131,6 +131,7 @@ export default class SetupAction extends AbstractAction<OptionsSchema> {
 
 		for (const module of this.dependencies) {
 			if (!pkg.isInstalled(module.name)) {
+				// eslint-disable-next-line @typescript-eslint/no-extra-semi
 				;(response.packagesInstalled ?? []).push(module)
 			}
 		}

package/src/services/LintService.ts

@@ -1,4 +1,3 @@
-// import { CLIEngine } from 'eslint'
 import { SchemaError } from '@sprucelabs/schema'
 import fs from 'fs-extra'
 import SpruceError from '../errors/SpruceError'
@@ -24,11 +23,10 @@ export default class LintService {
 		let fixedFiles: any = {}
 		const fixedPaths: string[] = []
 		try {
+			const script = `"(async function lint() { try { const { ESLint } = require('eslint'); const cli = new ESLint({ fix: true, cwd: '${this.cwd}', }); const result = await cli.lintFiles(['${pattern}']); console.log(JSON.stringify(result)); } catch (err) { console.log(err.toString()); }})()"`
+
 			const { stdout } = await this.command.execute('node', {
-				args: [
-					'-e',
-					`"try { const ESLint = require('eslint');const cli = new ESLint.CLIEngine({fix: true,cwd: '${this.cwd}'});const result=cli.executeOnFiles(['${pattern}']);console.log(JSON.stringify(result)); } catch(err) { console.log(err.toString()); }"`,
-				],
+				args: ['-e', script],
 			})
 
 			fixedFiles = JSON.parse(stdout)
@@ -40,9 +38,9 @@ export default class LintService {
 			})
 		}
 
-		if (fixedFiles.results) {
-			for (let i = 0; i < fixedFiles.results.length; i += 1) {
-				const fixedFile = fixedFiles.results[i]
+		if (fixedFiles) {
+			for (let i = 0; i < fixedFiles.length; i += 1) {
+				const fixedFile = fixedFiles[i]
 				if (fixedFile && fixedFile.output) {
 					await fs.writeFile(fixedFile.filePath, fixedFile.output)
 					fixedPaths.push(fixedFile.filePath)