@sprucelabs/spruce-cli 19.1.39 → 19.1.41

package/package.json

@@ -17,7 +17,7 @@
     ]
   },
   "license": "MIT",
-  "version": "19.1.39",
+  "version": "19.1.41",
   "bin": {
     "spruce": "./build/index.js"
   },
@@ -71,27 +71,27 @@
     "watch.tsc": "tsc -w --sourceMap"
   },
   "dependencies": {
-    "@babel/cli": "^7.23.4",
-    "@babel/plugin-proposal-decorators": "^7.23.7",
-    "@babel/runtime": "^7.23.7",
+    "@babel/cli": "^7.23.9",
+    "@babel/plugin-proposal-decorators": "^7.23.9",
+    "@babel/runtime": "^7.23.9",
     "@jest/reporters": "^29.7.0",
-    "@sprucelabs/error": "^5.1.57",
+    "@sprucelabs/error": "^5.1.63",
     "@sprucelabs/globby": "^1.0.6",
-    "@sprucelabs/heartwood-view-controllers": "^108.33.11",
-    "@sprucelabs/jest-json-reporter": "^7.0.140",
-    "@sprucelabs/mercury-client": "^41.0.197",
-    "@sprucelabs/mercury-event-emitter": "^41.0.197",
-    "@sprucelabs/mercury-types": "^46.0.168",
-    "@sprucelabs/schema": "^29.3.8",
-    "@sprucelabs/spruce-core-schemas": "^39.0.173",
-    "@sprucelabs/spruce-event-utils": "^38.0.199",
-    "@sprucelabs/spruce-skill-utils": "^30.1.59",
-    "@sprucelabs/spruce-templates": "^19.1.39",
+    "@sprucelabs/heartwood-view-controllers": "^108.40.75",
+    "@sprucelabs/jest-json-reporter": "^7.0.164",
+    "@sprucelabs/mercury-client": "^41.0.269",
+    "@sprucelabs/mercury-event-emitter": "^41.0.269",
+    "@sprucelabs/mercury-types": "^46.0.213",
+    "@sprucelabs/schema": "^29.3.11",
+    "@sprucelabs/spruce-core-schemas": "^39.0.218",
+    "@sprucelabs/spruce-event-utils": "^38.0.252",
+    "@sprucelabs/spruce-skill-utils": "^30.1.93",
+    "@sprucelabs/spruce-templates": "^19.1.41",
     "@typescript-eslint/eslint-plugin": "^5.27.1",
     "@typescript-eslint/parser": "^5.27.1",
     "cfonts": "^3.2.0",
     "chalk": "4.1.2",
-    "chokidar": "^3.5.3",
+    "chokidar": "^3.6.0",
     "cli-table3": "^0.6.3",
     "commander": "7.2.0",
     "emphasize": "4.2.0",
@@ -103,7 +103,7 @@
     "md5": "^2.3.0",
     "open": "^8.4.2",
     "ora": "5.4.1",
-    "semver": "^7.5.4",
+    "semver": "^7.6.0",
     "string-argv": "^0.3.2",
     "terminal-image": "1.2.1",
     "terminal-kit": "sprucelabsai/terminal-kit",
@@ -113,35 +113,35 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sprucelabs/data-stores": "^26.4.7",
+    "@sprucelabs/data-stores": "^26.4.13",
     "@sprucelabs/jest-sheets-reporter": "^3.0.26",
-    "@sprucelabs/mercury-core-events": "^22.1.7",
-    "@sprucelabs/resolve-path-aliases": "^1.1.275",
-    "@sprucelabs/spruce-conversation-plugin": "^60.1.146",
-    "@sprucelabs/spruce-deploy-plugin": "^60.1.146",
-    "@sprucelabs/spruce-store-plugin": "^60.1.146",
-    "@sprucelabs/spruce-test-fixtures": "^60.1.146",
-    "@sprucelabs/test": "^8.0.39",
-    "@sprucelabs/test-utils": "^4.0.94",
+    "@sprucelabs/mercury-core-events": "^22.1.73",
+    "@sprucelabs/resolve-path-aliases": "^1.1.281",
+    "@sprucelabs/spruce-conversation-plugin": "^60.1.226",
+    "@sprucelabs/spruce-deploy-plugin": "^60.1.226",
+    "@sprucelabs/spruce-store-plugin": "^60.1.226",
+    "@sprucelabs/spruce-test-fixtures": "^60.1.226",
+    "@sprucelabs/test": "^8.0.40",
+    "@sprucelabs/test-utils": "^4.0.98",
     "@types/blessed": "^0.1.25",
-    "@types/eslint": "^8.56.1",
+    "@types/eslint": "^8.56.2",
     "@types/fs-extra": "^11.0.4",
     "@types/inquirer": "^8.2.1",
     "@types/lodash": "^4.14.202",
     "@types/md5": "^2.3.5",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.17",
     "@types/promise.allsettled": "^1.0.6",
     "@types/ps-node": "^0.1.3",
-    "@types/semver": "^7.5.6",
+    "@types/semver": "^7.5.7",
     "@types/sha1": "^1.1.5",
     "@types/slug": "^5.0.7",
-    "@types/superagent": "^8.1.1",
+    "@types/superagent": "^8.1.3",
     "@types/terminal-kit": "^2.5.6",
-    "@types/uuid": "^9.0.7",
+    "@types/uuid": "^9.0.8",
     "chokidar-cli": "^3.0.0",
     "concurrently": "^8.2.2",
     "conventional-changelog-sprucelabs": "^1.1.2",
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.4.2",
     "eslint": "^8.56.0",
     "eslint-config-spruce": "^10.13.6",
     "find-process": "^1.4.7",
@@ -151,7 +151,7 @@
     "jest-reporters": "^0.0.2",
     "prettier": "^3.0.3",
     "ps-node": "^0.1.6",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "tsc-watch": "^6.0.4",
     "tsconfig-paths": "^4.2.0"
@@ -590,5 +590,5 @@
       "terminal-kit"
     ]
   },
