@sprucelabs/spruce-cli 14.28.8 → 14.29.3

package/src/services/LintService.ts

@@ -1,15 +1,26 @@
 import { SchemaError } from '@sprucelabs/schema'
+// import { ESLint } from 'eslint'
 import fs from 'fs-extra'
 import SpruceError from '../errors/SpruceError'
 import CommandService from './CommandService'
 
 export default class LintService {
 	public cwd: string
-	private command: CommandService
+	private getCommand: () => CommandService
 
-	public constructor(cwd: string, command: CommandService) {
+	private static isLintingEnabled = true
+
+	public static disableLinting() {
+		this.isLintingEnabled = false
+	}
+
+	public static enableLinting() {
+		this.isLintingEnabled = true
+	}
+
+	public constructor(cwd: string, commandServiceFactory: () => CommandService) {
 		this.cwd = cwd
-		this.command = command
+		this.getCommand = commandServiceFactory
 	}
 
 	public fix = async (pattern: string): Promise<string[]> => {
@@ -20,12 +31,19 @@ export default class LintService {
 			})
 		}
 
+		if (!LintService.isLintingEnabled) {
+			return []
+		}
+
 		let fixedFiles: any = {}
 		const fixedPaths: string[] = []
+
 		try {
+			// const cli = new ESLint({ fix: true, cwd: this.cwd, cache: true })
+			// fixedFiles = await cli.lintFiles([pattern])
 			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', {
+			const { stdout } = await this.getCommand().execute('node', {
 				args: ['-e', script],
 			})
 
@@ -41,9 +59,20 @@ export default class LintService {
 		if (fixedFiles) {
 			for (let i = 0; i < fixedFiles.length; i += 1) {
 				const fixedFile = fixedFiles[i]
-				if (fixedFile && fixedFile.output) {
+
+				if (fixedFile?.output) {
 					await fs.writeFile(fixedFile.filePath, fixedFile.output)
 					fixedPaths.push(fixedFile.filePath)
+				} else if (fixedFile?.messages && fixedFile?.errorCount > 0) {
+					throw new SpruceError({
+						code: 'LINT_FAILED',
+						pattern,
+						friendlyMessage: `Lint error with '${
+							fixedFile.filePath
+						}':\n\n${fixedFile.messages
+							.map((m: any) => m?.message)
+							.join('\n')}`,
+					})
 				}
 			}
 		}

package/src/services/ServiceFactory.ts

@@ -39,7 +39,10 @@ export default class ServiceFactory {
 	public Service<S extends Service>(cwd: string, type: S): ServiceMap[S] {
 		switch (type) {
 			case 'auth':
-				return new AuthService(new EnvService(cwd)) as ServiceMap[S]
+				return new AuthService(
+					new EnvService(cwd),
+					new PkgService(cwd)
+				) as ServiceMap[S]
 			case 'pkg':
 				return new PkgService(cwd) as ServiceMap[S]
 			case 'env':
@@ -52,7 +55,9 @@ export default class ServiceFactory {
 					command: new CommandService(cwd),
 				}) as ServiceMap[S]
 			case 'lint':
-				return new LintService(cwd, new CommandService(cwd)) as ServiceMap[S]
+				return new LintService(cwd, () =>
+					this.Service(cwd, 'command')
+				) as ServiceMap[S]
 			case 'command': {
 				return new CommandService(cwd) as ServiceMap[S]
 			}
@@ -74,7 +79,7 @@ export default class ServiceFactory {
 				const commandService = new CommandService(cwd)
 				return new BuildService(
 					commandService,
-					new LintService(cwd, commandService)
+					new LintService(cwd, () => this.Service(cwd, 'command'))
 				) as ServiceMap[S]
 			}
 			case 'eventSettings':

package/src/stores/StoreFactory.ts

@@ -1,5 +1,6 @@
 import ConversationStore from '../features/conversation/stores/ConversationStore'
 import EventStore from '../features/event/stores/EventStore'
+import ListenerStore from '../features/event/stores/ListenerStore'
 import OnboardingStore from '../features/onboard/stores/OnboardingStore'
 import OrganizationStore from '../features/organization/stores/OrganizationStore'
 import SchemaStore from '../features/schema/stores/SchemaStore'
@@ -20,6 +21,7 @@ export interface StoreMap {
 	conversation: ConversationStore
 	store: StoreStore
 	view: ViewStore
+	listener: ListenerStore
 }
 
 export type StoreCode = keyof StoreMap
@@ -33,6 +35,7 @@ const storeMap = {
 	conversation: ConversationStore,
 	store: StoreStore,
 	view: ViewStore,
+	listener: ListenerStore,
 }
 
 export interface StoreFactoryMethodOptions {

package/src/tests/AbstractCliTest.ts

@@ -23,6 +23,7 @@ import CliGlobalEmitter, { GlobalEmitter } from '../GlobalEmitter'
 import SpyInterface from '../interfaces/SpyInterface'
 import CommandService from '../services/CommandService'
 import ImportService from '../services/ImportService'
+import LintService from '../services/LintService'
 import ServiceFactory, { Service, ServiceMap } from '../services/ServiceFactory'
 import StoreFactory, {
 	StoreCode,
@@ -32,7 +33,6 @@ import StoreFactory, {
 } from '../stores/StoreFactory'
 import { ApiClientFactoryOptions } from '../types/apiClient.types'
 import { OptionOverrides } from '../types/cli.types'
-import AbstractWriter from '../writers/AbstractWriter'
 import WriterFactory from '../writers/WriterFactory'
 import FeatureFixture, {
 	FeatureFixtureOptions,
@@ -66,7 +66,7 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
 		await super.beforeAll()
 		await this.cleanTestDirsAndFiles()
 
-		AbstractWriter.disableLinting()
+		LintService.disableLinting()
 
 		ImportService.setCacheDir(diskUtil.createRandomTempDir())
 		ImportService.enableCaching()

package/src/writers/AbstractWriter.ts

@@ -39,7 +39,6 @@ export default abstract class AbstractWriter {
 	private upgradeMode: UpgradeMode
 	private fileDescriptions: FileDescription[] = []
 	private shouldConfirmBeforeWriting = true
-	private static isLintingEnabled = true
 	private firstFileWriteMessage?: string
 	private hasShownFirstWriteMessage = false
 	private settings: SettingsService<string>
@@ -54,18 +53,8 @@ export default abstract class AbstractWriter {
 	}
 
 	protected async lint(file: string) {
-		if (AbstractWriter.isLintingEnabled) {
-			this.ui.startLoading(`Linting ${pathUtil.basename(file)}...`)
-			await this.linter?.fix(file).catch(() => {})
-		}
-	}
-
-	public static disableLinting() {
-		this.isLintingEnabled = false
-	}
-
-	public static enableLinting() {
-		this.isLintingEnabled = true
+		this.ui.startLoading(`Linting ${pathUtil.basename(file)}...`)
+		await this.linter?.fix(file).catch(() => {})
 	}
 
 	protected async writeDirectoryTemplate(

package/build/__tests__/behavioral/ListeningToAnEventYouCreate.test.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/__tests__/behavioral/ListeningToAnEventYouCreate.test.ts"],"names":["ListeningToAnEventYouCreateTest","registerCurrentSkillAndInstallToOrg","currentSkill","eventName","version","fqen","eventNameUtil","join","eventNamespace","slug","source","resolveTestPath","destination","resolvePath","diskUtil","copyDir","listenPromise","Action","execute","waitForInput","ui","sendInput","results","assert","isFalsy","errors","match","testUtil","assertFileByNameInGeneratedFiles","files","doesInclude","assertClientIsProperlyTyped","sourceFile","contents","readFile","replace","destinationFile","writeFile","Service","check","AbstractEventTest"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;;;IAEqBA,+B,WACnB,iB;;;;;;;;;;;;;qHAAD;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAEgC,KAAKC,mCAAL,EAFhC;;AAAA;AAAA;AAESC,gBAAAA,YAFT,yBAESA,YAFT;AAIOC,gBAAAA,SAJP,GAImB,sBAJnB;AAKOC,gBAAAA,OALP,GAKiB,aALjB;AAOOC,gBAAAA,IAPP,GAOcC,gCAAcC,IAAd,CAAmB;AAC/BJ,kBAAAA,SAAS,EAATA,SAD+B;AAE/BK,kBAAAA,cAAc,EAAEN,YAAY,CAACO,IAFE;AAG/BL,kBAAAA,OAAO,EAAPA;AAH+B,iBAAnB,CAPd;AAaOM,gBAAAA,MAbP,GAagB,KAAKC,eAAL,CAAqB,sCAArB,CAbhB;AAcOC,gBAAAA,WAdP,GAcqB,KAAKC,WAAL,CAAiB,KAAjB,CAdrB;AAAA;AAAA,uBAgBOC,2BAASC,OAAT,CAAiBL,MAAjB,EAAyBE,WAAzB,CAhBP;;AAAA;AAkBOI,gBAAAA,aAlBP,GAkBuB,KAAKC,MAAL,CAAY,OAAZ,EAAqB,QAArB,EAA+BC,OAA/B,CAAuC,EAAvC,CAlBvB;AAAA;AAAA,uBAoBO,KAAKC,YAAL,EApBP;;AAAA;AAAA;AAAA,uBAqBO,KAAKC,EAAL,CAAQC,SAAR,CAAkBnB,YAAY,CAACO,IAA/B,CArBP;;AAAA;AAAA;AAAA,uBAuBO,KAAKU,YAAL,EAvBP;;AAAA;AAAA;AAAA,uBAwBO,KAAKC,EAAL,CAAQC,SAAR,CAAkBhB,IAAlB,CAxBP;;AAAA;AAAA;AAAA,uBA0BuBW,aA1BvB;;AAAA;AA0BOM,gBAAAA,OA1BP;;AA4BCC,6BAAOC,OAAP,CAAeF,OAAO,CAACG,MAAvB;;AAEMC,gBAAAA,KA9BP,GA8BeC,kBAASC,gCAAT,WACVzB,SADU,cACGC,OADH,mBAEbkB,OAAO,CAACO,KAFK,CA9Bf;;AAmCCN,6BAAOO,WAAP,CACCJ,KADD,EAECZ,2BAASD,WAAT,CAAqB,WAArB,EAAkCX,YAAY,CAACO,IAA/C,CAFD;;AAnCD;AAAA,uBAwCO,KAAKsB,2BAAL,CAAiC7B,YAAY,CAACO,IAA9C,CAxCP;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O;;;;;;;;;;;uHA2CA,kBAAiDD,cAAjD;AAAA;AAAA;AAAA;AAAA;AAAA;AACOwB,gBAAAA,UADP,GACoB,KAAKnB,WAAL,CAAiB,6BAAjB,CADpB;AAEOoB,gBAAAA,QAFP,GAEkBnB,2BACfoB,QADe,CACNF,UADM,EAEfG,OAFe,CAEP,oBAFO,EAEe3B,cAFf,CAFlB;AAMO4B,gBAAAA,eANP,GAMyB,KAAKvB,WAAL,CAAiB,yBAAjB,CANzB;;AAOCC,2CAASuB,SAAT,CAAmBD,eAAnB,EAAoCH,QAApC;;AAPD;AAAA,uBASO,KAAKK,OAAL,CAAa,aAAb,EAA4BC,KAA5B,CAAkCH,eAAlC,CATP;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O;;;;;;;;;;EA5C4DI,8B","sourcesContent":["import { eventNameUtil } from '@sprucelabs/spruce-event-utils'\nimport { diskUtil } from '@sprucelabs/spruce-skill-utils'\nimport { test, assert } from '@sprucelabs/test'\nimport AbstractEventTest from '../../tests/AbstractEventTest'\nimport testUtil from '../../tests/utilities/test.utility'\n\nexport default class ListeningToAnEventYouCreateTest extends AbstractEventTest {\n\t@test()\n\tprotected static async canListenToEventWeCreated() {\n\t\tconst { currentSkill } = await this.registerCurrentSkillAndInstallToOrg()\n\n\t\tconst eventName = 'register-skill-views'\n\t\tconst version = 'v2021_04_11'\n\n\t\tconst fqen = eventNameUtil.join({\n\t\t\teventName,\n\t\t\teventNamespace: currentSkill.slug,\n\t\t\tversion,\n\t\t})\n\n\t\tconst source = this.resolveTestPath('skill_register_skill_views_event/src')\n\t\tconst destination = this.resolvePath('src')\n\n\t\tawait diskUtil.copyDir(source, destination)\n\n\t\tconst listenPromise = this.Action('event', 'listen').execute({})\n\n\t\tawait this.waitForInput()\n\t\tawait this.ui.sendInput(currentSkill.slug)\n\n\t\tawait this.waitForInput()\n\t\tawait this.ui.sendInput(fqen)\n\n\t\tconst results = await listenPromise\n\n\t\tassert.isFalsy(results.errors)\n\n\t\tconst match = testUtil.assertFileByNameInGeneratedFiles(\n\t\t\t`${eventName}.${version}.listener.ts`,\n\t\t\tresults.files\n\t\t)\n\n\t\tassert.doesInclude(\n\t\t\tmatch,\n\t\t\tdiskUtil.resolvePath('listeners', currentSkill.slug)\n\t\t)\n\n\t\tawait this.assertClientIsProperlyTyped(currentSkill.slug)\n\t}\n\n\tprivate static async assertClientIsProperlyTyped(eventNamespace: string) {\n\t\tconst sourceFile = this.resolvePath('src/client-type-test.ts.hbs')\n\t\tconst contents = diskUtil\n\t\t\t.readFile(sourceFile)\n\t\t\t.replace('{{eventNamespace}}', eventNamespace)\n\n\t\tconst destinationFile = this.resolvePath('src/client-type-test.ts')\n\t\tdiskUtil.writeFile(destinationFile, contents)\n\n\t\tawait this.Service('typeChecker').check(destinationFile)\n\t}\n}\n"],"file":"ListeningToAnEventYouCreate.test.js"}

package/build/__tests__/behavioral/README.md

@@ -1,8 +0,0 @@
-
-# Behavioral tests
-
-These are the tests that matter. They should test everything just under the interface. Interface tests can go into implementation since they'll often change.
-
-If all these pass, we ship.
-
-

package/build/__tests__/implementation/README.md

@@ -1,5 +0,0 @@
-# Implementation Tests
-
-These tests help you build whatever you're building to solve the behavioral tests.
-
-Implementation tests can safely be deleted when they break when you are changing the implementation. At that point, you can create new ones.

package/build/components/README.md

@@ -1,5 +0,0 @@
-# Components
-
-Components are ways to collect lots of input form a user that you can reuse in multiple Commands.
-
-Commands and components are the only places you should be asking for input.

package/src/__tests__/behavioral/README.md

@@ -1,8 +0,0 @@
-
-# Behavioral tests
-
-These are the tests that matter. They should test everything just under the interface. Interface tests can go into implementation since they'll often change.
-
-If all these pass, we ship.
-
-

package/src/__tests__/implementation/README.md

@@ -1,5 +0,0 @@
-# Implementation Tests
-
-These tests help you build whatever you're building to solve the behavioral tests.
-
-Implementation tests can safely be deleted when they break when you are changing the implementation. At that point, you can create new ones.

package/src/components/README.md

@@ -1,5 +0,0 @@
-# Components
-
-Components are ways to collect lots of input form a user that you can reuse in multiple Commands.
-
-Commands and components are the only places you should be asking for input.