@sprucelabs/spruce-cli 19.1.1 → 19.1.3

package/src/__tests__/behavioral/events/CreatingAnEvent.test.ts

@@ -95,7 +95,6 @@ export default class CreatingAnEventTest extends AbstractEventTest {
 		await this.assertExpectedTargetAndPayload(mixedResults, skill)
 		await this.assertExpectedPayloadSchemas(mixedResults)
 		await this.assertReturnsEventFromHealthCheck(cli, skill)
-		await this.createsExpectedPermissionContract(mixedResults)
 		await this.assertCreatesOptionsFile(mixedResults)
 	}
 
@@ -225,33 +224,6 @@ export default createFormEmitPayloadBuilder
 		assert.isTruthy(schema.fields?.target)
 	}
 
-	protected static async createsExpectedPermissionContract(results: any) {
-		const builders = [
-			{ filename: 'emitPermissions.builder.ts' },
-			{ filename: 'listenPermissions.builder.ts' },
-		]
-
-		for (const builder of builders) {
-			const { filename } = builder
-
-			const match = testUtil.assertFileByNameInGeneratedFiles(
-				filename,
-				results.files
-			)
-
-			const path = versionUtil.resolvePath(
-				this.cwd,
-				'src/events/',
-				EVENT_NAME,
-				'{{@latest}}',
-				filename
-			)
-
-			assert.isEqual(match, path)
-			assert.isTrue(diskUtil.doesFileExist(path))
-		}
-	}
-
 	private static async assertReturnsEventFromHealthCheck(
 		cli: CliInterface,
 		skill: RegisteredSkill

package/src/__tests__/behavioral/events/KeepingEventsInSync2.test.ts

@@ -1,7 +1,6 @@
 import pathUtil from 'path'
 import {
 	buildPermissionContract,
-	EventContract,
 	EventSignature,
 } from '@sprucelabs/mercury-types'
 import {
@@ -22,10 +21,6 @@ import AbstractEventTest from '../../../tests/AbstractEventTest'
 import testUtil from '../../../tests/utilities/test.utility'
 import { RegisteredSkill } from '../../../types/cli.types'
 
-const EVENT_NAME_READABLE = 'my permission amazing event'
-const EVENT_NAME = 'my-permission-amazing-event'
-const EVENT_CAMEL = 'myPermissionAmazingEvent'
-
 export default class KeepingEventsInSyncTest extends AbstractEventTest {
 	private static randomVersion = 'v2020_01_01'
 
@@ -183,13 +178,13 @@ export default class KeepingEventsInSyncTest extends AbstractEventTest {
 		assert.isTruthy(sig.emitPermissionContract)
 		assert.isEqual(
 			sig.emitPermissionContract.id,
-			'myNewEventEmitPermissionContract'
+			`${skill2.slug}.myNewEventEmitPermissionContract`
 		)
 		assert.isEqual(sig.emitPermissionContract.permissions[0].id, 'can-emit')
 		assert.isTruthy(sig.listenPermissionContract)
 		assert.isEqual(
 			sig.listenPermissionContract.id,
-			'myNewEventListenPermissionContract'
+			`${skill2.slug}.myNewEventListenPermissionContract`
 		)
 		assert.isEqual(sig.listenPermissionContract.permissions[0].id, 'can-listen')
 	}
@@ -314,60 +309,6 @@ export default class KeepingEventsInSyncTest extends AbstractEventTest {
 		assert.isFalse(diskUtil.doesDirExist(dirname))
 	}
 
-	@test()
-	protected static async emptyPermissionsAreNotAddedToContract() {
-		await this.registerCurrentSkillAndInstallToOrg()
-
-		const results = await this.Action('event', 'create').execute({
-			nameReadable: EVENT_NAME_READABLE,
-			nameKebab: EVENT_NAME,
-			nameCamel: EVENT_CAMEL,
-		})
-
-		for (const file of [
-			'emitPermissions.builder.ts',
-			'listenPermissions.builder.ts',
-		]) {
-			const perms = testUtil.assertFileByNameInGeneratedFiles(
-				file,
-				results.files
-			)
-
-			diskUtil.writeFile(
-				perms,
-				`import {
-				buildPermissionContract
-			} from '@sprucelabs/mercury-types'
-			
-			const myFantasticallyAmazingEventEmitPermissions = buildPermissionContract({
-				id: 'myFantasticallyAmazingEventEmitPermissions',
-				name: 'my fantastically amazing event',
-				description: undefined,
-				requireAllPermissions: false,
-				permissions: []
-			})
-			
-			export default myFantasticallyAmazingEventEmitPermissions
-			`
-			)
-		}
-
-		const syncResults = await this.Action('event', 'sync').execute({})
-
-		const contractFile = testUtil.assertFileByNameInGeneratedFiles(
-			/myPermissionAmazingEvent\..*?\.contract\.ts/,
-			syncResults.files
-		)
-
-		const contract = (await this.Service('import').importDefault(
-			contractFile
-		)) as EventContract
-
-		const fqen = Object.keys(contract.eventSignatures)[0]
-		assert.isFalsy(contract.eventSignatures[fqen].emitPermissionContract)
-		assert.isFalsy(contract.eventSignatures[fqen].listenPermissionContract)
-	}
-
 	private static async syncCoreEventsPretendingToBeMercuryTypes() {
 		const results = await this.Action('event', 'sync').execute({
 			shouldSyncOnlyCoreEvents: true,

package/src/__tests__/behavioral/events/RegisteringEventsOnBoot.test.ts

@@ -68,14 +68,5 @@ export default class RegisteringEventsOnBootTest extends AbstractEventTest {
 			version,
 			namespace,
 		})
-		assert.doesInclude(sig.emitPermissionContract, {
-			id: 'myFantasticallyAmazingEventEmitPermissions',
-			name: 'my fantastically amazing event',
-		})
-
-		assert.doesInclude(sig.listenPermissionContract, {
-			id: 'myFantasticallyAmazingEventListenPermissions',
-			name: 'my fantastically amazing event',
-		})
 	}
 }

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

@@ -116,7 +116,7 @@ export default class EventStoreTest extends AbstractEventTest {
 
 		assert.isEqual(
 			sig.emitPermissionContract?.id,
-			'my-fantastic-event-contract'
+			`${skill1.slug}.my-fantastic-event-contract`
 		)
 	}
 

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

@@ -1,8 +1,6 @@
-import { fake } from '@sprucelabs/spruce-test-fixtures'
 import { test, assert } from '@sprucelabs/test-utils'
 import AbstractCliTest from '../../tests/AbstractCliTest'
 
-@fake.login()
 export default class ListenerStoreTest extends AbstractCliTest {
 	@test()
 	protected static canCreateListenerStore() {

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

@@ -226,29 +226,6 @@ export default class EventWriter extends AbstractWriter {
 				description:
 					'The payload that every listener will need to respond with. Delete this file for events that are fire and forget.',
 			},
-			{
-				templateMethod: 'permissionContractBuilder',
-				name: 'emitPermissions.builder.ts',
-				action: 'generated',
-				description: 'Permissions someone else will need to emit your event.',
-				context: {
-					nameCamel: nameCamel + 'Emit',
-					nameKebab,
-					description: '',
-				},
-			},
-			{
-				templateMethod: 'permissionContractBuilder',
-				name: 'listenPermissions.builder.ts',
-				action: 'generated',
-				description:
-					'Permissions someone else will need to listen to your event.',
-				context: {
-					nameCamel: nameCamel + 'Listen',
-					nameKebab,
-					description: '',
-				},
-			},
 			{
 				templateMethod: 'eventOptions',
 				name: 'event.options.ts',

package/.env

@@ -1,25 +0,0 @@
-GOOGLE_SERVICE_PRIVATE_KEY=""-----BEGIN PRIVATE KEY-----"
-GOOGLE_SERVICE_EMAIL="sprucebot@sprucebot.iam.gserviceaccount.com"
-GOOGLE_SERVICE_PRIVATE_KEY_TEST=""-----BEGIN PRIVATE KEY-----"
-GOOGLE_SERVICE_EMAIL_TEST="sprucebot@sprucebot.iam.gserviceaccount.com"
-SHEETS_REPORTER_ADAPTER="MockAdapter"
-SHEETS_REPORTER_ADAPTER_TEST="MockAdapter"
-CLI_RENDER_STACK_TRACES="true"
-WILL_BUILD_CACHE_SCRIPT="diskutil erasevolume HFS+ "RAMDisk" `hdiutil attach -nomount ram://51457280`"
-CLEAN_CACHE_SCRIPT="/sbin/umount -f /Volumes/RAMDisk"
-CLEANUP_TEST_SKILL_DIRS="false"
-TEST_CACHE_ROOT_DIR="/Volumes/RAMDisk"
-MY_KEY="New"
-OTHER_KEY="-2"
-HEROKU_TEAM_NAME="sprucelabs"
-HOST="https://sandbox.mercury.spruce.ai"
-TEST_HOST="https://sandbox.mercury.spruce.ai"
-DEMO_NUMBER="555-004-0001"
-DEMO_NUMBER_LOGIN_AS_SKILL="555-004-0101"
-DEMO_NUMBER_INSTALL_SKILL="555-004-0201"
-DEMO_NUMBER_GLOBAL_EVENTS="555-004-0301"
-DEMO_NUMBER_EVENTS_ON_BOOT="555-004-0401"
-DEMO_NUMBER_VIEWS_ON_BOOT="555-004-0501"
-DEMO_NUMBER_CREATING_AN_EVENT="555-004-0601"
-SANDBOX_DEMO_NUMBER="555-004-0002"
-TEST_SKILLS_TO_CACHE="conversation"