@sprucelabs/spruce-cli 18.3.0 → 18.4.0

package/node_modules/@typescript-eslint/visitor-keys/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/visitor-keys",
-  "version": "5.45.0",
+  "version": "5.45.1",
   "description": "Visitor keys used to help traverse the TypeScript-ESTree AST",
   "keywords": [
     "eslint",
@@ -39,7 +39,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/types": "5.45.0",
+    "@typescript-eslint/types": "5.45.1",
     "eslint-visitor-keys": "^3.3.0"
   },
   "devDependencies": {
@@ -56,5 +56,5 @@
       ]
     }
   },
-  "gitHead": "267da4e416f7de6892336db8a2360d7af702b73c"
+  "gitHead": "2d0a88314dc6c4ea2c786135735fd83517945acd"
 }

package/package.json

@@ -18,7 +18,7 @@
     ]
   },
   "license": "MIT",
-  "version": "18.3.0",
+  "version": "18.4.0",
   "bin": {
     "spruce": "./build/index.js"
   },
@@ -76,17 +76,17 @@
     "@babel/plugin-proposal-decorators": "^7.20.5",
     "@babel/runtime": "^7.20.6",
     "@jest/reporters": "^29.3.1",
-    "@sprucelabs/error": "^5.0.546",
-    "@sprucelabs/heartwood-view-controllers": "^98.3.40",
-    "@sprucelabs/jest-json-reporter": "^6.0.525",
-    "@sprucelabs/mercury-client": "^34.0.78",
-    "@sprucelabs/mercury-event-emitter": "^34.0.78",
-    "@sprucelabs/mercury-types": "^37.3.4",
-    "@sprucelabs/schema": "^28.5.73",
-    "@sprucelabs/spruce-core-schemas": "^35.1.68",
-    "@sprucelabs/spruce-event-utils": "^29.2.25",
-    "@sprucelabs/spruce-skill-utils": "^28.1.2",
-    "@sprucelabs/spruce-templates": "^18.3.0",
+    "@sprucelabs/error": "^5.0.547",
+    "@sprucelabs/heartwood-view-controllers": "^99.0.1",
+    "@sprucelabs/jest-json-reporter": "^6.0.526",
+    "@sprucelabs/mercury-client": "^35.0.0",
+    "@sprucelabs/mercury-event-emitter": "^35.0.0",
+    "@sprucelabs/mercury-types": "^38.0.0",
+    "@sprucelabs/schema": "^28.5.74",
+    "@sprucelabs/spruce-core-schemas": "^35.1.70",
+    "@sprucelabs/spruce-event-utils": "^30.0.0",
+    "@sprucelabs/spruce-skill-utils": "^28.1.3",
+    "@sprucelabs/spruce-templates": "^18.4.0",
     "@typescript-eslint/eslint-plugin": "^5.27.1",
     "@typescript-eslint/parser": "^5.27.1",
     "cfonts": "^3.1.1",
@@ -114,16 +114,16 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@sprucelabs/data-stores": "^19.0.61",
+    "@sprucelabs/data-stores": "^19.0.62",
     "@sprucelabs/jest-sheets-reporter": "^2.0.21",
-    "@sprucelabs/mercury-core-events": "^15.0.100",
-    "@sprucelabs/resolve-path-aliases": "^1.1.137",
-    "@sprucelabs/spruce-conversation-plugin": "^52.3.2",
-    "@sprucelabs/spruce-deploy-plugin": "^52.3.2",
-    "@sprucelabs/spruce-store-plugin": "^52.3.2",
-    "@sprucelabs/spruce-test-fixtures": "^52.3.2",
-    "@sprucelabs/test": "^7.7.391",
-    "@sprucelabs/test-utils": "^3.2.61",
+    "@sprucelabs/mercury-core-events": "^15.0.106",
+    "@sprucelabs/resolve-path-aliases": "^1.1.138",
+    "@sprucelabs/spruce-conversation-plugin": "^52.3.4",
+    "@sprucelabs/spruce-deploy-plugin": "^52.3.4",
+    "@sprucelabs/spruce-store-plugin": "^52.3.4",
+    "@sprucelabs/spruce-test-fixtures": "^52.3.4",
+    "@sprucelabs/test": "^7.7.392",
+    "@sprucelabs/test-utils": "^3.2.62",
     "@types/blessed": "^0.1.19",
     "@types/eslint": "^8.4.10",
     "@types/fs-extra": "^9.0.13",
