@sprucelabs/spruce-cli 15.2.15 → 15.2.18

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

@@ -34,16 +34,7 @@ export default class CreatingBehavioralTestsTest extends AbstractTestTest {
 	)
 	protected static async canCreateBehavioralTest(testName: string) {
 		LintService.enableLinting()
-		const { promise } = await this.installAndStartTestActionAndWaitForInput()
-
-		this.selectOptionBasedOnLabel(testName)
-
-		const response = await promise
-
-		const match = testUtil.assertFileByNameInGeneratedFiles(
-			'CanBookAppointment.test.ts',
-			response.files
-		)
+		const match = await this.createTestAndGetFile(testName)
 
 		assert.doesInclude(match, 'behavioral')
 
@@ -100,8 +91,8 @@ export default class CreatingBehavioralTestsTest extends AbstractTestTest {
 		await promise
 	}
 
-	@test('can select subdir 1', 'test')
-	@test('can select subdir 2', 'test-2')
+	@test('can select sub dir 1', 'test')
+	@test('can select sub dir 2', 'test-2')
 	protected static async selectingAnOptionRendersToSubDir(dirName: string) {
 		await this.installTests()
 		this.createTestSubDir('behavioral', dirName)
@@ -146,6 +137,13 @@ export default class CreatingBehavioralTestsTest extends AbstractTestTest {
 		this.ui.reset()
 	}
 
+	@test()
+	protected static async allTestsComeFakedToStart() {
+		const testFile = await this.createTestAndGetFile()
+		const contents = diskUtil.readFile(testFile)
+		assert.doesInclude(contents, 'fake.login()')
+	}
+
 	private static createTestSubDir(...testDirs: string[]) {
 		const newDir = this.resolveTestDir(...testDirs)
 		diskUtil.createDir(newDir)
@@ -155,6 +153,15 @@ export default class CreatingBehavioralTestsTest extends AbstractTestTest {
 		return this.resolvePath('src', '__tests__', ...testDirs)
 	}
 
+	private static async createTest(testName = 'AbstractSpruceFixtureTest') {
+		const { promise } = await this.installAndStartTestActionAndWaitForInput()
+
+		this.selectOptionBasedOnLabel(testName)
+
+		const response = await promise
+		return response
+	}
+
 	private static async installAndStartTestActionAndWaitForInput(
 		testType = 'behavioral'
 	) {
@@ -174,4 +181,14 @@ export default class CreatingBehavioralTestsTest extends AbstractTestTest {
 		await this.waitForInput()
 		await this.ui.sendInput(selectedSubClass ?? '')
 	}
+
+	private static async createTestAndGetFile(testName?: string) {
+		const response = await this.createTest(testName)
+
+		const match = testUtil.assertFileByNameInGeneratedFiles(
+			'CanBookAppointment.test.ts',
+			response.files
+		)
+		return match
+	}
 }

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

@@ -120,14 +120,14 @@ const relatedToRelatedToProximitySchema = buildSchema({
 })
 
 const relatedToRelatedToProximitySchemaTemplateItem: SchemaTemplateItem = {
-	namespace: 'Proximity',
+	namespace: 'proximity',
 	id: relatedToRelatedToProximitySchema.id,
 	nameCamel: 'relatedToRelatedToProximitySchema',
 	namePascal: 'RelatedToRelatedToProximitySchema',
 	nameReadable: 'relatedToRelatedToProximitySchema',
 	schema: {
 		...relatedToRelatedToProximitySchema,
-		namespace: 'Proximity',
+		namespace: 'proximity',
 	},
 	isNested: true,
 	destinationDir: '#spruce/events',
@@ -150,14 +150,14 @@ const relatedToProximitySchema = buildSchema({
 })
 
 const relatedToProximitySchemaTemplateItem: SchemaTemplateItem = {
-	namespace: 'Proximity',
+	namespace: 'proximity',
 	id: relatedToProximitySchema.id,
 	nameCamel: 'relatedToProximitySchema',
 	namePascal: 'RelatedToProximitySchema',
 	nameReadable: 'relatedToProximitySchema',
 	schema: {
 		id: 'relatedToProximitySchema',
-		namespace: 'Proximity',
+		namespace: 'proximity',
 		version: expectedVersion,
 		fields: {
 			boolField: {
@@ -169,7 +169,7 @@ const relatedToProximitySchemaTemplateItem: SchemaTemplateItem = {
 					schemaIds: [
 						{
 							id: 'relatedToRelatedToProximitySchema',
-							namespace: 'Proximity',
+							namespace: 'proximity',
 							version: expectedVersion,
 						},
 					],
@@ -184,6 +184,7 @@ const relatedToProximitySchemaTemplateItem: SchemaTemplateItem = {
 const proximityEmitPayloadSchema = buildSchema({
 	version: expectedVersion,
 	id: 'proximityEmitPayload',
+	namespace: 'proximity',
 	fields: {
 		textField: {
 			type: 'text',
@@ -198,14 +199,14 @@ const proximityEmitPayloadSchema = buildSchema({
 })
 
 const proximityEmitPayloadTemplateItem: SchemaTemplateItem = {
-	namespace: 'Proximity',
+	namespace: 'proximity',
 	id: proximityEmitPayloadSchema.id,
 	nameCamel: 'proximityEmitPayload',
 	namePascal: 'ProximityEmitPayload',
 	nameReadable: 'proximityEmitPayload',
 	schema: {
 		id: 'proximityEmitPayload',
-		namespace: 'Proximity',
+		namespace: 'proximity',
 		version: expectedVersion,
 		fields: {
 			textField: {
@@ -217,7 +218,7 @@ const proximityEmitPayloadTemplateItem: SchemaTemplateItem = {
 					schemaIds: [
 						{
 							id: 'relatedToProximitySchema',
-							namespace: 'Proximity',
+							namespace: 'proximity',
 							version: expectedVersion,
 						},
 					],
@@ -339,7 +340,6 @@ export default class EventTemplateItemBuilderTest extends AbstractCliTest {
 			eventContractTemplateItems,
 			expectedEventContractTemplateItems
 		)
-
 		assert.isEqualDeep(schemaTemplateItems, expectedSchemaTemplateItems)
 	}
 
@@ -379,4 +379,119 @@ export default class EventTemplateItemBuilderTest extends AbstractCliTest {
 		assert.isEqual(eventContractTemplateItems[0].nameCamel, 'registerEvents')
 		assert.isEqual(eventContractTemplateItems[1].nameCamel, 'zebraCheeta')
 	}
+
+	@test()
+	protected static eventContractTemplateItemsHaveProperNamespacesImports() {
+		const groupsExpectedImports = [
+			{
+				package:
+					'#spruce/schemas/groups/v2021_12_01/listEmitTargetAndPayload.schema',
+				importAs: 'listEmitTargetAndPayloadSchema',
+			},
+			{
+				package:
+					'#spruce/schemas/groups/v2021_12_01/listResponsePayload.schema',
+				importAs: 'listResponsePayloadSchema',
+			},
+			{
+				importAs: '{ buildEventContract }',
+				package: '@sprucelabs/mercury-types',
+			},
+			{
+				importAs: '{ buildPermissionContract }',
+				package: '@sprucelabs/mercury-types',
+			},
+		]
+
+		const appointmentsExpectedImports = [
+			{
+				package:
+					'#spruce/schemas/appointments/v2021_06_23/listEmitTargetAndPayload.schema',
+				importAs: 'listEmitTargetAndPayloadSchema',
+			},
+			{
+				package:
+					'#spruce/schemas/appointments/v2021_06_23/listResponsePayload.schema',
+				importAs: 'listResponsePayloadSchema',
+			},
+			{
+				importAs: '{ buildEventContract }',
+				package: '@sprucelabs/mercury-types',
+			},
+			{
+				importAs: '{ buildPermissionContract }',
+				package: '@sprucelabs/mercury-types',
+			},
+		]
+
+		const { eventContractTemplateItems } = this.itemBuilder.buildTemplateItems({
+			contracts: [
+				{
+					eventSignatures: {
+						'groups.list::v2021_12_01': {
+							emitPayloadSchema: {
+								id: 'listEmitTargetAndPayload',
+								version: 'v2021_12_01',
+								namespace: 'Groups',
+								name: '',
+								fields: {},
+							},
+							responsePayloadSchema: {
+								id: 'listResponsePayload',
+								version: 'v2021_12_01',
+								namespace: 'Groups',
+								name: '',
+								fields: {},
+							},
+							emitPermissionContract: {
+								id: 'listEmitPermissions',
+								name: 'list',
+								requireAllPermissions: false,
+								permissions: [],
+							},
+						},
+
+						'appointments.list::v2021_06_23': {
+							emitPayloadSchema: {
+								id: 'listEmitTargetAndPayload',
+								version: 'v2021_06_23',
+								namespace: 'Appointments',
+								name: '',
+								fields: {},
+							},
+							responsePayloadSchema: {
+								id: 'listResponsePayload',
+								version: 'v2021_06_23',
+								namespace: 'Appointments',
+								name: '',
+								fields: {},
+							},
+							emitPermissionContract: {
+								id: 'listEmitPermissions',
+								name: 'list appointments',
+								requireAllPermissions: false,
+								permissions: [],
+							},
+							listenPermissionContract: {
+								id: 'listListenPermissions',
+								name: 'list appointments',
+								requireAllPermissions: false,
+								permissions: [],
+							},
+						},
+					},
+				},
+			],
+			localNamespace: 'testing',
+		})
+
+		assert.isEqualDeep(
+			eventContractTemplateItems[0].imports,
+			groupsExpectedImports
+		)
+		assert.isEqualDeep(
+			eventContractTemplateItems[1].imports,
+			appointmentsExpectedImports
+		)
+	}
 }

package/src/templateItemBuilders/EventTemplateItemBuilder.ts

@@ -197,13 +197,19 @@ export default class EventTemplateItemBuilder {
 
 		if (emitPayloadSchema) {
 			signatureTemplateItem.emitPayloadSchema = schemaItems.find(
-				(i) => i.id === emitPayloadSchema.id
+				(i) =>
+					i.id === emitPayloadSchema.id &&
+					(!emitPayloadSchema.namespace ||
+						i.namespace === emitPayloadSchema.namespace)
 			)
 		}
 
 		if (responsePayloadSchema) {
 			signatureTemplateItem.responsePayloadSchema = schemaItems.find(
-				(i) => i.id === responsePayloadSchema.id
+				(i) =>
+					i.id === responsePayloadSchema.id &&
+					(!responsePayloadSchema.namespace ||
+						i.namespace === responsePayloadSchema.namespace)
 			)
 		}
 		return signatureTemplateItem