@sprucelabs/spruce-cli 22.3.0 → 23.0.0

package/package.json

@@ -17,7 +17,7 @@
 		]
 	},
 	"license": "MIT",
-	"version": "22.3.0",
+	"version": "23.0.0",
 	"bin": {
 		"spruce": "./build/index.js"
 	},
@@ -73,23 +73,23 @@
 	},
 	"dependencies": {
 		"@jest/reporters": "^29.7.0",
-		"@sprucelabs/error": "^6.0.537",
-		"@sprucelabs/globby": "^2.0.498",
-		"@sprucelabs/heartwood-view-controllers": "^111.1.0",
-		"@sprucelabs/jest-json-reporter": "^8.0.538",
-		"@sprucelabs/mercury-client": "^42.0.590",
-		"@sprucelabs/mercury-event-emitter": "^42.0.590",
-		"@sprucelabs/mercury-types": "^47.0.594",
-		"@sprucelabs/schema": "^30.0.553",
-		"@sprucelabs/spruce-core-schemas": "^40.1.540",
-		"@sprucelabs/spruce-event-utils": "^40.1.314",
-		"@sprucelabs/spruce-skill-utils": "^31.0.614",
-		"@sprucelabs/spruce-templates": "^22.3.0",
+		"@sprucelabs/error": "^6.0.556",
+		"@sprucelabs/globby": "^2.0.501",
+		"@sprucelabs/heartwood-view-controllers": "^113.0.1",
+		"@sprucelabs/jest-json-reporter": "^8.0.558",
+		"@sprucelabs/mercury-client": "^42.0.658",
+		"@sprucelabs/mercury-event-emitter": "^42.0.658",
+		"@sprucelabs/mercury-types": "^47.0.640",
+		"@sprucelabs/schema": "^31.0.3",
+		"@sprucelabs/spruce-core-schemas": "^40.1.585",
+		"@sprucelabs/spruce-event-utils": "^40.1.369",
+		"@sprucelabs/spruce-skill-utils": "^31.1.8",
+		"@sprucelabs/spruce-templates": "^23.0.0",
 		"@typescript-eslint/eslint-plugin": "^7.7.1",
 		"@typescript-eslint/parser": "^7.7.1",
 		"cfonts": "^3.3.0",
 		"chalk": "4.1.2",
-		"chokidar": "^4.0.1",
+		"chokidar": "^4.0.3",
 		"cli-table3": "^0.6.5",
 		"commander": "7.2.0",
 		"emphasize": "4.2.0",
@@ -106,27 +106,27 @@
 		"terminal-kit": "sprucelabsai/terminal-kit",
 		"tree-kill": "^1.2.2",
 		"tsutils": "^3.21.0",
-		"typescript": "^5.6.3",
-		"uuid": "^11.0.2"
+		"typescript": "^5.7.2",
+		"uuid": "^11.0.3"
 	},
 	"devDependencies": {
-		"@sprucelabs/data-stores": "^28.3.207",
-		"@sprucelabs/jest-sheets-reporter": "^3.0.182",
-		"@sprucelabs/mercury-core-events": "^25.0.35",
-		"@sprucelabs/resolve-path-aliases": "^2.0.513",
-		"@sprucelabs/spruce-conversation-plugin": "^62.4.2",
-		"@sprucelabs/spruce-deploy-plugin": "^62.4.2",
-		"@sprucelabs/spruce-store-plugin": "^62.4.2",
-		"@sprucelabs/spruce-test-fixtures": "^62.4.2",
-		"@sprucelabs/test": "^9.0.57",
-		"@sprucelabs/test-utils": "^5.1.496",
+		"@sprucelabs/data-stores": "^28.3.281",
+		"@sprucelabs/jest-sheets-reporter": "^3.0.197",
+		"@sprucelabs/mercury-core-events": "^25.0.104",
+		"@sprucelabs/resolve-path-aliases": "^2.0.523",
+		"@sprucelabs/spruce-conversation-plugin": "^62.6.12",
+		"@sprucelabs/spruce-deploy-plugin": "^62.6.12",
+		"@sprucelabs/spruce-store-plugin": "^62.6.12",
+		"@sprucelabs/spruce-test-fixtures": "^62.6.12",
+		"@sprucelabs/test": "^9.0.64",
+		"@sprucelabs/test-utils": "^5.1.529",
 		"@types/blessed": "^0.1.25",
 		"@types/eslint": "^9.6.1",
 		"@types/fs-extra": "^11.0.4",
 		"@types/inquirer": "^9.0.7",
 		"@types/lodash": "^4.17.13",
 		"@types/md5": "^2.3.5",
-		"@types/node": "^22.8.7",
+		"@types/node": "^22.10.2",
 		"@types/promise.allsettled": "^1.0.6",
 		"@types/ps-node": "^0.1.3",
 		"@types/semver": "^7.5.8",
@@ -138,8 +138,8 @@
 		"chokidar-cli": "^3.0.0",
 		"concurrently": "^9.1.0",
 		"conventional-changelog-sprucelabs": "2.0.1",
-		"dotenv": "^16.4.5",
-		"eslint": "^9.14.0",
+		"dotenv": "^16.4.7",
+		"eslint": "^9.17.0",
 		"eslint-config-spruce": "^11.2.26",
 		"find-process": "^1.4.7",
 		"jest": "^29.7.0",
@@ -150,7 +150,7 @@
 		"ps-node": "^0.1.6",
 		"ts-jest": "^29.2.5",
 		"ts-node": "^10.9.2",
-		"tsc-watch": "^6.2.0",
+		"tsc-watch": "^6.2.1",
 		"tsconfig-paths": "^4.2.0"
 	},
 	"testSkillCache": {

package/src/.spruce/errors/errors.types.ts

@@ -1293,19 +1293,19 @@ export declare namespace SpruceErrors.SpruceCli {
 export declare namespace SpruceErrors.SpruceCli {
 
 	
-	export interface AppViewControllerAlreadyExists {
+	export interface AppControllerAlreadyExists {
 		
 	}
 
-	export interface AppViewControllerAlreadyExistsSchema extends SpruceSchema.Schema {
-		id: 'appViewControllerAlreadyExists',
+	export interface AppControllerAlreadyExistsSchema extends SpruceSchema.Schema {
+		id: 'appControllerAlreadyExists',
 		namespace: 'SpruceCli',
 		name: 'App view controller already exists',
 		    fields: {
 		    }
 	}
 
-	export type AppViewControllerAlreadyExistsEntity = SchemaEntity<SpruceErrors.SpruceCli.AppViewControllerAlreadyExistsSchema>
+	export type AppControllerAlreadyExistsEntity = SchemaEntity<SpruceErrors.SpruceCli.AppControllerAlreadyExistsSchema>
 
 }
 

package/src/.spruce/errors/options.types.ts

@@ -124,13 +124,13 @@ export interface BuildFailedErrorOptions extends SpruceErrors.SpruceCli.BuildFai
 export interface BootErrorErrorOptions extends SpruceErrors.SpruceCli.BootError, ISpruceErrorOptions {
 	code: 'BOOT_ERROR'
 }
-export interface AppViewControllerAlreadyExistsErrorOptions extends SpruceErrors.SpruceCli.AppViewControllerAlreadyExists, ISpruceErrorOptions {
-	code: 'APP_VIEW_CONTROLLER_ALREADY_EXISTS'
+export interface AppControllerAlreadyExistsErrorOptions extends SpruceErrors.SpruceCli.AppControllerAlreadyExists, ISpruceErrorOptions {
+	code: 'APP_CONTROLLER_ALREADY_EXISTS'
 }
 export interface ActionCancelledErrorOptions extends SpruceErrors.SpruceCli.ActionCancelled, ISpruceErrorOptions {
 	code: 'ACTION_CANCELLED'
 }
 
-type ErrorOptions =  | VscodeNotInstalledErrorOptions  | ViewPluginAlreadyExistsErrorOptions  | TransportAlreadyExistsErrorOptions  | ThemeExistsErrorOptions  | TestFailedErrorOptions  | StoreExistsErrorOptions  | SkillViewExistsErrorOptions  | SkillNotRegisteredErrorOptions  | SkillNotFoundErrorOptions  | SchemaTemplateItemBuildingFailedErrorOptions  | SchemaFailedToImportErrorOptions  | SchemaExistsErrorOptions  | NotLoggedInErrorOptions  | NotImplementedErrorOptions  | NoSkillsRegisteredErrorOptions  | NoOrganizationsFoundErrorOptions  | MissingDependenciesErrorOptions  | MercuryResponseErrorErrorOptions  | LintFailedErrorOptions  | InvalidTestDirectoryErrorOptions  | InvalidFeatureCodeErrorOptions  | InvalidEventContractErrorOptions  | InvalidCommandErrorOptions  | GenericErrorOptions  | FileExistsErrorOptions  | FeatureNotInstalledErrorOptions  | FailedToImportErrorOptions  | ExecutingCommandFailedErrorOptions  | DockerNotStartedErrorOptions  | DirectoryNotSkillErrorOptions  | DirectoryEmptyErrorOptions  | DeployFailedErrorOptions  | DependencyExistsErrorOptions  | CreateAutoloaderFailedErrorOptions  | CommandNotImplementedErrorOptions  | CommandBlockedErrorOptions  | CommandAbortedErrorOptions  | CannotPromptInCiErrorOptions  | CacheNotEnabledErrorOptions  | BuildFailedErrorOptions  | BootErrorErrorOptions  | AppViewControllerAlreadyExistsErrorOptions  | ActionCancelledErrorOptions 
+type ErrorOptions =  | VscodeNotInstalledErrorOptions  | ViewPluginAlreadyExistsErrorOptions  | TransportAlreadyExistsErrorOptions  | ThemeExistsErrorOptions  | TestFailedErrorOptions  | StoreExistsErrorOptions  | SkillViewExistsErrorOptions  | SkillNotRegisteredErrorOptions  | SkillNotFoundErrorOptions  | SchemaTemplateItemBuildingFailedErrorOptions  | SchemaFailedToImportErrorOptions  | SchemaExistsErrorOptions  | NotLoggedInErrorOptions  | NotImplementedErrorOptions  | NoSkillsRegisteredErrorOptions  | NoOrganizationsFoundErrorOptions  | MissingDependenciesErrorOptions  | MercuryResponseErrorErrorOptions  | LintFailedErrorOptions  | InvalidTestDirectoryErrorOptions  | InvalidFeatureCodeErrorOptions  | InvalidEventContractErrorOptions  | InvalidCommandErrorOptions  | GenericErrorOptions  | FileExistsErrorOptions  | FeatureNotInstalledErrorOptions  | FailedToImportErrorOptions  | ExecutingCommandFailedErrorOptions  | DockerNotStartedErrorOptions  | DirectoryNotSkillErrorOptions  | DirectoryEmptyErrorOptions  | DeployFailedErrorOptions  | DependencyExistsErrorOptions  | CreateAutoloaderFailedErrorOptions  | CommandNotImplementedErrorOptions  | CommandBlockedErrorOptions  | CommandAbortedErrorOptions  | CannotPromptInCiErrorOptions  | CacheNotEnabledErrorOptions  | BuildFailedErrorOptions  | BootErrorErrorOptions  | AppControllerAlreadyExistsErrorOptions  | ActionCancelledErrorOptions 
 
 export default ErrorOptions

package/src/.spruce/errors/spruceCli/appControllerAlreadyExists.schema.ts

@@ -0,0 +1,16 @@
+import { SchemaRegistry } from '@sprucelabs/schema'
+import { SpruceErrors } from '../errors.types'
+
+
+
+const appControllerAlreadyExistsSchema: SpruceErrors.SpruceCli.AppControllerAlreadyExistsSchema  = {
+	id: 'appControllerAlreadyExists',
+	namespace: 'SpruceCli',
+	name: 'App view controller already exists',
+	    fields: {
+	    }
+}
+
+SchemaRegistry.getInstance().trackSchema(appControllerAlreadyExistsSchema)
+
+export default appControllerAlreadyExistsSchema

package/src/.spruce/schemas/schemas.types.ts

@@ -75,7 +75,7 @@ declare module '@sprucelabs/spruce-core-schemas/build/.spruce/schemas/core.schem
 		interface WatcherDidDetectChangesEmitPayload {
 			
 				
-				'changes': ({ schemaId: 'generatedFile', version: 'v2020_07_22', values: SpruceSchemas.SpruceCli.v2020_07_22.GeneratedFile } | { schemaId: 'generatedDir', version: 'v2020_07_22', values: SpruceSchemas.SpruceCli.v2020_07_22.GeneratedDir })[]
+				'changes': ({ id: 'generatedFile', values: SpruceSchemas.SpruceCli.v2020_07_22.GeneratedFile } | { id: 'generatedDir', values: SpruceSchemas.SpruceCli.v2020_07_22.GeneratedDir })[]
 		}
 
 		interface WatcherDidDetectChangesEmitPayloadSchema extends SpruceSchema.Schema {

package/src/__tests__/behavioral/schemas/HandlesRelatedSchemas.test.ts

@@ -48,7 +48,7 @@ export default class HandlesRelatedSchemasTest extends AbstractSchemaTest {
 
         assert.doesInclude(
             typesContent,
-            "[fullyQualifiedEventName:string]: { schemaId: 'eventSignature', version: 'v2020_07_22', values: SpruceSchemas.TestingSchemas.v2020_07_22.EventSignature } | { schemaId: 'eventSignature2', version: 'v2020_07_22', values: SpruceSchemas.TestingSchemas.v2020_07_22.EventSignature2 }"
+            "[fullyQualifiedEventName:string]: { id: 'eventSignature', values: SpruceSchemas.TestingSchemas.v2020_07_22.EventSignature } | { id: 'eventSignature2', values: SpruceSchemas.TestingSchemas.v2020_07_22.EventSignature2 }"
         )
 
         await this.Service('typeChecker').check(typesPath)

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

@@ -1,12 +1,13 @@
-import { diskUtil } from '@sprucelabs/spruce-skill-utils'
+import { diskUtil, namesUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert, errorAssert, generateId } from '@sprucelabs/test-utils'
 import CreateAppAction from '../../../features/view/actions/CreateAppAction'
 import AbstractSkillTest from '../../../tests/AbstractSkillTest'
 import testUtil from '../../../tests/utilities/test.utility'
 
-export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
+export default class CreatingAnAppControllerTest extends AbstractSkillTest {
     protected static skillCacheKey = 'views'
-    private static avcPath: string
+    private static acPath: string
+    private static skillNamespace = generateId().replace(/\d/g, '')
 
     private static action: CreateAppAction
     private static lastExecution: {
@@ -16,7 +17,9 @@ export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
 
     protected static async beforeAll(): Promise<void> {
         await super.beforeAll()
-        this.avcPath = this.resolvePath('src/App.avc.ts')
+        this.acPath = this.resolvePath('src/App.ac.ts')
+        const pgk = this.Service('pkg')
+        pgk.set({ path: 'skill.namespace', value: this.skillNamespace })
     }
 
     protected static async beforeEach(): Promise<void> {
@@ -33,12 +36,12 @@ export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
         const results = await this.execute()
         assert.isFalsy(results.errors)
 
-        testUtil.assertFileByPathInGeneratedFiles(this.avcPath, results.files)
+        testUtil.assertFileByPathInGeneratedFiles(this.acPath, results.files)
 
         assert.doesInclude(results.files, {
             action: 'generated',
-            name: 'App.avc.ts',
-            path: this.avcPath,
+            name: 'App.ac.ts',
+            path: this.acPath,
         })
 
         assert.doesInclude(results.files, {
@@ -50,7 +53,6 @@ export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
 
     @test()
     protected static async syncsViewsOnCreation() {
-        debugger
         assert.doesInclude(this.lastExecution, {
             actionCode: 'sync',
             featureCode: 'view',
@@ -68,22 +70,22 @@ export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
     }
 
     @test()
-    protected static async avcIncludesExpectedContents() {
-        const contents = diskUtil.readFile(this.avcPath)
+    protected static async acIncludesExpectedContents() {
+        const contents = diskUtil.readFile(this.acPath)
         assert.doesInclude(
             contents,
-            'export default class AppViewControllerImpl extends AbstractAppViewController'
+            `export default class ${this.className} extends AbstractAppController`
         )
 
         assert.doesInclude(
             contents,
-            'public async (_options: AppViewControllerLoadOptions)'
+            'public async load(_options: AppControllerLoadOptions)'
         )
     }
 
     @test()
     protected static async generatedFilesAreValid() {
-        await this.Service('typeChecker').check(this.avcPath)
+        await this.Service('typeChecker').check(this.acPath)
         await this.assertCombinedViewsFileIsValid()
     }
 
@@ -96,36 +98,62 @@ export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
     @test()
     protected static async callsHeartwoodImportFunctionAsExpected() {
         this.assertCombinedViewsContains(
-            'heartwood({ vcs, pluginsByName, App: AppViewControllerImpl })'
+            `heartwood({ vcs, pluginsByName, App: ${this.className} })`
         )
     }
 
     @test()
-    protected static async throwsEvenIfAppAvcMoves() {
-        const destination = this.resolvePath(`src/${generateId()}/App.avc.ts`)
-        diskUtil.moveFile(this.avcPath, destination)
+    protected static async combineViewsTypesAsExpected() {
+        const expected = `interface AppControllerMap {
+        '${this.skillNamespace}' : ${this.className}
+}`
+
+        this.assertCombinedViewsContains(expected)
+    }
+
+    @test()
+    protected static async throwsEvenIfAppMoves() {
+        const destination = this.resolvePath(`src/${generateId()}/App.ac.ts`)
+        diskUtil.moveFile(this.acPath, destination)
 
         await this.executeAndAssertThrowsAvcExists()
-        this.avcPath = destination
+        this.acPath = destination
     }
 
     @test()
-    protected static async canRenameAppAvcAndItUpdatesCombinedViews() {
-        const contents = diskUtil.readFile(this.avcPath)
+    protected static async canRenameAppAndItUpdatesCombinedViews() {
+        const contents = diskUtil.readFile(this.acPath)
         const updatedContents = contents.replace(
-            'AppViewControllerImpl',
-            'NewAppViewControllerImpl'
+            this.className,
+            'NewAppControllerImpl'
         )
-        diskUtil.writeFile(this.avcPath, updatedContents)
+        diskUtil.writeFile(this.acPath, updatedContents)
         await this.Action('view', 'sync').execute({})
 
         this.assertCombinedViewsContains(
-            'heartwood({ vcs, pluginsByName, App: NewAppViewControllerImpl })'
+            'heartwood({ vcs, pluginsByName, App: NewAppControllerImpl  })'
         )
 
         await this.assertCombinedViewsFileIsValid()
     }
 
+    @test()
+    protected static async importsAppFromCombinedViews() {
+        const testScript =
+            `import { App } from '#` +
+            `spruce/views/views'
+const app = new App({} as any)
+console.log(app)
+if (App.id !== '${this.skillNamespace}') {
+        throw new Error('App.id is not correct')
+}`
+
+        const testScriptPath = this.resolvePath('src/test.ts')
+        diskUtil.writeFile(testScriptPath, testScript)
+
+        await this.Service('typeChecker').check(testScriptPath)
+    }
+
     private static async assertCombinedViewsFileIsValid() {
         await this.Service('typeChecker').check(this.combinedViewsPath)
     }
@@ -143,12 +171,16 @@ export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
         return this.resolveHashSprucePath('views', 'views.ts')
     }
 
+    private static get className() {
+        return `${namesUtil.toPascal(this.skillNamespace)}AppController`
+    }
+
     private static async executeAndAssertThrowsAvcExists() {
         const results = await this.execute()
         assert.isTruthy(results.errors)
         errorAssert.assertError(
             results.errors[0],
-            'APP_VIEW_CONTROLLER_ALREADY_EXISTS'
+            'APP_CONTROLLER_ALREADY_EXISTS'
         )
     }
 

package/src/__tests__/behavioral/views/CreatingViewControllers.test.ts

@@ -0,0 +1,28 @@
+import { diskUtil } from '@sprucelabs/spruce-skill-utils'
+import { test, assert } from '@sprucelabs/test-utils'
+import CreateAction from '../../../features/view/actions/CreateAction'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+
+export default class CreatingViewControllersTest extends AbstractSkillTest {
+    protected static skillCacheKey = 'views'
+
+    @test()
+    protected static async canCreateListViewController() {
+        const action = this.Action('view', 'create') as CreateAction
+        const results = await action.execute({
+            viewType: 'view',
+            isRoot: false,
+            viewModel: 'List',
+            nameReadable: 'My List',
+            namePascal: 'MyList',
+        })
+
+        assert.isFalsy(results.errors)
+
+        const file = results.files?.[0]
+        assert.isTruthy(file?.path)
+        const contents = diskUtil.readFile(file.path)
+
+        assert.doesInclude(contents, 'extends AbstractViewController<List>')
+    }
+}

package/src/__tests__/behavioral/views/KeepingViewsInSync.test.ts

@@ -1,3 +1,4 @@
+import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
 import { FeatureActionResponse } from '../../../features/features.types'
 import SyncAction from '../../../features/view/actions/SyncAction'
@@ -46,6 +47,21 @@ export default class KeepingViewsInSyncTest extends AbstractSkillTest {
         await this.assertValuedViewsFile(results)
     }
 
+    @test()
+    protected static async exportUndefinedApp() {
+        const testScript =
+            `import { App } from '#` +
+            `spruce/views/views'
+        if (App !== undefined) {
+            throw new Error('App should be undefined')
+        }`
+
+        const testScriptPath = this.resolvePath('src/test.ts')
+        diskUtil.writeFile(testScriptPath, testScript)
+
+        await this.Service('typeChecker').check(testScriptPath)
+    }
+
     private static async assertValuedViewsFile(results: FeatureActionResponse) {
         const match = testUtil.assertFileByPathInGeneratedFiles(
             `views/views.ts`,

package/src/__tests__/behavioral/watchers/WatchingForChanges.test.ts

@@ -1,4 +1,4 @@
-import { CORE_SCHEMA_VERSION, diskUtil } from '@sprucelabs/spruce-skill-utils'
+import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import { test, assert } from '@sprucelabs/test-utils'
 import WatchFeature from '../../../features/watch/WatchFeature'
 import AbstractCliTest from '../../../tests/AbstractCliTest'
@@ -98,8 +98,7 @@ export default class WatchingForChangesTest extends AbstractCliTest {
                 'console.log("hello world")'
             )
             expectedChanges.push({
-                schemaId: 'generatedFile',
-                version: CORE_SCHEMA_VERSION.constValue,
+                id: 'generatedFile',
                 values: {
                     action: 'generated',
                     path: this.resolvePath('build', filename),
@@ -126,8 +125,7 @@ export default class WatchingForChangesTest extends AbstractCliTest {
 
             const expected: GeneratedFileOrDir[] = [
                 {
-                    schemaId: 'generatedDir',
-                    version: 'v2020_07_22',
+                    id: 'generatedDir',
                     values: {
                         action: 'generated',
                         name: 'new_dir',
@@ -149,8 +147,7 @@ export default class WatchingForChangesTest extends AbstractCliTest {
 
             const expected: GeneratedFileOrDir[] = [
                 {
-                    schemaId: 'generatedDir',
-                    version: 'v2020_07_22',
+                    id: 'generatedDir',
                     values: {
                         action: 'deleted',
                         name: 'new_dir',
@@ -173,8 +170,7 @@ export default class WatchingForChangesTest extends AbstractCliTest {
 
             const expected: GeneratedFileOrDir[] = [
                 {
-                    schemaId: 'generatedFile',
-                    version: 'v2020_07_22',
+                    id: 'generatedFile',
                     values: {
                         action: 'deleted',
                         name: 'test.js',
@@ -199,8 +195,7 @@ export default class WatchingForChangesTest extends AbstractCliTest {
 
             const expected: GeneratedFileOrDir[] = [
                 {
-                    schemaId: 'generatedFile',
-                    version: 'v2020_07_22',
+                    id: 'generatedFile',
                     values: {
                         action: 'deleted',
                         name: 'test.js',

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

@@ -95,7 +95,7 @@ export default class SchemaValueTypeGenerationTest extends AbstractSchemaTest {
         'generates dynamic field with nested schemas',
         `${LOCAL_NAMESPACE}.mercuryContract.${CORE_SCHEMA_VERSION.constValue}.__dynamicFieldSignature.valueTypes`,
         {
-            type: `{ schemaId: 'eventSignature', version: 'v2020_07_22', values: SpruceSchemas.${LOCAL_NAMESPACE}.v2020_07_22.EventSignature } | { schemaId: 'eventSignature2', version: 'v2020_07_22', values: SpruceSchemas.${LOCAL_NAMESPACE}.v2020_07_22.EventSignature2 }`,
+            type: `{ id: 'eventSignature', values: SpruceSchemas.${LOCAL_NAMESPACE}.v2020_07_22.EventSignature } | { id: 'eventSignature2', values: SpruceSchemas.${LOCAL_NAMESPACE}.v2020_07_22.EventSignature2 }`,
             value: '[eventSignatureSchema_v2020_07_22, eventSignature2Schema_v2020_07_22]',
             schemaType: `(SpruceSchemas.${LOCAL_NAMESPACE}.v2020_07_22.EventSignatureSchema | SpruceSchemas.${LOCAL_NAMESPACE}.v2020_07_22.EventSignature2Schema)[]`,
         }

package/src/errors/SpruceError.ts

@@ -273,8 +273,8 @@ export default class SpruceError extends AbstractSpruceError<ErrorOptions> {
                 message = 'A cannot prompt in ci just happened!'
                 break
 
-            case 'APP_VIEW_CONTROLLER_ALREADY_EXISTS':
-                message = `You already have an AppViewController! Run \`spruce sync.views\` if you are having issues.`
+            case 'APP_CONTROLLER_ALREADY_EXISTS':
+                message = `You already have an AppController! Run \`spruce sync.views\` if you are having issues.`
                 break
 
             default:

package/src/errors/{appViewControllerAlreadyExists.builder.ts → appControllerAlreadyExists.builder.ts}

@@ -1,7 +1,7 @@
 import { buildErrorSchema } from '@sprucelabs/schema'
 
 export default buildErrorSchema({
-    id: 'appViewControllerAlreadyExists',
+    id: 'appControllerAlreadyExists',
     name: 'App view controller already exists',
     fields: {},
 })

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

@@ -26,6 +26,9 @@ export default class InstallFeatureAction extends AbstractAction<OptionsSchema>
 
             code = await this.promptForFeature(choices)
         }
+
+        this.ui.startLoading('Installing feature...')
+
         const results = await this.features.install({
             features: [{ code: code as any }],
         })

package/src/features/validateAndNormalize.utility.ts

@@ -3,6 +3,7 @@ import {
     normalizeSchemaValues,
     Schema,
     SchemaPartialValues,
+    SchemaValues,
     SchemaValuesWithDefaults,
     validateSchemaValues,
 } from '@sprucelabs/schema'
@@ -19,7 +20,7 @@ const validateAndNormalizer = {
         const values = {
             ...defaultSchemaValues(schema),
             ...this.stripUndefined(options),
-        } as SchemaPartialValues<S, false>
+        } as SchemaValues<S>
 
         validateSchemaValues(schema, values, {})
 

package/src/features/view/actions/CreateAppAction.ts

@@ -6,11 +6,16 @@ import { FeatureActionResponse } from '../../features.types'
 export default class CreateAppAction extends AbstractAction<OptionsSchema> {
     public optionsSchema = optionsSchema
     public invocationMessage = 'Creating new app view controller... '
-    public readonly commandAliases = ['create.avc']
+    public readonly commandAliases = ['create.avc', 'create.app']
 
     public async execute(): Promise<FeatureActionResponse> {
         const writer = this.Writer('view', {})
-        const files = await writer.writeAppViewController(this.cwd)
+        const id = await this.Store('skill').loadCurrentSkillsNamespace()
+        const files = await writer.writeAppController(
+            this.cwd,
+            id.toLocaleLowerCase(),
+            id
+        )
 
         const results = await this.Action('view', 'sync').execute({})
         const merged = actionUtil.mergeActionResults(
@@ -25,7 +30,7 @@ export default class CreateAppAction extends AbstractAction<OptionsSchema> {
 }
 
 const optionsSchema = buildSchema({
-    id: 'createAppViewControllerOptions',
+    id: 'createAppControllerOptions',
     fields: {},
 })
 

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

@@ -19,7 +19,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
     public async execute(): Promise<FeatureActionResponse> {
         const targetDir = diskUtil.resolvePath(this.cwd, 'src')
         const matches = await globby(
-            ['**/*.svc.ts', '**/*.vc.ts', '**/*.view.plugin.ts', '**/*.avc.ts'],
+            ['**/*.svc.ts', '**/*.vc.ts', '**/*.view.plugin.ts', '**/*.ac.ts'],
             {
                 cwd: targetDir,
             }
@@ -39,8 +39,12 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 
         introspect.forEach(({ classes }) => {
             for (const thisClass of classes) {
-                const { vc, svc, plugin, avc } =
-                    this.mapIntrospectedClassToTemplateItem(thisClass)
+                const {
+                    vc,
+                    svc,
+                    plugin,
+                    ac: avc,
+                } = this.mapIntrospectedClassToTemplateItem(thisClass)
 
                 if (vc) {
                     vcTemplateItems.push(vc)
@@ -77,7 +81,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
         vc?: VcTemplateItem
         svc?: VcTemplateItem
         plugin?: ViewControllerPluginItem
-        avc?: VcTemplateItem
+        ac?: VcTemplateItem
     } {
         const item = {
             id: c.staticProperties.id,
@@ -87,13 +91,13 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
 
         let vc: VcTemplateItem | undefined
         let svc: VcTemplateItem | undefined
-        let avc: VcTemplateItem | undefined
+        let ac: VcTemplateItem | undefined
         let plugin: ViewControllerPluginItem | undefined
 
         if (c.classPath.endsWith('.svc.ts')) {
             svc = item
-        } else if (c.classPath.endsWith('avc.ts')) {
-            avc = item
+        } else if (c.classPath.endsWith('ac.ts')) {
+            ac = item
         } else if (c.classPath.endsWith('view.plugin.ts')) {
             const nameCamel = c.classPath.match(/([^/]+).view.plugin.ts$/)![1]
             plugin = { ...item, nameCamel }
@@ -101,7 +105,7 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
             vc = item
         }
 
-        return { svc, vc, plugin, avc }
+        return { svc, vc, plugin, ac }
     }
 }