@@ -595,5 +595,5 @@
       "terminal-kit"
     ]
   },
-  "gitHead": "f8239e76132381bf8b038dededf356c6e78f1061"
+  "gitHead": "da522d85b8178d456ecda58e41b9b4a7067b9437"
 }

package/src/__tests__/behavioral/eventContract/PullingMercuryEventContract.test.ts

@@ -116,11 +116,6 @@ export default class GeneratingMercuryEventContractTest extends AbstractCliTest
 			shouldAutoHandleDependencies: true,
 		}).execute({})
 
-		await this.waitForInput()
-		await this.ui.sendInput('Y')
-		await this.waitForInput()
-		await this.ui.sendInput('\n')
-
 		const results = await promise
 
 		const match = testUtil.assertFileByNameInGeneratedFiles(

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

@@ -0,0 +1,75 @@
+import { namesUtil, versionUtil } from '@sprucelabs/spruce-skill-utils'
+import { EventSignatureTemplateItem } from '@sprucelabs/spruce-templates'
+import { test, assert, generateId } from '@sprucelabs/test-utils'
+import AbstractCliTest from '../../../tests/AbstractCliTest'
+
+export default class EventWriterTest extends AbstractCliTest {
+	@test()
+	protected static async canCreateEventWriter() {
+		await this.FeatureFixture().installCachedFeatures('events')
+		const writer = this.writers.Writer('event', { fileDescriptions: [] })
+		const name = 'My event'
+		const namespace = 'appointments'
+
+		const contractId1 = generateId() as any
+		const contractId2 = generateId() as any
+		const permissionId1 = generateId() as any
+		const permissionId2 = generateId() as any
+
+		const sig: EventSignatureTemplateItem = {
+			isGlobal: true,
+			emitPermissions: {
+				contractId: contractId1,
+				permissionIdsAny: [permissionId1],
+			},
+			listenPermissions: {
+				contractId: contractId2,
+				permissionIdsAny: [permissionId2],
+			},
+		}
+
+		const permWriter = this.writers.Writer('permission', {
+			fileDescriptions: [],
+		})
+
+		//@ts-ignore
+		await permWriter.writeTypesFile(this.cwd, {
+			[contractId1]: [permissionId1],
+			[contractId2]: [permissionId2],
+		})
+
+		const results = await writer.writeContracts(
+			this.resolveHashSprucePath('events'),
+			{
+				eventBuilderFile: '@sprucelabs/mercury-types',
+				schemaTemplateItems: [],
+				shouldImportCoreEvents: false,
+				skillEventContractTypesFile: '',
+				eventContractTemplateItems: [
+					{
+						imports: [
+							{
+								importAs: '{ buildEventContract }',
+								package: '@sprucelabs/mercury-types',
+							},
+						],
+						isLocal: true,
+						nameCamel: namesUtil.toCamel(name),
+						namePascal: namesUtil.toPascal(name),
+						namespace,
+						namespaceCamel: namesUtil.toCamel(namespace),
+						namespacePascal: namesUtil.toPascal(namespace),
+						version: versionUtil.generateVersion().constValue,
+						eventSignatures: {
+							test: sig,
+						},
+					},
+				],
+			}
+		)
+
+		const match = results[0]
+		const imported = await this.Service('import').importDefault(match.path)
+		assert.isEqualDeep(imported.eventSignatures.test, sig)
+	}
+}

package/src/__tests__/behavioral/{ListeningToCoreEvents.test.ts → events/ListeningToCoreEvents.test.ts}

@@ -1,5 +1,5 @@
 import { test, assert } from '@sprucelabs/test-utils'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
 
 export default class ListeningToCoreEventsTest extends AbstractSkillTest {
 	protected static skillCacheKey = 'events'

package/src/__tests__/behavioral/{RegisteringEventsOnBoot.test.ts → events/RegisteringEventsOnBoot.test.ts}

@@ -4,8 +4,8 @@ import {
 } from '@sprucelabs/spruce-event-utils'
 import { namesUtil, versionUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
-import AbstractEventTest from '../../tests/AbstractEventTest'
-import { DEMO_NUMBER_EVENTS_ON_BOOT } from '../../tests/constants'
+import AbstractEventTest from '../../../tests/AbstractEventTest'
+import { DEMO_NUMBER_EVENTS_ON_BOOT } from '../../../tests/constants'
 
 const EVENT_NAME_READABLE = 'did book appointment'
 const EVENT_NAME = 'did-book-appointment'

package/src/__tests__/behavioral/{RegisteringGlobalEvents.test.ts → events/RegisteringGlobalEvents.test.ts}

@@ -1,10 +1,10 @@
 import { versionUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
 import dotenv from 'dotenv'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
-import { DEMO_NUMBER_GLOBAL_EVENTS } from '../../tests/constants'
-import testUtil from '../../tests/utilities/test.utility'
-import { RegisteredSkill } from '../../types/cli.types'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+import { DEMO_NUMBER_GLOBAL_EVENTS } from '../../../tests/constants'
+import testUtil from '../../../tests/utilities/test.utility'
+import { RegisteredSkill } from '../../../types/cli.types'
 dotenv.config()
 
 const stamp = new Date().getTime()
@@ -21,8 +21,6 @@ export default class RegisteringGlobalEventsTest extends AbstractSkillTest {
 
 		await this.people.loginAsDemoPerson(DEMO_NUMBER_GLOBAL_EVENTS)
 
-		await this.resetAccount()
-
 		const orgFixture = this.getOrganizationFixture()
 		const skillFixture = this.getSkillFixture()
 
@@ -37,12 +35,6 @@ export default class RegisteringGlobalEventsTest extends AbstractSkillTest {
 
 	protected static async afterAll() {
 		await super.afterAll()
-		await this.resetAccount()
-	}
-
-	private static async resetAccount() {
-		// await this.getOrganizationFixture().clearAllOrgs()
-		// await this.getSkillFixture().clearAllSkills()
 	}
 
 	@test()

package/src/__tests__/behavioral/{SyncingEventsOnlyFromDependencies.test.ts → events/SyncingEventsOnlyFromDependencies.test.ts}

@@ -1,8 +1,8 @@
 import { diskUtil, namesUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
 import fsUtil from 'fs-extra'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
-import { RegisteredSkill } from '../../types/cli.types'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+import { RegisteredSkill } from '../../../types/cli.types'
 
 export default class SyncingEventsOnlyFromDependenciesTest extends AbstractSkillTest {
 	protected static skillCacheKey = 'events'

package/src/__tests__/behavioral/permissions/PermissionStore.test.ts

@@ -4,9 +4,9 @@ import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert, generateId } from '@sprucelabs/test-utils'
 import PermissionStore, {
 	ImportedPermission,
+	ListPermContractsTargetAndPayload,
 } from '../../../features/permission/stores/PermissionStore'
 import { ApiClientFactoryOptions } from '../../../types/apiClient.types'
-import { ListPermContractsTargetAndPayload } from '../../support/EventFaker'
 import AbstractPermissionsTest from './support/AbstractPermissionsTest'
 import generateShortAlphaId from './support/generateShortAlphaId'
 import { sortPermissionContracts } from './support/sortPermissionContracts'
@@ -143,6 +143,7 @@ export default class PermissionStoreTest extends AbstractPermissionsTest {
 		})
 
 		const map = await this.fetchContracts()
+		//@ts-ignore
 		assert.isEqualDeep(map, {
 			[contractId]: [perm.id, perm2.id],
 			[contractId2]: [perm3.id],

package/src/__tests__/behavioral/permissions/PermissionWriter.test.ts

@@ -9,6 +9,7 @@ export default class PermissionWriterTest extends AbstractPermissionsTest {
 		const perm1 = generateId()
 		const perm2 = generateId()
 
+		//@ts-ignore
 		await this.writeTypesFile({
 			[contractId]: [perm1, perm2],
 		})

package/src/__tests__/behavioral/permissions/SyncingPermissions.test.ts

@@ -2,7 +2,10 @@ import { MercuryClientFactory } from '@sprucelabs/mercury-client'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { assert, test } from '@sprucelabs/test-utils'
 import ActionFactory from '../../../features/ActionFactory'
-import SyncAction from '../../../features/permission/actions/SyncAction'
+import SyncAction, {
+	SyncPermissionsOptions,
+} from '../../../features/permission/actions/SyncAction'
+import { ListPermContractsTargetAndPayload } from '../../../features/permission/stores/PermissionStore'
 import testUtil from '../../../tests/utilities/test.utility'
 import AbstractPermissionsTest from './support/AbstractPermissionsTest'
 import generateShortAlphaId from './support/generateShortAlphaId'
@@ -112,6 +115,21 @@ export default class SyncingPermissionsTest extends AbstractPermissionsTest {
 		)
 	}
 
+	@test()
+	protected static async canSyncCorePermissions() {
+		let wasHit = false
+		let passedTarget: ListPermContractsTargetAndPayload['target']
+
+		await this.eventFaker.fakeListPermissionContracts((targetAndPayload) => {
+			passedTarget = targetAndPayload.target
+			wasHit = true
+		})
+
+		await this.sync({ shouldSyncCorePermissions: true })
+		assert.isTrue(wasHit)
+		assert.isUndefined(passedTarget)
+	}
+
 	private static getCombinedPath() {
 		return this.resolveHashSprucePath('permissions', 'permissions.ts')
 	}
@@ -120,8 +138,8 @@ export default class SyncingPermissionsTest extends AbstractPermissionsTest {
 		ActionFactory.setActionClass('permission', 'sync', ExecuteTrackingAction)
 	}
 
-	private static async sync() {
-		return await this.syncAction.execute()
+	private static async sync(options?: SyncPermissionsOptions) {
+		return await this.syncAction.execute(options)
 	}
 
 	private static async emitDidExecuteUpgrade() {

package/src/__tests__/behavioral/{CreatingSchemasWithGenerics.test.ts → schemas/CreatingSchemasWithGenerics.test.ts}

@@ -1,7 +1,7 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
-import AbstractSchemaTest from '../../tests/AbstractSchemaTest'
-import testUtil from '../../tests/utilities/test.utility'
+import AbstractSchemaTest from '../../../tests/AbstractSchemaTest'
+import testUtil from '../../../tests/utilities/test.utility'
 
 export default class CreatingSchemasWithGenericsTest extends AbstractSchemaTest {
 	@test()

package/src/__tests__/behavioral/{SettingUpSchemasForModuleDistribution.test.ts → schemas/SettingUpSchemasForModuleDistribution.test.ts}

@@ -6,10 +6,10 @@ import {
 } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
 import { errorAssert } from '@sprucelabs/test-utils'
-import { FeatureActionResponse } from '../../features/features.types'
-import SchemaTemplateItemBuilder from '../../templateItemBuilders/SchemaTemplateItemBuilder'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
-import testUtil from '../../tests/utilities/test.utility'
+import { FeatureActionResponse } from '../../../features/features.types'
+import SchemaTemplateItemBuilder from '../../../templateItemBuilders/SchemaTemplateItemBuilder'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+import testUtil from '../../../tests/utilities/test.utility'
 
 const LOCAL_NAMESPACE = 'TestingSchemas'
 const REMOTE_NAMESPACE = 'RemoteSchemas'

package/src/__tests__/behavioral/{InstallingASkillAtAnOrg.test.ts → skill/InstallingASkillAtAnOrg.test.ts}

@@ -1,8 +1,8 @@
 import { eventAssertUtil } from '@sprucelabs/spruce-event-utils'
 import { test, assert, assertUtil } from '@sprucelabs/test-utils'
 import { errorAssert } from '@sprucelabs/test-utils'
-import AbstractCliTest from '../../tests/AbstractCliTest'
-import { DEMO_NUMBER_INSTALL_SKILL } from '../../tests/constants'
+import AbstractCliTest from '../../../tests/AbstractCliTest'
+import { DEMO_NUMBER_INSTALL_SKILL } from '../../../tests/constants'
 
 export default class InstallingASkillAtAnOrgTest extends AbstractCliTest {
 	protected static async beforeEach() {

package/src/__tests__/behavioral/{LoggingInAsASkill.test.ts → skill/LoggingInAsASkill.test.ts}

@@ -1,8 +1,8 @@
 import { test, assert } from '@sprucelabs/test-utils'
 import { errorAssert } from '@sprucelabs/test-utils'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
-import { DEMO_NUMBER_LOGIN_AS_SKILL } from '../../tests/constants'
-import { RegisteredSkill } from '../../types/cli.types'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+import { DEMO_NUMBER_LOGIN_AS_SKILL } from '../../../tests/constants'
+import { RegisteredSkill } from '../../../types/cli.types'
 
 export default class LoggingInAsASkillTest extends AbstractSkillTest {
 	protected static skillCacheKey = 'skills'

package/src/__tests__/behavioral/{RebuildingASkill.test.ts → skill/RebuildingASkill.test.ts}

@@ -1,7 +1,7 @@
 import { test, assert } from '@sprucelabs/test-utils'
 import { errorAssert } from '@sprucelabs/test-utils'
-import CommandService from '../../services/CommandService'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
+import CommandService from '../../../services/CommandService'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
 
 export default class RebuildingASkillTest extends AbstractSkillTest {
 	protected static skillCacheKey = 'skills'

package/src/__tests__/behavioral/{SettingUpASkillForTesting.test.ts → tests/SettingUpASkillForTesting.test.ts}

@@ -1,6 +1,6 @@
 import { test, assert } from '@sprucelabs/test-utils'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
-import { DEMO_NUMBER } from '../../tests/constants'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+import { DEMO_NUMBER } from '../../../tests/constants'
 
 export default class SettingUpASkillForTestingTest extends AbstractSkillTest {
 	protected static skillCacheKey = 'tests'

package/src/__tests__/behavioral/{TestReporterSettingsRemembered.test.ts → tests/TestReporterSettingsRemembered.test.ts}

@@ -1,6 +1,6 @@
 import { test, assert } from '@sprucelabs/test-utils'
-import TestAction from '../../features/test/actions/TestAction'
-import AbstractTestTest from '../../tests/AbstractTestTest'
+import TestAction from '../../../features/test/actions/TestAction'
+import AbstractTestTest from '../../../tests/AbstractTestTest'
 
 export default class TestReporterSettingsRememberedTest extends AbstractTestTest {
 	@test()

package/src/__tests__/behavioral/{TestingDataStores.test.ts → tests/TestingDataStores.test.ts}

@@ -1,8 +1,8 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
-import LintService from '../../services/LintService'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
-import testUtil from '../../tests/utilities/test.utility'
+import LintService from '../../../services/LintService'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+import testUtil from '../../../tests/utilities/test.utility'
 
 export default class TestingDataStoresTest extends AbstractSkillTest {
 	protected static skillCacheKey = 'storesWithTests'

package/src/__tests__/behavioral/{RegisteringSkillViewOnBoot.test.ts → views/RegisteringSkillViewOnBoot.test.ts}

@@ -1,6 +1,6 @@
 import { test, assert } from '@sprucelabs/test-utils'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
-import { DEMO_NUMBER_VIEWS_ON_BOOT } from '../../tests/constants'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+import { DEMO_NUMBER_VIEWS_ON_BOOT } from '../../../tests/constants'
 
 export default class RegisteringSkillViewOnBootTest extends AbstractSkillTest {
 	protected static skillCacheKey = 'views'

package/src/__tests__/behavioral/{WatchingSkillViews.test.ts → views/WatchingSkillViews.test.ts}

@@ -1,7 +1,7 @@
 import { test, assert } from '@sprucelabs/test-utils'
-import WatchAction from '../../features/view/actions/WatchAction'
-import CommandService from '../../services/CommandService'
-import AbstractSkillTest from '../../tests/AbstractSkillTest'
+import WatchAction from '../../../features/view/actions/WatchAction'
+import CommandService from '../../../services/CommandService'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
 
 export default class WatchingSkillViewsTest extends AbstractSkillTest {
 	protected static skillCacheKey = 'views'
@@ -22,7 +22,7 @@ export default class WatchingSkillViewsTest extends AbstractSkillTest {
 	protected static async shouldCallBoot() {
 		let wasHit = false
 		CommandService.fakeCommand(
-			'ENABLED_SKILL_FEATURES=view,event SHOULD_WATCH_VIEWS=true MAXIMUM_LOG_PREFIXES_LENGTH=0 yarn boot',
+			'SHOULD_WATCH_VIEWS=true MAXIMUM_LOG_PREFIXES_LENGTH=0 yarn boot',
 			{
 				code: 200,
 				callback: () => {

package/src/__tests__/support/EventFaker.ts

@@ -1,8 +1,7 @@
 import { SpruceSchemas } from '@sprucelabs/mercury-types'
 import { eventFaker } from '@sprucelabs/spruce-test-fixtures'
+import { ListPermContractsTargetAndPayload } from '../../features/permission/stores/PermissionStore'
 
-export type ListPermContractsTargetAndPayload =
-	SpruceSchemas.Mercury.v2020_12_25.ListPermissionContractsEmitTargetAndPayload
 export default class EventFaker {
 	public async fakeListPermissionContracts(
 		cb?: (

package/src/features/eventContract/EventContractFeature.ts

@@ -14,12 +14,7 @@ export default class EventContractFeature extends AbstractFeature {
 	public nameReadable = 'Event Contract'
 	public description =
 		'Pull core Mercury events down and write to single, portable, dependency-free, strongly typed contract.'
-	public dependencies: FeatureDependency[] = [
-		{
-			code: 'permission',
-			isRequired: true,
-		},
-	]
+	public dependencies: FeatureDependency[] = []
 	public packageDependencies = []
 
 	public actionsDir = diskUtil.resolvePath(__dirname, 'actions')

package/src/features/eventContract/actions/PullAction.ts

@@ -1,6 +1,5 @@
 import { buildSchema, SchemaValues } from '@sprucelabs/schema'
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
-import actionUtil from '../../../utilities/action.utility'
 import AbstractAction from '../../AbstractAction'
 import { FeatureActionResponse } from '../../features.types'
 
@@ -50,10 +49,11 @@ export type CoreEventContract = ${contracts
 
 		diskUtil.writeFile(destination, contents)
 
-		const results = await this.Action('permission', 'sync').execute({})
+		const typesFiles = await this.syncPermissions()
 
-		return actionUtil.mergeActionResults(results, {
+		return {
 			files: [
+				...typesFiles,
 				{
 					name: filename,
 					path: destination,
@@ -61,6 +61,24 @@ export type CoreEventContract = ${contracts
 					description: 'All your Mercury core events ready for testing!',
 				},
 			],
+		}
+	}
+
+	private async syncPermissions() {
+		const permissions = this.Store('permission')
+
+		const coreMap = await permissions.fetchContracts({
+			shouldSyncCorePermissions: true,
 		})
+
+		const heartwoodMap = await permissions.fetchContracts({
+			namespaces: ['heartwood'],
+		})
+
+		const typesFiles = await this.Writer('permission').writeTypesFile(
+			this.cwd,
+			{ ...coreMap, ...heartwoodMap }
+		)
+		return typesFiles
 	}
 }

package/src/features/permission/PermissionFeature.ts

@@ -1,3 +1,4 @@
+import { PermissionContractMap } from '@sprucelabs/mercury-types'
 import { diskUtil, NpmPackage } from '@sprucelabs/spruce-skill-utils'
 import AbstractFeature, {
 	FeatureDependency,
@@ -40,13 +41,8 @@ export default class PermissionFeature extends AbstractFeature {
 		const isInstalled = await this.features.isInstalled('permission')
 		const isSkillInstalled = await this.features.isInstalled('skill')
 
-		if (
-			isSkillInstalled &&
-			isInstalled &&
-			featureCode === 'node' &&
-			actionCode === 'upgrade'
-		) {
-			const combinedFile = await this.writePlugin()
+		if (isInstalled && featureCode === 'node' && actionCode === 'upgrade') {
+			const combinedFile = isSkillInstalled ? await this.writePlugin() : []
 			const results = await this.Action('permission', 'sync').execute({})
 
 			results.files = [...(results.files ?? []), ...combinedFile]
@@ -66,9 +62,10 @@ export default class PermissionFeature extends AbstractFeature {
 	}
 
 	private async writeTypesFile() {
-		return await this.writer.writeTypesFile(this.cwd, {
-			contracts: [],
-		})
+		return await this.writer.writeTypesFile(
+			this.cwd,
+			{} as PermissionContractMap
+		)
 	}
 
 	private async writePlugin() {

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

@@ -1,4 +1,4 @@
-import { buildSchema } from '@sprucelabs/schema'
+import { buildSchema, SchemaValues } from '@sprucelabs/schema'
 import AbstractAction from '../../AbstractAction'
 import { ActionOptions, FeatureActionResponse } from '../../features.types'
 import PermissionStore from '../stores/PermissionStore'
@@ -18,9 +18,23 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 		this.writer = this.Writer('permission')
 	}
 
-	public async execute(): Promise<FeatureActionResponse> {
-		const map = await this.permissions.fetchContracts()
-		const typesFiles = await this.writer.writeTypesFile(this.cwd, map)
+	public async execute(
+		options?: SyncPermissionsOptions
+	): Promise<FeatureActionResponse> {
+		const { shouldSyncCorePermissions } = this.validateAndNormalizeOptions(
+			options ?? {}
+		)
+
+		const permissions = this.permissions
+		const writer = this.writer
+		const cwd = this.cwd
+
+		const typesFiles = await writePermissionTypesFile({
+			permissions,
+			shouldSyncCorePermissions,
+			writer,
+			cwd,
+		})
 
 		const local = await this.permissions.loadLocalPermissions()
 		const combinedFiles = await this.writer.writeCombinedFile(this.cwd, {
@@ -36,7 +50,30 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 
 const schema = buildSchema({
 	id: 'syncPermissions',
-	fields: {},
+	fields: {
+		shouldSyncCorePermissions: {
+			type: 'boolean',
+		},
+	},
 })
 
 type OptionsSchema = typeof schema
+export type SyncPermissionsOptions = SchemaValues<OptionsSchema>
+
+export async function writePermissionTypesFile(options: {
+	permissions: PermissionStore
+	shouldSyncCorePermissions: boolean | undefined
+	namespaces?: string[]
+	writer: PermissionWriter
+	cwd: string
+}) {
+	const { permissions, shouldSyncCorePermissions, writer, cwd, namespaces } =
+		options
+
+	const map = await permissions.fetchContracts({
+		namespaces,
+		shouldSyncCorePermissions,
+	})
+	const typesFiles = await writer.writeTypesFile(cwd, map)
+	return typesFiles
+}