@sprucelabs/spruce-cli 15.2.24 → 15.4.1

package/src/__tests__/behavioral/tests/SelectingAnAbstractTestClass.test.ts

@@ -2,7 +2,7 @@ import { SelectChoice } from '@sprucelabs/schema'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test'
 import { FeatureCode } from '../../../features/features.types'
-import CommandService from '../../../services/CommandService'
+import CreateAction from '../../../features/test/actions/CreateAction'
 import AbstractTestTest from '../../../tests/AbstractTestTest'
 import testUtil from '../../../tests/utilities/test.utility'
 
@@ -113,9 +113,7 @@ export default class SelectingAnAbstractTestClassTest extends AbstractTestTest {
 
 	@test()
 	protected static async installingAFeatureRemovesLabelFromName() {
-		CommandService.fakeCommand(new RegExp(/npm.*?install .*?/gis), {
-			code: 0,
-		})
+		this.commandFaker.fakeInstall()
 
 		await this.installTests()
 
@@ -143,9 +141,7 @@ export default class SelectingAnAbstractTestClassTest extends AbstractTestTest {
 
 	@test()
 	protected static async selectingUninstalledTestInstallsTheFeature() {
-		CommandService.fakeCommand(new RegExp(/npm.*?install .*?/gis), {
-			code: 0,
-		})
+		this.commandFaker.fakeInstall()
 
 		for (const feat of featuresWithRegisteredTests) {
 			this.cwd = diskUtil.createRandomTempDir()
@@ -174,6 +170,24 @@ export default class SelectingAnAbstractTestClassTest extends AbstractTestTest {
 		}
 	}
 
+	@test()
+	protected static relativePathsAddDotSlash() {
+		const action = this.Action('test', 'create') as CreateAction
+
+		//@ts-ignore
+		const actual = action.buildParentClassFromCandidate(
+			{
+				label: 'test',
+				name: 'AbstractTest',
+				path: this.resolvePath('test/AbstractTest'),
+				isDefaultExport: false,
+			},
+			this.resolvePath('test')
+		)
+
+		assert.isEqual(actual.importPath, './AbstractTest')
+	}
+
 	private static async buildAndAssertTestFailsAsExpected() {
 		await this.Service('build').build()
 

package/src/__tests__/implementation/DataStoreStore.test.ts

@@ -109,4 +109,12 @@ export default class DataStoreStoreTest extends AbstractSkillTest {
 			file: 'Bad.store.ts',
 		})
 	}
+
+	@test()
+	protected static async globbyPatternLooksEverywhere() {
+		const expected = this.resolvePath('src', '**', '*.store.ts')
+
+		//@ts-ignore
+		assert.isEqual(this.store.generateGlobbyPattern(), expected)
+	}
 }

package/src/__tests__/implementation/EventStore.test.ts

@@ -281,6 +281,20 @@ export default class EventStoreTest extends AbstractEventTest {
 		assert.doesThrow(() => eventContractUtil.getSignatureByName(unified, fqen))
 	}
 
+	@test()
+	protected static async globbyPatternLooksEverywhere() {
+		const store = this.Store('event')
+		const expected = this.resolvePath(
+			'src',
+			'**',
+			'events',
+			'**/*.(builder|options).ts'
+		)
+
+		//@ts-ignore
+		assert.isEqual(store.generateGlobbyForLocalEvents(), expected)
+	}
+
 	private static async installAndRegisterOneGlobalEvent() {
 		await this.FeatureFixture().installCachedFeatures('events')
 

package/src/__tests__/implementation/ListenerStore.test.ts

@@ -0,0 +1,14 @@
+import { fake } from '@sprucelabs/spruce-test-fixtures'
+import { test, assert } from '@sprucelabs/test'
+import AbstractCliTest from '../../tests/AbstractCliTest'
+
+@fake.login()
+export default class ListenerStoreTest extends AbstractCliTest {
+	@test()
+	protected static canCreateListenerStore() {
+		const listenerStore = this.Store('listener')
+		const expected = this.resolvePath('src', '**/*.listener.ts')
+		//@ts-ignore
+		assert.isEqual(expected, listenerStore.generateGlobbyPattern())
+	}
+}

package/src/__tests__/implementation/StoreFeature.test.ts

@@ -27,7 +27,7 @@ export default class StoreFeatureTest extends AbstractCliTest {
 			actionCode: 'upgrade',
 		})
 
-		assert.isEqual(hitCount, 1)
+		assert.isEqual(hitCount, 0)
 
 		await emitter.emit('feature.did-execute', {
 			featureCode: 'node',

package/src/features/AbstractAction.ts

@@ -29,7 +29,7 @@ import {
 	ActionOptions,
 	FeatureCode,
 } from './features.types'
-import validateAndNormalizeUtil from './validateAndNormalize.utility'
+import validateAndNormalizer from './validateAndNormalize.utility'
 
 export default abstract class AbstractAction<S extends Schema = Schema>
 	implements FeatureAction<S>, ServiceProvider
@@ -105,7 +105,7 @@ export default abstract class AbstractAction<S extends Schema = Schema>
 
 	protected validateAndNormalizeOptions(options: SchemaPartialValues<S>) {
 		const schema = this.optionsSchema
-		return validateAndNormalizeUtil.validateAndNormalize(schema, options)
+		return validateAndNormalizer.validateAndNormalize(schema, options)
 	}
 
 	protected async resolveVersion(

package/src/features/event/builders/EventContractBuilder.ts

@@ -12,7 +12,7 @@ import EventTemplateItemBuilder from '../../../templateItemBuilders/EventTemplat
 import { GraphicsInterface } from '../../../types/cli.types'
 import { FeatureActionResponse } from '../../features.types'
 import SkillStore from '../../skill/stores/SkillStore'
-import validateAndNormalizeUtil from '../../validateAndNormalize.utility'
+import validateAndNormalizer from '../../validateAndNormalize.utility'
 import EventStore from '../stores/EventStore'
 import EventWriter from '../writers/EventWriter'
 
@@ -49,7 +49,7 @@ export default class EventContractBuilder {
 	public async fetchAndWriteContracts(
 		options: Options
 	): Promise<FeatureActionResponse> {
-		const normalizedOptions = validateAndNormalizeUtil.validateAndNormalize(
+		const normalizedOptions = validateAndNormalizer.validateAndNormalize(
 			this.optionsSchema,
 			options
 		)

package/src/features/event/stores/EventStore.ts

@@ -150,14 +150,7 @@ export default class EventStore extends AbstractStore {
 			return EventStore.localEventCache
 		}
 
-		const localMatches = await globby(
-			diskUtil.resolvePath(
-				this.cwd,
-				'src',
-				'events',
-				'**/*.(builder|options).ts'
-			)
-		)
+		const localMatches = await globby(this.generateGlobbyForLocalEvents())
 
 		const ns = namesUtil.toKebab(localNamespace)
 		const eventSignatures: Record<string, EventSignature> = {}
@@ -279,6 +272,16 @@ export default class EventStore extends AbstractStore {
 		return null
 	}
 
+	private generateGlobbyForLocalEvents(): string | readonly string[] {
+		return diskUtil.resolvePath(
+			this.cwd,
+			'src',
+			'**',
+			'events',
+			'**/*.(builder|options).ts'
+		)
+	}
+
 	public async registerEventContract(options: {
 		eventContract: EventContract
 	}) {

package/src/features/event/stores/ListenerStore.ts

@@ -12,9 +12,7 @@ export default class ListenerStore extends AbstractStore {
 	public name = 'listener'
 
 	public async loadListeners() {
-		const matches = await globby(
-			diskUtil.resolvePath(this.cwd, 'src', 'listeners', '**/*.listener.ts')
-		)
+		const matches = await globby(this.generateGlobbyPattern())
 
 		const listeners: Listener[] = []
 
@@ -29,4 +27,8 @@ export default class ListenerStore extends AbstractStore {
 
 		return listeners
 	}
+
+	private generateGlobbyPattern(): string {
+		return diskUtil.resolvePath(this.cwd, 'src', '**/*.listener.ts')
+	}
 }

package/src/features/event/writers/EventWriter.ts

@@ -301,7 +301,7 @@ export default class EventWriter extends AbstractWriter {
 			DEFAULT_SCHEMA_TYPES_FILENAME
 		)
 
-		let relativeTypesFile = pathUtil.relative(
+		let relativeTypesFile = diskUtil.resolveRelativePath(
 			pathUtil.dirname(resolvedDestination),
 			schemaTypesFile
 		)

package/src/features/schema/writers/SchemaWriter.ts

@@ -219,7 +219,7 @@ export default class SchemaWriter extends AbstractWriter {
 		})
 
 		let typesFile = options.typesFile
-			? pathUtil.relative(
+			? diskUtil.resolveRelativePath(
 					pathUtil.dirname(resolvedDestination),
 					options.typesFile
 			  )

package/src/features/store/StoreFeature.ts

@@ -37,7 +37,7 @@ export default class StoreFeature extends AbstractFeature {
 			this.registerAbstractTestClassHandler.bind(this)
 		)
 		void this.emitter.on(
-			'feature.will-execute',
+			'feature.did-execute',
 			this.handleDidExecute.bind(this)
 		)
 	}

package/src/features/store/stores/StoreStore.ts

@@ -13,7 +13,7 @@ export default class StoreStore extends AbstractStore {
 	public name = 'store'
 
 	public async fetchStores() {
-		const search = diskUtil.resolvePath(this.cwd, 'src', 'stores', '*.store.ts')
+		const search = this.generateGlobbyPattern()
 		const matches = await globby(search)
 
 		const results = introspectionUtil.introspect(matches)
@@ -32,4 +32,8 @@ export default class StoreStore extends AbstractStore {
 
 		return stores
 	}
+
+	private generateGlobbyPattern() {
+		return diskUtil.resolvePath(this.cwd, 'src', '**', '*.store.ts')
+	}
 }

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

@@ -171,7 +171,7 @@ export default class CreateAction extends AbstractAction<OptionsSchema> {
 			isDefaultExport: match.isDefaultExport,
 			importPath:
 				match.import ??
-				pathUtil.relative(
+				diskUtil.resolveRelativePath(
 					resolvedDestination,
 					//@ts-ignore
 					match.path.replace(pathUtil.extname(match.path), '')

package/src/features/validateAndNormalize.utility.ts

@@ -11,7 +11,7 @@ type StripNulls<T extends Record<string, any>> = {
 	[K in keyof T]: Exclude<T[K], null>
 }
 
-const validateAndNormalizeUtil = {
+const validateAndNormalizer = {
 	validateAndNormalize<S extends Schema = Schema>(
 		schema: S,
 		options: SchemaPartialValues<S, false>
@@ -44,4 +44,4 @@ const validateAndNormalizeUtil = {
 	},
 }
 
-export default validateAndNormalizeUtil
+export default validateAndNormalizer

package/src/features/view/writers/ViewWriter.ts

@@ -1,4 +1,3 @@
-import pathUtil from 'path'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import {
 	VcTemplateItem,
@@ -61,7 +60,9 @@ export default class ViewWriter extends AbstractWriter {
 	): VcTemplateItem[] {
 		return vcTemplateItems.map((i) => ({
 			...i,
-			path: pathUtil.relative(destinationDir, i.path).replace('.ts', ''),
+			path: diskUtil
+				.resolveRelativePath(destinationDir, i.path)
+				.replace('.ts', ''),
 		}))
 	}
 

package/src/tests/CommandFaker.ts

@@ -3,17 +3,17 @@ import CommandService from '../services/CommandService'
 type Command = RegExp | string
 
 export default class CommandFaker {
-	public fakeRebuild(code = 0) {
-		const command = new RegExp(/yarn rebuild/gis)
-		this.fakeCommand(command, code)
-	}
-
 	public fakeCommand(command: Command, code = 0) {
 		CommandService.fakeCommand(command, {
 			code,
 		})
 	}
 
+	public fakeRebuild(code = 0) {
+		const command = new RegExp(/yarn rebuild/gis)
+		this.fakeCommand(command, code)
+	}
+
 	public fakeCleanBuild(code = 0) {
 		this.fakeCommand('yarn clean.build', code)
 	}
@@ -21,4 +21,8 @@ export default class CommandFaker {
 	public fakeBuild(code = 0) {
 		this.fakeCommand('yarn build.dev', code)
 	}
+
+	public fakeInstall(code = 0) {
+		this.fakeCommand(/.*?install/gis, code)
+	}
 }