-  "gitHead": "85a324d4fa3619b5302a882e63ad877c02b36c16"
+  "gitHead": "dcb02ceb1d080025175c3680cbde3b6f3ee68d71"
 }

package/src/__tests__/behavioral/skill/RegisteringASkill.test.ts

@@ -31,6 +31,9 @@ export default class RegisteringASkillTest extends AbstractCliTest {
 	protected static async returnsErrorWhenRegistrationFails() {
 		MercuryClientFactory.setIsTestMode(true)
 
+		await this.eventFaker.fakeRequestPin()
+		await this.eventFaker.fakeConfirmPin()
+
 		await this.people.loginAsDemoPerson()
 		await this.FeatureFixture().installCachedFeatures('skills')
 		const slug = `my-new-skill-${new Date().getTime()}`

package/src/__tests__/behavioral/upgrading/UpgradingASkill5.test.ts

@@ -1,15 +1,25 @@
+import { Schema } from '@sprucelabs/schema'
 import { test, assert } from '@sprucelabs/test-utils'
+import ActionFactory from '../../../features/ActionFactory'
+import { FeatureAction } from '../../../features/features.types'
 import CommandService from '../../../services/CommandService'
+import LintService from '../../../services/LintService'
+import ServiceFactory from '../../../services/ServiceFactory'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
 
 export default class UpgradingASkill5Test extends AbstractCliTest {
+	public static invocationLog: string[] = []
+
+	protected static async beforeEach() {
+		await super.beforeEach()
+		this.invocationLog = []
+	}
+
 	@test()
 	protected static async upgradeResetsEventCache() {
 		await this.installSetListenerCacheAndBlockExecute()
 
-		await assert.doesThrowAsync(() =>
-			this.Action('node', 'upgrade').execute({})
-		)
+		await assert.doesThrowAsync(() => this.upgrade())
 
 		const value = this.Settings().getListenerCache()
 		assert.isFalsy(value)
@@ -60,14 +70,14 @@ export default class UpgradingASkill5Test extends AbstractCliTest {
 			return {}
 		})
 
-		await this.Action('node', 'upgrade').execute({})
+		await this.upgrade()
 
 		assert.isTrue(wasHit === shouldCreateSchema)
 	}
 
 	@test()
 	protected static async modulesMovedFromDevToProdDependenciesStayThere() {
-		await this.FeatureFixture().installCachedFeatures('skills')
+		await this.installSkillsBuild()
 
 		await this.moveDependencyToProd('@sprucelabs/resolve-path-aliases')
 		await this.moveDependencyToDev('@sprucelabs/error')
@@ -92,12 +102,49 @@ export default class UpgradingASkill5Test extends AbstractCliTest {
 			},
 		})
 
-		await this.Action('node', 'upgrade').execute({})
+		await this.upgrade()
 
 		assert.isFalse(wasMovedBackToDev, 'dependency moved back to dev')
 		assert.isFalse(wasMovedBackToProd, 'dependency moved back to prod')
 	}
 
