@sprucelabs/spruce-cli 14.26.16 → 14.27.0

package/src/features/AbstractAction.ts

@@ -1,6 +1,5 @@
 import { Schema, SchemaValues, SchemaPartialValues } from '@sprucelabs/schema'
 import { versionUtil } from '@sprucelabs/spruce-skill-utils'
-import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { Templates } from '@sprucelabs/spruce-templates'
 import { GlobalEmitter } from '../GlobalEmitter'
 import ServiceFactory, {
@@ -132,9 +131,7 @@ export default abstract class AbstractAction<S extends Schema = Schema>
 		resolvedDestination: string,
 		fallbackVersion: string
 	) {
-		const versions = diskUtil.doesDirExist(resolvedDestination)
-			? versionUtil.getAllVersions(resolvedDestination)
-			: []
+		const versions = versionUtil.getAllVersions(resolvedDestination)
 		const todaysVersion = versionUtil.generateVersion()
 
 		let version = fallbackVersion

package/src/features/dependencies/actions/AddAction.ts

@@ -27,17 +27,24 @@ export default class DeployAction extends AbstractAction<OptionsSchema> {
 		let { namespace } = this.validateAndNormalizeOptions(options)
 
 		const skills = await this.Store('skill').fetchAllSkills()
+		const dependencyService = this.Service('dependency')
 
 		if (!namespace) {
+			const dependencies = dependencyService.get().map((d) => d.namespace)
+
+			const choices = skills
+				.filter((s) => dependencies.indexOf(s.slug) === -1)
+				.map((s) => ({
+					value: s.slug,
+					label: s.name,
+				}))
+
 			namespace = await this.ui.prompt({
 				type: 'select',
 				label: 'Which skill would you like to add as a dependency?',
 				isRequired: true,
 				options: {
-					choices: skills.map((s) => ({
-						value: s.slug,
-						label: s.name,
-					})),
+					choices,
 				},
 			})
 		}
@@ -51,7 +58,7 @@ export default class DeployAction extends AbstractAction<OptionsSchema> {
 			})
 		}
 
-		this.Service('dependency').add({
+		dependencyService.add({
 			id: skill.id,
 			namespace: skill.slug,
 		})

package/src/features/event/actions/CreateAction.ts

@@ -68,7 +68,10 @@ export default class CreateAction extends AbstractAction<OptionsSchema> {
 
 		try {
 			const destinationDir = diskUtil.resolvePath(this.cwd, 'src', 'events')
-			const resolvedVersion = await this.resolveVersion(version, destinationDir)
+			const resolvedVersion = await this.resolveVersion(
+				version,
+				diskUtil.resolvePath(destinationDir, '**', '*')
+			)
 
 			const files = await this.Writer('event').writeEvent(destinationDir, {
 				nameKebab,

package/src/interfaces/SpyInterface.ts

@@ -80,7 +80,7 @@ export default class SpyInterface implements GraphicsInterface {
 		clearTimeout(this.promptTimeout)
 	}
 
-	public lastInvocation() {
+	public getLastInvocation() {
 		return this.invocations[this.invocations.length - 1]
 	}
 

package/src/services/DependencyService.ts

@@ -1,4 +1,5 @@
 import { SettingsService } from '@sprucelabs/spruce-skill-utils'
+import SpruceError from '../errors/SpruceError'
 
 interface Dependency {
 	id: string
@@ -16,10 +17,23 @@ export default class DependencyService {
 	}
 
 	public add(dependency: Dependency) {
+		this.assertDependencyDoesNotExist(dependency.namespace)
+
 		const dependencies = this.settings.get('dependencies') ?? []
 		dependencies.push(dependency)
 		this.settings.set('dependencies', dependencies)
 	}
+	private assertDependencyDoesNotExist(namespace: string) {
+		const dependencies = this.get()
+		const match = dependencies.find((d) => d.namespace === namespace)
+
+		if (match) {
+			throw new SpruceError({
+				code: 'DEPENDENCY_EXISTS',
+				namespace,
+			})
+		}
+	}
 
 	public get(): Dependency[] {
 		return this.settings.get('dependencies') ?? []

package/src/tests/AbstractCliTest.ts

@@ -465,7 +465,7 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
 	}
 
 	protected static selectOptionBasedOnLabel(label: string) {
-		const last = this.ui.lastInvocation()
+		const last = this.ui.getLastInvocation()
 		assert.doesInclude(last.options.options.choices, {
 			label,
 		})

package/src/tests/utilities/uiAssert.utility.ts

@@ -0,0 +1,29 @@
+import { assert } from '@sprucelabs/test'
+import SpyInterface from '../../interfaces/SpyInterface'
+
+const uiAssertUtil = {
+	async assertRendersSelect(ui: SpyInterface) {
+		await ui.waitForInput()
+
+		const last = ui.getLastInvocation()
+		assert.isTruthy(
+			last.options.options.choices,
+			`I expected a select, I did not find one!`
+		)
+	},
+
+	assertSelectDidNotRenderChoice(
+		ui: SpyInterface,
+		value: string,
+		label: string
+	) {
+		const last = ui.getLastInvocation()
+
+		assert.doesNotInclude(last.options.options.choices, {
+			value,
+			label,
+		})
+	},
+}
+
+export default uiAssertUtil