@sprucelabs/spruce-cli 14.22.10 → 14.24.1

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

@@ -0,0 +1,84 @@
+import { buildSchema } from '@sprucelabs/schema'
+import AbstractAction from '../../AbstractAction'
+import { FeatureActionResponse } from '../../features.types'
+
+const optionsSchema = buildSchema({
+	id: 'manageDependencies',
+	description: 'Manage the skills you depend on.',
+	fields: {},
+})
+
+type OptionsSchema = typeof optionsSchema
+
+export default class DeployAction extends AbstractAction<OptionsSchema> {
+	public optionsSchema = optionsSchema
+	public commandAliases = [
+		'manage.dependencies',
+		'remove.dependency',
+		'dependencies',
+	]
+	public invocationMessage = 'Managing dependencies... 🔗'
+
+	public async execute(): Promise<FeatureActionResponse> {
+		let skills = await this.Store('skill').fetchMySkills()
+		skills.sort((a, b) => {
+			const name1 = a.name.toLowerCase()
+			const name2 = b.name.toLowerCase()
+
+			if (name1 < name2) {
+				return -1
+			} else if (name1 > name2) {
+				return 1
+			}
+
+			return 0
+		})
+
+		const dep = this.Service('dependency')
+		const dependencies = dep.get()
+
+		const currentSkill = await this.Store('skill').loadCurrentSkill()
+
+		if (currentSkill.isRegistered) {
+			skills = skills.filter((s) => s.id !== currentSkill.id)
+		}
+
+		const selected = await this.ui.prompt({
+			label: 'Which skills do you depend on?',
+			type: 'select',
+			isArray: true,
+			isRequired: true,
+			value: dependencies.map((d: any) => d.id),
+			options: {
+				choices: skills.map((skill) => ({
+					value: skill.id,
+					label: skill.name + ' (' + skill.slug + ')',
+				})),
+			},
+		})
+
+		const summary: string[] = []
+
+		const updatedDependencies = selected.map((id) => {
+			const skill = skills.find((s) => s.id === id)
+
+			summary.push(skill?.name + ' (' + skill?.id + ')')
+
+			return {
+				id,
+				namespace: skill?.slug ?? '**missing**',
+			}
+		})
+
+		dep.set(updatedDependencies)
+
+		return {
+			summaryLines: [
+				`${updatedDependencies.length} dependenc${
+					updatedDependencies.length === 1 ? 'y' : 'ies'
+				} added.`,
+				...summary,
+			],
+		}
+	}
+}

package/src/features/event/EventFeature.ts

@@ -172,6 +172,7 @@ export default class EventFeature extends AbstractFeature {
 				eventGenerator: this.Writer('event'),
 				eventStore: this.Store('event'),
 				skillStore: this.Store('skill'),
+				dependencyService: this.Service('dependency'),
 			})
 		}
 

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