+	@test()
+	protected static async runsFixLintAfterUpgrade() {
+		ActionFactory.setActionClass(
+			'node',
+			'updateDependencies',
+			SpyUpdateDependenciesAction
+		)
+
+		ServiceFactory.setFactoryClass('lint', SpyLintService)
+
+		CommandService.fakeCommand(/.*/gi, {
+			code: 0,
+			callback: (command, args) => {
+				this.invocationLog.push([command, ...args].join(' '))
+			},
+		})
+
+		await this.installSkillsBuild()
+		await this.upgrade()
+
+		assert.isEqualDeep(this.invocationLog, [
+			'which code',
+			'updateDependencies',
+			'yarn fix.lint',
+			'yarn clean.build',
+			'yarn build.dev',
+		])
+	}
+
+	private static async upgrade() {
+		await this.Action('node', 'upgrade').execute({})
+	}
+
+	private static async installSkillsBuild() {
+		await this.FeatureFixture().installCachedFeatures('skills')
+	}
+
 	private static async moveDependencyToDev(name: string) {
 		const pkg = this.Service('pkg')
 		await pkg.uninstall(name)
@@ -126,3 +173,22 @@ export default class UpgradingASkill5Test extends AbstractCliTest {
 		return this.Service('eventSettings')
 	}
 }
+
+class SpyUpdateDependenciesAction implements FeatureAction {
+	public optionsSchema?: Schema | undefined
+	public commandAliases: string[] = []
+	public invocationMessage: string = 'Nothing'
+	public async execute() {
+		UpgradingASkill5Test.invocationLog.push('updateDependencies')
+		return {}
+	}
+}
+
+class SpyLintService extends LintService {
+	public static fixPattern: string
+	public fix = async (pattern: string): Promise<string[]> => {
+		SpyLintService.fixPattern = pattern
+		UpgradingASkill5Test.invocationLog.push('fixLint')
+		return []
+	}
+}

package/src/__tests__/support/EventFaker.ts

@@ -1,5 +1,6 @@
 import { SpruceSchemas } from '@sprucelabs/mercury-types'
 import { eventFaker } from '@sprucelabs/spruce-test-fixtures'
+import { generateId } from '@sprucelabs/test-utils'
 import { ListPermContractsTargetAndPayload } from '../../features/permission/stores/PermissionStore'
 
 export default class EventFaker {
@@ -19,4 +20,25 @@ export default class EventFaker {
 			}
 		)
 	}
+
+	public async fakeRequestPin() {
+		await eventFaker.on('request-pin::v2020_12_25', () => {
+			return {
+				challenge: generateId(),
+			}
+		})
+	}
+
+	public async fakeConfirmPin() {
+		await eventFaker.on('confirm-pin::v2020_12_25', () => {
+			return {
+				token: generateId(),
+				person: {
+					id: generateId(),
+					casualName: generateId(),
+					dateCreated: 0,
+				},
+			}
+		})
+	}
 }

package/src/components/FormComponent.ts