@@ -7,6 +7,7 @@ import {
 import { diskUtil, namesUtil } from '@sprucelabs/spruce-skill-utils'
 import globby from 'globby'
 import { isEqual } from 'lodash'
+import DependencyService from '../../../services/DependencyService'
 import EventTemplateItemBuilder from '../../../templateItemBuilders/EventTemplateItemBuilder'
 import { GraphicsInterface } from '../../../types/cli.types'
 import { FeatureActionResponse } from '../../features.types'
@@ -25,6 +26,7 @@ export default class EventContractBuilder {
 	private cwd: string
 	private eventStore: EventStore
 	private skillStore: SkillStore
+	private dependencyService: DependencyService
 
 	public constructor(options: {
 		optionsSchema: OptionsSchema
@@ -33,6 +35,7 @@ export default class EventContractBuilder {
 		cwd: string
 		eventStore: EventStore
 		skillStore: SkillStore
+		dependencyService: DependencyService
 	}) {
 		this.optionsSchema = options.optionsSchema
 		this.ui = options.ui
@@ -40,6 +43,7 @@ export default class EventContractBuilder {
 		this.cwd = options.cwd
 		this.eventStore = options.eventStore
 		this.skillStore = options.skillStore
+		this.dependencyService = options.dependencyService
 	}
 
 	public async fetchAndWriteContracts(
@@ -151,8 +155,13 @@ export default class EventContractBuilder {
 
 		this.ui.startLoading('Fetching event contracts...')
 
+		const namespaces = shouldSyncOnlyCoreEvents
+			? ['core']
+			: this.dependencyService.get().map((d) => d.namespace)
+
 		const contractResults = await this.eventStore.fetchEventContracts({
 			localNamespace: namespace,
+			namespaces,
 			didUpdateHandler: (msg) => {
 				this.ui.startLoading(msg)
 			},
@@ -167,10 +176,8 @@ export default class EventContractBuilder {
 		}
 
 		if (shouldSyncOnlyCoreEvents) {
-			contractResults.contracts = [contractResults.contracts[0]]
 			namespace = undefined
 		} else {
-			contractResults.contracts.shift()
 			namespace = namesUtil.toKebab(namespace)
 		}
 

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

@@ -55,17 +55,18 @@ const eventFileNamesImportKeyMap = {
 
 export default class EventStore extends AbstractStore {
 	public name = 'event'
-	protected static contractCache: any
+	protected static contractCache: Record<string, any> = {}
 
 	public async fetchEventContracts(options?: {
 		localNamespace?: string
+		namespaces?: string[]
 		didUpdateHandler?: InternalUpdateHandler
 	}): Promise<EventStoreFetchEventContractsResponse> {
-		const { localNamespace, didUpdateHandler } = options ?? {}
+		const { localNamespace, didUpdateHandler, namespaces } = options ?? {}
 
 		didUpdateHandler?.('Pulling remote contracts...')
 
-		const contracts = await this.fetchRemoteContracts()
+		const contracts = await this.fetchRemoteContracts(namespaces)
 
 		const localContract =
 			localNamespace &&
@@ -89,19 +90,27 @@ export default class EventStore extends AbstractStore {
 	}
 
 	public static clearCache() {
-		EventStore.contractCache = null
+		EventStore.contractCache = {}
 	}
 
-	private async fetchRemoteContracts() {
-		if (!EventStore.contractCache) {
+	private async fetchRemoteContracts(namespaces?: string[]) {
+		const key = namespaces?.join('|') ?? '_'
+
+		if (!EventStore.contractCache[key]) {
 			const client = await this.connectToApi({ shouldAuthAsCurrentSkill: true })
-			const results = await client.emit('get-event-contracts::v2020_12_25')
+
+			const results = await client.emit('get-event-contracts::v2020_12_25', {
+				target: {
+					namespaces,
+				},
+			})
+
 			const { contracts } = eventResponseUtil.getFirstResponseOrThrow(results)
 
-			EventStore.contractCache = contracts
+			EventStore.contractCache[key] = contracts
 		}
 
-		return cloneDeep(EventStore.contractCache)
+		return cloneDeep(EventStore.contractCache[key])
 	}
 
 	private filterOutLocalEventsFromRemoteContractsMutating(
@@ -264,7 +273,7 @@ export default class EventStore extends AbstractStore {
 
 		eventResponseUtil.getFirstResponseOrThrow(results)
 
-		EventStore.contractCache = null
+		EventStore.contractCache = {}
 
 		return results
 	}
@@ -280,6 +289,6 @@ export default class EventStore extends AbstractStore {
 
 		eventResponseUtil.getFirstResponseOrThrow(results)
 
-		EventStore.contractCache = null
+		EventStore.contractCache = {}
 	}
 }

package/src/features/schema/actions/SyncAction.ts

@@ -2,6 +2,7 @@ import pathUtil from 'path'
 import { SchemaTemplateItem, FieldTemplateItem } from '@sprucelabs/schema'
 import { CORE_NAMESPACE, diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { ValueTypes } from '@sprucelabs/spruce-templates'
+import uniq from 'lodash/uniq'
 import { SpruceSchemas } from '#spruce/schemas/schemas.types'
 import syncSchemasActionSchema from '#spruce/schemas/spruceCli/v2020_07_22/syncSchemasOptions.schema'
 import SpruceError from '../../../errors/SpruceError'
@@ -189,12 +190,14 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 		schemaTemplateItems: SchemaTemplateItem[],
 		forceInstall?: boolean
 	) {
-		const modules = schemaTemplateItems
-			.map((item) => item.importFrom)
-			.filter((i) => !!i) as string[]
+		const modules = uniq(
+			schemaTemplateItems.map((item) => item.importFrom).filter((i) => !!i)
+		) as string[]
+
 		const notInstalled: string[] = []
 
 		const pkg = this.Service('pkg')
+
 		for (const m of modules) {
 			if (!pkg.isInstalled(m) && notInstalled.indexOf(m) === -1) {
 				notInstalled.push(m)

package/src/features/skill/actions/RebuildAction.ts

@@ -37,6 +37,7 @@ export default class RebuildAction extends AbstractAction<OptionsSchema> {
 			} else {
 				this.ui.startLoading('Rebuilding....')
 			}
+
 			await command.execute('yarn rebuild', {
 				onData: (data: string) => {
 					InFlightEntertainment?.writeStatus(data)
@@ -44,6 +45,7 @@ export default class RebuildAction extends AbstractAction<OptionsSchema> {
 			})
 		} catch (err) {
 			this.resetUi()
+
 			return {
 				errors: [err],
 			}

package/src/features/skill/stores/SkillStore.ts

@@ -168,11 +168,18 @@ export default class SkillStore extends AbstractStore {
 	}
 
 	public async fetchMySkills() {
+		return this.fetchAllSkills({ showMineOnly: true })
+	}
+
+	public async fetchAllSkills(query?: {
+		showMineOnly?: boolean
+		namespaces?: string[]
+	}) {
 		const client = await this.connectToApi()
 
 		const response = await client.emit('list-skills::v2020_12_25', {
 			payload: {
-				showMineOnly: true,
+				...query,
 			},
 		})
 

package/src/features/view/ViewFeature.ts

@@ -76,6 +76,11 @@ export default class ViewFeature extends AbstractFeature {
 	public async afterPackageInstall() {
 		const files = await this.Writer('view').writePlugin(this.cwd)
 
+		this.Service('dependency').add({
+			id: '**',
+			namespace: 'heartwood',
+		})
+
 		return { files }
 	}
 }

package/src/interfaces/SpyInterface.ts

@@ -2,6 +2,7 @@ import { FieldDefinitionValueType } from '@sprucelabs/schema'
 import { namesUtil, testLog } from '@sprucelabs/spruce-skill-utils'
 import { assert } from '@sprucelabs/test'
 import { FieldDefinitions } from '#spruce/schemas/fields/fields.types'
+import testUtil from '../tests/utilities/test.utility'
 import { ExecutionResults } from '../types/cli.types'
 import { GraphicsInterface } from '../types/cli.types'
 import {
@@ -83,7 +84,7 @@ export default class SpyInterface implements GraphicsInterface {
 		return this.invocations[this.invocations.length - 1]
 	}
 
-	public async sendInput(input: string): Promise<void> {
+	public async sendInput(input: string | string[]): Promise<void> {
 		this.trackInvocation('sendInput', input)
 
 		this.optionallyRenderLine(
@@ -105,7 +106,9 @@ export default class SpyInterface implements GraphicsInterface {
 			this.confirmResolver = undefined
 
 			resolver(
-				input === '\n' || input.length === 0 || input.toLowerCase() === 'y'
+				input === '\n' ||
+					input.length === 0 ||
+					(typeof input === 'string' && input.toLowerCase() === 'y')
 			)
 		} else {
 			throw new Error('Sent input before prompted for input')
@@ -273,6 +276,30 @@ export default class SpyInterface implements GraphicsInterface {
 		})
 	}
 
+	public async waitForInput() {
+		const ttl = 1000 * 60 * 5
+		const checkInterval = 100
+		let loops = ttl / checkInterval
+		let lastWriteCount = this.invocations.length
+
+		while (!this.isWaitingForInput()) {
+			if (loops-- === 0) {
+				assert.fail(`Waiting for input timed out.`)
+			}
+
+			const hasWritten = lastWriteCount != this.invocations.length
+
+			if (hasWritten) {
+				loops = ttl / checkInterval
+				lastWriteCount = this.invocations.length
+				if (this.shouldRenderTestLogs()) {
+					testUtil.log('waitForInput timeout reset because of new output.')
+				}
+			}
+			await new Promise((resolve) => setTimeout(resolve, checkInterval))
+		}
+	}
+
 	public confirm(question: string): Promise<boolean> {
 		this.trackInvocation('confirm', question)
 		this.optionallyRenderLine(`${question} :: Y/N...`)

package/src/services/DependencyService.ts

@@ -0,0 +1,27 @@
+import { SettingsService } from '@sprucelabs/spruce-skill-utils'
+
+interface Dependency {
+	id: string
+	namespace: string
+}
+
+export default class DependencyService {
+	private settings: SettingsService<string>
+	public constructor(settings: SettingsService) {
+		this.settings = settings
+	}
+
+	public set(dependencies: Dependency[]) {
+		this.settings.set('dependencies', dependencies)
+	}
+
+	public add(dependency: Dependency) {
+		const dependencies = this.settings.get('dependencies') ?? []
+		dependencies.push(dependency)
+		this.settings.set('dependencies', dependencies)
+	}
+
+	public get(): Dependency[] {
+		return this.settings.get('dependencies') ?? []
+	}
+}

package/src/services/ServiceFactory.ts

@@ -7,6 +7,7 @@ import VsCodeService from '../features/vscode/services/VsCodeService'
 import AuthService from './AuthService'
 import BuildService from './BuildService'
 import CommandService from './CommandService'
+import DependencyService from './DependencyService'
 import ImportService from './ImportService'
 import LintService from './LintService'
 import PkgService from './PkgService'
@@ -26,6 +27,7 @@ export interface ServiceMap {
 	auth: AuthService
 	remote: RemoteService
 	eventSettings: EventSettingsService
+	dependency: DependencyService
 }
 
 export type Service = keyof ServiceMap
@@ -62,6 +64,10 @@ export default class ServiceFactory {
 				) as ServiceMap[S]
 			case 'settings':
 				return new SettingsService<FeatureCode>(cwd) as ServiceMap[S]
+			case 'dependency':
+				return new DependencyService(
+					new SettingsService<FeatureCode>(cwd)
+				) as ServiceMap[S]
 			case 'import':
 				return this.buildImportService(cwd) as ServiceMap[S]
 			case 'build': {

package/src/templateItemBuilders/EventTemplateItemBuilder.ts

@@ -43,6 +43,16 @@ export default class EventTemplateItemBuilder {
 			schemaTemplateItems.push(...schemaItems)
 		}
 
+		eventContractTemplateItems.sort((a, b) => {
+			if (a.nameCamel > b.nameCamel) {
+				return 1
+			} else if (a.nameCamel < b.nameCamel) {
+				return -1
+			}
+
+			return 0
+		})
+
 		return { eventContractTemplateItems, schemaTemplateItems }
 	}
 

package/src/tests/AbstractCliTest.ts

@@ -357,27 +357,7 @@ export default abstract class AbstractCliTest extends AbstractSpruceTest {
 	}
 
 	protected static async waitForInput() {
-		const ttl = 1000 * 60 * 5
-		const checkInterval = 100
-		let loops = ttl / checkInterval
-		let lastWriteCount = this.ui.invocations.length
-
-		while (!this.ui.isWaitingForInput()) {
-			if (loops-- === 0) {
-				assert.fail(`Waiting for input timed out.`)
-			}
-
-			const hasWritten = lastWriteCount != this.ui.invocations.length
-
-			if (hasWritten) {
-				loops = ttl / checkInterval
-				lastWriteCount = this.ui.invocations.length
-				if (process.env.SHOULD_RENDER_TEST_LOGS === 'true') {
-					testUtil.log('waitForInput timeout reset because of new output.')
-				}
-			}
-			await new Promise((resolve) => setTimeout(resolve, checkInterval))
-		}
+		return this.ui.waitForInput()
 	}
 
 	protected static async assertIsFeatureInstalled(code: FeatureCode) {

package/src/tests/fixtures/SkillFixture.ts

@@ -26,9 +26,13 @@ export default class SkillFixture {
 		this.apiClientFactory = apiClientFactory
 	}
 
-	public async seedDemoSkill(values: { name: string }) {
+	public async seedDemoSkill(
+		values: { name: string },
+		options?: { phone?: string }
+	) {
 		return this.registerCurrentSkill(values, {
 			isRegisteringCurrentSkill: false,
+			...options,
 		})
 	}
 
@@ -51,7 +55,7 @@ export default class SkillFixture {
 		SkillFixture.skillCount++
 		return `${namesUtil.toKebab(name)}-${new Date().getTime()}-count-${
 			SkillFixture.skillCount
-		}`
+		}-cli-test`
 	}
 
 	public async registerEventContract(

package/src/utilities/action.utility.ts

@@ -31,12 +31,7 @@ const actionUtil = {
 	},
 
 	assertNoErrorsInResponse(response: MercuryAggregateResponse<any>) {
-		if (response.totalErrors > 0) {
-			throw (
-				response.responses[0]?.errors?.[0] ??
-				eventResponseUtil.getFirstResponseOrThrow(response)
-			)
-		}
+		eventResponseUtil.getFirstResponseOrThrow(response)
 	},
 }
 

package/build/.spruce/schemas/heartwood/v2021_02_11/registerSkillViewsEmitTarget.schema.d.ts

@@ -1,3 +0,0 @@
-import { SpruceSchemas } from '../../schemas.types';
-declare const registerSkillViewsEmitTargetSchema: SpruceSchemas.Heartwood.v2021_02_11.RegisterSkillViewsEmitTargetSchema;
-export default registerSkillViewsEmitTargetSchema;

package/build/.spruce/schemas/heartwood/v2021_02_11/registerSkillViewsEmitTarget.schema.js

@@ -1,28 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _schema = require("@sprucelabs/schema");
-
-var registerSkillViewsEmitTargetSchema = {
-  id: 'registerSkillViewsEmitTarget',
-  version: 'v2021_02_11',
-  namespace: 'Heartwood',
-  name: '',
-  fields: {
-    /** . */
-    'personId': {
-      type: 'id',
-      options: undefined
-    }
-  }
-};
-
-_schema.SchemaRegistry.getInstance().trackSchema(registerSkillViewsEmitTargetSchema);
-
-var _default = registerSkillViewsEmitTargetSchema;
-exports["default"] = _default;
-//# sourceMappingURL=registerSkillViewsEmitTarget.schema.js.map

package/build/.spruce/schemas/heartwood/v2021_02_11/registerSkillViewsEmitTarget.schema.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../../src/.spruce/schemas/heartwood/v2021_02_11/registerSkillViewsEmitTarget.schema.ts"],"names":["registerSkillViewsEmitTargetSchema","id","version","namespace","name","fields","type","options","undefined","SchemaRegistry","getInstance","trackSchema"],"mappings":";;;;;;;AAAA;;AAKA,IAAMA,kCAA0G,GAAI;AACnHC,EAAAA,EAAE,EAAE,8BAD+G;AAEnHC,EAAAA,OAAO,EAAE,aAF0G;AAGnHC,EAAAA,SAAS,EAAE,WAHwG;AAInHC,EAAAA,IAAI,EAAE,EAJ6G;AAK/GC,EAAAA,MAAM,EAAE;AACA;AACA,gBAAY;AACRC,MAAAA,IAAI,EAAE,IADE;AAERC,MAAAA,OAAO,EAAEC;AAFD;AAFZ;AALuG,CAApH;;AAcAC,uBAAeC,WAAf,GAA6BC,WAA7B,CAAyCX,kCAAzC;;eAEeA,kC","sourcesContent":["import { SchemaRegistry } from '@sprucelabs/schema'\nimport { SpruceSchemas } from '../../schemas.types'\n\n\n\nconst registerSkillViewsEmitTargetSchema: SpruceSchemas.Heartwood.v2021_02_11.RegisterSkillViewsEmitTargetSchema  = {\n\tid: 'registerSkillViewsEmitTarget',\n\tversion: 'v2021_02_11',\n\tnamespace: 'Heartwood',\n\tname: '',\n\t    fields: {\n\t            /** . */\n\t            'personId': {\n\t                type: 'id',\n\t                options: undefined\n\t            },\n\t    }\n}\n\nSchemaRegistry.getInstance().trackSchema(registerSkillViewsEmitTargetSchema)\n\nexport default registerSkillViewsEmitTargetSchema\n"],"file":"registerSkillViewsEmitTarget.schema.js"}

package/src/.spruce/schemas/heartwood/v2021_02_11/registerSkillViewsEmitTarget.schema.ts

@@ -1,22 +0,0 @@
-import { SchemaRegistry } from '@sprucelabs/schema'
-import { SpruceSchemas } from '../../schemas.types'
-
-
-
-const registerSkillViewsEmitTargetSchema: SpruceSchemas.Heartwood.v2021_02_11.RegisterSkillViewsEmitTargetSchema  = {
-	id: 'registerSkillViewsEmitTarget',
-	version: 'v2021_02_11',
-	namespace: 'Heartwood',
-	name: '',
-	    fields: {
-	            /** . */
-	            'personId': {
-	                type: 'id',
-	                options: undefined
-	            },
-	    }
-}
-
-SchemaRegistry.getInstance().trackSchema(registerSkillViewsEmitTargetSchema)
-
-export default registerSkillViewsEmitTargetSchema