@@ -155,8 +155,9 @@ export default class FormComponent<S extends Schema> extends SchemaEntity<S> {
 
 	/** Ask a question based on a field */
 	public askQuestion<F extends SchemaFieldNames<S>>(fieldName: F) {
-		const field = this.getNamedFields().find((nf) => nf.name === fieldName)
-			?.field
+		const field = this.getNamedFields().find(
+			(nf) => nf.name === fieldName
+		)?.field
 
 		if (!field) {
 			throw new Error(`No field named ${fieldName} on form ${this.schemaId}`)

package/src/features/ActionFactory.ts

@@ -9,7 +9,6 @@ import {
 } from '../features/features.types'
 import { GlobalEmitter } from '../GlobalEmitter'
 import { BlockedCommands, OptionOverrides } from '../types/cli.types'
-import AbstractAction from './AbstractAction'
 import ActionExecuter from './ActionExecuter'
 import FeatureInstaller from './FeatureInstaller'
 import OverrideActionDecorator from './OverrideActionDecorator'
@@ -44,7 +43,7 @@ export default class ActionFactory {
 			)
 		}
 
-		let Class: new (options: ActionOptions) => AbstractAction | undefined
+		let Class: new (options: ActionOptions) => FeatureAction | undefined
 		let originalError: Error | undefined
 
 		const key = ActionFactory.overrideKey(featureCode, actionCode)
@@ -133,4 +132,4 @@ export interface FeatureActionFactoryOptions
 	optionOverrides?: OptionOverrides
 }
 
-type ActionConstructor = new (options: ActionOptions) => AbstractAction
+type ActionConstructor = new (options: ActionOptions) => FeatureAction

package/src/features/node/actions/UpgradeAction.ts

@@ -40,6 +40,8 @@ export default class UpgradeAction extends AbstractAction<OptionsSchema> {
 
 			const dependencyResults = await this.reInstallPackageDependencies()
 
+			await this.Service('command').execute('yarn fix.lint')
+
 			return actionUtil.mergeActionResults(dependencyResults, {
 				headline: 'Upgrade',
 				files,

package/src/features/test/TestReporter.ts

@@ -633,8 +633,8 @@ export default class TestReporter {
 					columns: [{ id: 'errors', width: '100%' }],
 				})
 
-				this.bottomLayout.setRowHeight(0, '50%')
-				this.bottomLayout.setRowHeight(1, '50%')
+				this.bottomLayout.setRowHeight(0, '60%')
+				this.bottomLayout.setRowHeight(1, '40%')
 			} else {
 				this.bottomLayout.addColumn(0, { id: 'errors', width: '50%' })
 				this.bottomLayout.setColumnWidth({

package/src/features/watch/WatchFeature.ts

@@ -60,12 +60,9 @@ export default class WatchFeature extends AbstractFeature {
 					clearTimeout(this.timeoutId)
 				}
 
-				this.timeoutId = setTimeout(
-					async () => {
-						await this.fireChange()
-					},
-					options?.delay ?? 500
-				)
+				this.timeoutId = setTimeout(async () => {
+					await this.fireChange()
+				}, options?.delay ?? 500)
 			}
 		})
 	}

package/src/services/ServiceFactory.ts

@@ -16,30 +16,14 @@ import LintService from './LintService'
 import PkgService from './PkgService'
 import TypeCheckerService from './TypeCheckerService'
 
-export interface ServiceMap {
-	pkg: PkgService
-	vsCode: VsCodeService
-	schema: SchemaService
-	lint: LintService
-	command: CommandService
-	typeChecker: TypeCheckerService
-	import: ImportService
-	build: BuildService
-	settings: SettingsService
-	env: EnvService
-	auth: AuthService
-	remote: RemoteService
-	eventSettings: EventSettingsService
-	dependency: DependencyService
-}
-
-export type Service = keyof ServiceMap
-
-export interface ServiceProvider {
-	Service<S extends Service>(type: S, cwd?: string): ServiceMap[S]
-}
 export default class ServiceFactory {
+	public static serviceClassOverides: Record<string, any> = {}
+
 	public Service<S extends Service>(cwd: string, type: S): ServiceMap[S] {
+		if (ServiceFactory.serviceClassOverides[type]) {
+			return new ServiceFactory.serviceClassOverides[type](cwd) as ServiceMap[S]
+		}
+
 		switch (type) {
 			case 'auth':
 				return AuthService.Auth(cwd) as ServiceMap[S]
@@ -100,4 +84,35 @@ export default class ServiceFactory {
 			command: new CommandService(cwd),
 		})
 	}
+
+	public static reset() {
+		this.serviceClassOverides = {}
+	}
+
+	public static setFactoryClass(name: string, Class: any) {
+		this.serviceClassOverides[name] = Class
+	}
+}
+
+export interface ServiceMap {
+	pkg: PkgService
+	vsCode: VsCodeService
+	schema: SchemaService
+	lint: LintService
+	command: CommandService
+	typeChecker: TypeCheckerService
+	import: ImportService
+	build: BuildService
+	settings: SettingsService
+	env: EnvService
+	auth: AuthService
+	remote: RemoteService
+	eventSettings: EventSettingsService
+	dependency: DependencyService
+}
+
+export type Service = keyof ServiceMap
+
+export interface ServiceProvider {
+	Service<S extends Service>(type: S, cwd?: string): ServiceMap[S]
 }

package/src/stores/AbstractStore.ts

@@ -49,6 +49,7 @@ interface AbstractStoreOptions {
 
 export type StoreOptions<
 	Options extends Record<string, any> | undefined = undefined,
-> = Options extends Record<string, any>
-	? AbstractStoreOptions & Options
-	: AbstractStoreOptions
+> =
+	Options extends Record<string, any>
+		? AbstractStoreOptions & Options
+		: AbstractStoreOptions

package/src/tests/AbstractCliTest.ts

@@ -7,6 +7,7 @@ import { templates } from '@sprucelabs/spruce-templates'
 import AbstractSpruceTest, { assert } from '@sprucelabs/test-utils'
 import fs from 'fs-extra'
 import * as uuid from 'uuid'
+import EventFaker from '../__tests__/support/EventFaker'
 import AbstractAction from '../features/AbstractAction'
 import { FeatureOptions } from '../features/AbstractFeature'
 import ActionExecuter, {
@@ -60,16 +61,20 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
 	private static viewFixture?: ViewFixture
 	private static originalEnv: { [x: string]: string | undefined }
 	private static _writers?: WriterFactory
+	protected static eventFaker: EventFaker
 
 	protected static async beforeAll() {
 		await super.beforeAll()
 		await this.cleanTestDirsAndFiles()
 
 		LintService.disableLinting()
+		ServiceFactory.reset()
 
 		ImportService.setCacheDir(diskUtil.createRandomTempDir())
 		ImportService.enableCaching()
 
+		this.eventFaker = new EventFaker()
+
 		process.env.ENABLE_INSTALL_ENTERTAINMENT = 'false'
 
 		this.originalEnv = { ...process.env }