@sprucelabs/spruce-cli 22.3.0 → 23.0.0

package/build/.spruce/errors/errors.types.d.ts

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

package/build/.spruce/errors/options.types.d.ts

@@ -123,11 +123,11 @@ 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/build/.spruce/errors/spruceCli/appControllerAlreadyExists.schema.d.ts

@@ -0,0 +1,3 @@
+import { SpruceErrors } from '../errors.types';
+declare const appControllerAlreadyExistsSchema: SpruceErrors.SpruceCli.AppControllerAlreadyExistsSchema;
+export default appControllerAlreadyExistsSchema;

package/build/.spruce/errors/spruceCli/appControllerAlreadyExists.schema.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+const appControllerAlreadyExistsSchema = {
+    id: 'appControllerAlreadyExists',
+    namespace: 'SpruceCli',
+    name: 'App view controller already exists',
+    fields: {}
+};
+schema_1.SchemaRegistry.getInstance().trackSchema(appControllerAlreadyExistsSchema);
+exports.default = appControllerAlreadyExistsSchema;
+//# sourceMappingURL=appControllerAlreadyExists.schema.js.map

package/build/.spruce/errors/spruceCli/appControllerAlreadyExists.schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appControllerAlreadyExists.schema.js","sourceRoot":"","sources":["../../../../src/.spruce/errors/spruceCli/appControllerAlreadyExists.schema.ts"],"names":[],"mappings":";;AAAA,+CAAmD;AAKnD,MAAM,gCAAgC,GAA6D;IAClG,EAAE,EAAE,4BAA4B;IAChC,SAAS,EAAE,WAAW;IACtB,IAAI,EAAE,oCAAoC;IACtC,MAAM,EAAE,EACP;CACL,CAAA;AAED,uBAAc,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,gCAAgC,CAAC,CAAA;AAE1E,kBAAe,gCAAgC,CAAA"}

package/build/.spruce/schemas/schemas.types.d.ts

@@ -62,12 +62,10 @@ declare module '@sprucelabs/spruce-core-schemas/build/.spruce/schemas/core.schem
     namespace SpruceSchemas.SpruceCli.v2020_07_22 {
         interface WatcherDidDetectChangesEmitPayload {
             'changes': ({
-                schemaId: 'generatedFile';
-                version: 'v2020_07_22';
+                id: 'generatedFile';
                 values: SpruceSchemas.SpruceCli.v2020_07_22.GeneratedFile;
             } | {
-                schemaId: 'generatedDir';
-                version: 'v2020_07_22';
+                id: 'generatedDir';
                 values: SpruceSchemas.SpruceCli.v2020_07_22.GeneratedDir;
             })[];
         }

package/build/__tests__/behavioral/onboard/StartingOnboarding.test.js

@@ -21,13 +21,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/build/__tests__/behavioral/onboard/StartingOnboarding.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"StartingOnboarding.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/onboard/StartingOnboarding.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StartingOnboarding.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/onboard/StartingOnboarding.test.ts"],"names":[],"mappings":"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"}

package/build/__tests__/behavioral/schemas/HandlesRelatedSchemas.test.js

@@ -29,7 +29,7 @@ class HandlesRelatedSchemasTest extends AbstractSchemaTest_1.default {
         const results = await this.Action('schema', 'sync').execute({});
         const typesPath = this.resolveHashSprucePath('schemas', 'schemas.types.ts');
         const typesContent = spruce_skill_utils_1.diskUtil.readFile(typesPath);
-        test_utils_1.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 }");
+        test_utils_1.assert.doesInclude(typesContent, "[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);
         const schemaMatch = test_utility_1.default.assertFileByNameInGeneratedFiles('mercuryContract.schema.ts', results.files);
         await this.Service('typeChecker').check(schemaMatch);

package/build/__tests__/behavioral/schemas/HandlesRelatedSchemas.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"HandlesRelatedSchemas.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/schemas/HandlesRelatedSchemas.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HandlesRelatedSchemas.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/schemas/HandlesRelatedSchemas.test.ts"],"names":[],"mappings":"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"}

package/build/__tests__/behavioral/schemas/UsingSchemasInCli.test.js

@@ -21,13 +21,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/build/__tests__/behavioral/schemas/UsingSchemasInCli.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"UsingSchemasInCli.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/schemas/UsingSchemasInCli.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAuC;AACvC,qEAAqE;AACrE,0HAAwF;AAExF,MAAqB,iBAAkB,SAAQ,oBAAc;IAElC,AAAb,MAAM,CAAC,KAAK,CAAC,iBAAiB;QACpC,MAAM,IAAI,GAAG,IAAI,gBAAM,CAAC,gCAAa,EAAE;YACnC,UAAU,EAAE,OAAO;SACtB,CAAC,CAAA;QACF,mBAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAA;IACnD,CAAC;CACJ;AARD,oCAQC;AAN0B;IADtB,IAAA,iBAAI,GAAE;gDAMN"}
+{"version":3,"file":"UsingSchemasInCli.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/schemas/UsingSchemasInCli.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAuC;AACvC,qEAAqE;AACrE,0HAAwF;AAExF,MAAqB,iBAAkB,SAAQ,oBAAc;IAElC,AAAb,MAAM,CAAC,KAAK,CAAC,iBAAiB;QACpC,MAAM,IAAI,GAAG,IAAI,gBAAM,CAAC,gCAAa,EAAE;YACnC,UAAU,EAAE,OAAO;SACtB,CAAC,CAAA;QACF,mBAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAA;IACnD,CAAC;CACJ;AARD,oCAQC;AAN0B;IADtB,IAAA,iBAAI,GAAE;gDAMN"}

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

@@ -1,7 +1,8 @@
 import AbstractSkillTest from '../../../tests/AbstractSkillTest';
-export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
+export default class CreatingAnAppControllerTest extends AbstractSkillTest {
     protected static skillCacheKey: string;
-    private static avcPath;
+    private static acPath;
+    private static skillNamespace;
     private static action;
     private static lastExecution;
     protected static beforeAll(): Promise<void>;
@@ -9,15 +10,18 @@ export default class CreatingAnAppViewControllerTest extends AbstractSkillTest {
     protected static generatesExpectedFile(): Promise<void>;
     protected static syncsViewsOnCreation(): Promise<void>;
     protected static throwsIfAppAlreadyExists(): Promise<void>;
-    protected static avcIncludesExpectedContents(): Promise<void>;
+    protected static acIncludesExpectedContents(): Promise<void>;
     protected static generatedFilesAreValid(): Promise<void>;
     protected static doesNotDropAppIntoSkillViewTypes(): Promise<void>;
     protected static callsHeartwoodImportFunctionAsExpected(): Promise<void>;
-    protected static throwsEvenIfAppAvcMoves(): Promise<void>;
-    protected static canRenameAppAvcAndItUpdatesCombinedViews(): Promise<void>;
+    protected static combineViewsTypesAsExpected(): Promise<void>;
+    protected static throwsEvenIfAppMoves(): Promise<void>;
+    protected static canRenameAppAndItUpdatesCombinedViews(): Promise<void>;
+    protected static importsAppFromCombinedViews(): Promise<void>;
     private static assertCombinedViewsFileIsValid;
     private static assertCombinedViewsContains;
     private static get combinedViewsPath();
+    private static get className();
     private static executeAndAssertThrowsAvcExists;
     private static execute;
 }

package/build/__tests__/behavioral/views/{CreatingAnAppViewController.test.js → CreatingAnAppController.test.js}

@@ -13,14 +13,17 @@ const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
 const test_utils_1 = require("@sprucelabs/test-utils");
 const AbstractSkillTest_1 = __importDefault(require("../../../tests/AbstractSkillTest"));
 const test_utility_1 = __importDefault(require("../../../tests/utilities/test.utility"));
-class CreatingAnAppViewControllerTest extends AbstractSkillTest_1.default {
+class CreatingAnAppControllerTest extends AbstractSkillTest_1.default {
     static skillCacheKey = 'views';
-    static avcPath;
+    static acPath;
+    static skillNamespace = (0, test_utils_1.generateId)().replace(/\d/g, '');
     static action;
     static lastExecution = [];
     static async beforeAll() {
         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 });
     }
     static async beforeEach() {
         await super.beforeEach();
@@ -32,11 +35,11 @@ class CreatingAnAppViewControllerTest extends AbstractSkillTest_1.default {
     static async generatesExpectedFile() {
         const results = await this.execute();
         test_utils_1.assert.isFalsy(results.errors);
-        test_utility_1.default.assertFileByPathInGeneratedFiles(this.avcPath, results.files);
+        test_utility_1.default.assertFileByPathInGeneratedFiles(this.acPath, results.files);
         test_utils_1.assert.doesInclude(results.files, {
             action: 'generated',
-            name: 'App.avc.ts',
-            path: this.avcPath,
+            name: 'App.ac.ts',
+            path: this.acPath,
         });
         test_utils_1.assert.doesInclude(results.files, {
             action: 'generated',
@@ -45,7 +48,6 @@ class CreatingAnAppViewControllerTest extends AbstractSkillTest_1.default {
         });
     }
     static async syncsViewsOnCreation() {
-        debugger;
         test_utils_1.assert.doesInclude(this.lastExecution, {
             actionCode: 'sync',
             featureCode: 'view',
@@ -56,13 +58,13 @@ class CreatingAnAppViewControllerTest extends AbstractSkillTest_1.default {
     static async throwsIfAppAlreadyExists() {
         await this.executeAndAssertThrowsAvcExists();
     }
-    static async avcIncludesExpectedContents() {
-        const contents = spruce_skill_utils_1.diskUtil.readFile(this.avcPath);
-        test_utils_1.assert.doesInclude(contents, 'export default class AppViewControllerImpl extends AbstractAppViewController');
-        test_utils_1.assert.doesInclude(contents, 'public async (_options: AppViewControllerLoadOptions)');
+    static async acIncludesExpectedContents() {
+        const contents = spruce_skill_utils_1.diskUtil.readFile(this.acPath);
+        test_utils_1.assert.doesInclude(contents, `export default class ${this.className} extends AbstractAppController`);
+        test_utils_1.assert.doesInclude(contents, 'public async load(_options: AppControllerLoadOptions)');
     }
     static async generatedFilesAreValid() {
-        await this.Service('typeChecker').check(this.avcPath);
+        await this.Service('typeChecker').check(this.acPath);
         await this.assertCombinedViewsFileIsValid();
     }
     static async doesNotDropAppIntoSkillViewTypes() {
@@ -70,22 +72,40 @@ class CreatingAnAppViewControllerTest extends AbstractSkillTest_1.default {
         this.assertCombinedViewsContains(expected);
     }
     static async callsHeartwoodImportFunctionAsExpected() {
-        this.assertCombinedViewsContains('heartwood({ vcs, pluginsByName, App: AppViewControllerImpl })');
+        this.assertCombinedViewsContains(`heartwood({ vcs, pluginsByName, App: ${this.className} })`);
     }
-    static async throwsEvenIfAppAvcMoves() {
-        const destination = this.resolvePath(`src/${(0, test_utils_1.generateId)()}/App.avc.ts`);
-        spruce_skill_utils_1.diskUtil.moveFile(this.avcPath, destination);
+    static async combineViewsTypesAsExpected() {
+        const expected = `interface AppControllerMap {
+        '${this.skillNamespace}' : ${this.className}
+}`;
+        this.assertCombinedViewsContains(expected);
+    }
+    static async throwsEvenIfAppMoves() {
+        const destination = this.resolvePath(`src/${(0, test_utils_1.generateId)()}/App.ac.ts`);
+        spruce_skill_utils_1.diskUtil.moveFile(this.acPath, destination);
         await this.executeAndAssertThrowsAvcExists();
-        this.avcPath = destination;
+        this.acPath = destination;
     }
-    static async canRenameAppAvcAndItUpdatesCombinedViews() {
-        const contents = spruce_skill_utils_1.diskUtil.readFile(this.avcPath);
-        const updatedContents = contents.replace('AppViewControllerImpl', 'NewAppViewControllerImpl');
-        spruce_skill_utils_1.diskUtil.writeFile(this.avcPath, updatedContents);
+    static async canRenameAppAndItUpdatesCombinedViews() {
+        const contents = spruce_skill_utils_1.diskUtil.readFile(this.acPath);
+        const updatedContents = contents.replace(this.className, 'NewAppControllerImpl');
+        spruce_skill_utils_1.diskUtil.writeFile(this.acPath, updatedContents);
         await this.Action('view', 'sync').execute({});
-        this.assertCombinedViewsContains('heartwood({ vcs, pluginsByName, App: NewAppViewControllerImpl })');
+        this.assertCombinedViewsContains('heartwood({ vcs, pluginsByName, App: NewAppControllerImpl  })');
         await this.assertCombinedViewsFileIsValid();
     }
+    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');
+        spruce_skill_utils_1.diskUtil.writeFile(testScriptPath, testScript);
+        await this.Service('typeChecker').check(testScriptPath);
+    }
     static async assertCombinedViewsFileIsValid() {
         await this.Service('typeChecker').check(this.combinedViewsPath);
     }
@@ -96,41 +116,50 @@ class CreatingAnAppViewControllerTest extends AbstractSkillTest_1.default {
     static get combinedViewsPath() {
         return this.resolveHashSprucePath('views', 'views.ts');
     }
+    static get className() {
+        return `${spruce_skill_utils_1.namesUtil.toPascal(this.skillNamespace)}AppController`;
+    }
     static async executeAndAssertThrowsAvcExists() {
         const results = await this.execute();
         test_utils_1.assert.isTruthy(results.errors);
-        test_utils_1.errorAssert.assertError(results.errors[0], 'APP_VIEW_CONTROLLER_ALREADY_EXISTS');
+        test_utils_1.errorAssert.assertError(results.errors[0], 'APP_CONTROLLER_ALREADY_EXISTS');
     }
     static async execute() {
         return await this.action.execute();
     }
 }
-exports.default = CreatingAnAppViewControllerTest;
+exports.default = CreatingAnAppControllerTest;
+__decorate([
+    (0, test_utils_1.test)()
+], CreatingAnAppControllerTest, "generatesExpectedFile", null);
+__decorate([
+    (0, test_utils_1.test)()
+], CreatingAnAppControllerTest, "syncsViewsOnCreation", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "generatesExpectedFile", null);
+], CreatingAnAppControllerTest, "throwsIfAppAlreadyExists", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "syncsViewsOnCreation", null);
+], CreatingAnAppControllerTest, "acIncludesExpectedContents", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "throwsIfAppAlreadyExists", null);
+], CreatingAnAppControllerTest, "generatedFilesAreValid", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "avcIncludesExpectedContents", null);
+], CreatingAnAppControllerTest, "doesNotDropAppIntoSkillViewTypes", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "generatedFilesAreValid", null);
+], CreatingAnAppControllerTest, "callsHeartwoodImportFunctionAsExpected", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "doesNotDropAppIntoSkillViewTypes", null);
+], CreatingAnAppControllerTest, "combineViewsTypesAsExpected", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "callsHeartwoodImportFunctionAsExpected", null);
+], CreatingAnAppControllerTest, "throwsEvenIfAppMoves", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "throwsEvenIfAppAvcMoves", null);
+], CreatingAnAppControllerTest, "canRenameAppAndItUpdatesCombinedViews", null);
 __decorate([
     (0, test_utils_1.test)()
-], CreatingAnAppViewControllerTest, "canRenameAppAvcAndItUpdatesCombinedViews", null);
-//# sourceMappingURL=CreatingAnAppViewController.test.js.map
+], CreatingAnAppControllerTest, "importsAppFromCombinedViews", null);
+//# sourceMappingURL=CreatingAnAppController.test.js.map

package/build/__tests__/behavioral/views/CreatingAnAppController.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreatingAnAppController.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/views/CreatingAnAppController.test.ts"],"names":[],"mappings":"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"}

package/build/__tests__/behavioral/views/CreatingViewControllers.test.d.ts

@@ -0,0 +1,5 @@
+import AbstractSkillTest from '../../../tests/AbstractSkillTest';
+export default class CreatingViewControllersTest extends AbstractSkillTest {
+    protected static skillCacheKey: string;
+    protected static canCreateListViewController(): Promise<void>;
+}

package/build/__tests__/behavioral/views/CreatingViewControllers.test.js

@@ -0,0 +1,37 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
+const test_utils_1 = require("@sprucelabs/test-utils");
+const AbstractSkillTest_1 = __importDefault(require("../../../tests/AbstractSkillTest"));
+class CreatingViewControllersTest extends AbstractSkillTest_1.default {
+    static skillCacheKey = 'views';
+    static async canCreateListViewController() {
+        const action = this.Action('view', 'create');
+        const results = await action.execute({
+            viewType: 'view',
+            isRoot: false,
+            viewModel: 'List',
+            nameReadable: 'My List',
+            namePascal: 'MyList',
+        });
+        test_utils_1.assert.isFalsy(results.errors);
+        const file = results.files?.[0];
+        test_utils_1.assert.isTruthy(file?.path);
+        const contents = spruce_skill_utils_1.diskUtil.readFile(file.path);
+        test_utils_1.assert.doesInclude(contents, 'extends AbstractViewController<List>');
+    }
+}
+exports.default = CreatingViewControllersTest;
+__decorate([
+    (0, test_utils_1.test)()
+], CreatingViewControllersTest, "canCreateListViewController", null);
+//# sourceMappingURL=CreatingViewControllers.test.js.map

package/build/__tests__/behavioral/views/CreatingViewControllers.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreatingViewControllers.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/views/CreatingViewControllers.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uEAAyD;AACzD,uDAAqD;AAErD,yFAAgE;AAEhE,MAAqB,2BAA4B,SAAQ,2BAAiB;IAC5D,MAAM,CAAC,aAAa,GAAG,OAAO,CAAA;IAGjB,AAAb,MAAM,CAAC,KAAK,CAAC,2BAA2B;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAiB,CAAA;QAC5D,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YACjC,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,MAAM;YACjB,YAAY,EAAE,SAAS;YACvB,UAAU,EAAE,QAAQ;SACvB,CAAC,CAAA;QAEF,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAE9B,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;QAC/B,mBAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAC3B,MAAM,QAAQ,GAAG,6BAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAE7C,mBAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,sCAAsC,CAAC,CAAA;IACxE,CAAC;;AArBL,8CAsBC;AAlB0B;IADtB,IAAA,iBAAI,GAAE;oEAkBN"}

package/build/__tests__/behavioral/views/KeepingViewsInSync.test.d.ts

@@ -7,5 +7,6 @@ export default class KeepingViewsInSyncTest extends AbstractSkillTest {
     protected static syncingWithNoViewsGeneratesNothing(): Promise<void>;
     protected static createsValidCombinedEventsFileWhenCreatingANewSvc(): Promise<void>;
     protected static generatesValidTypesFileWithNoSkillViews(): Promise<void>;
+    protected static exportUndefinedApp(): Promise<void>;
     private static assertValuedViewsFile;
 }

package/build/__tests__/behavioral/views/KeepingViewsInSync.test.js

@@ -9,6 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
 const test_utils_1 = require("@sprucelabs/test-utils");
 const AbstractSkillTest_1 = __importDefault(require("../../../tests/AbstractSkillTest"));
 const test_utility_1 = __importDefault(require("../../../tests/utilities/test.utility"));
@@ -43,6 +44,16 @@ class KeepingViewsInSyncTest extends AbstractSkillTest_1.default {
         test_utils_1.assert.isFalsy(results.errors);
         await this.assertValuedViewsFile(results);
     }
+    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');
+        spruce_skill_utils_1.diskUtil.writeFile(testScriptPath, testScript);
+        await this.Service('typeChecker').check(testScriptPath);
+    }
     static async assertValuedViewsFile(results) {
         const match = test_utility_1.default.assertFileByPathInGeneratedFiles(`views/views.ts`, results.files);
         await this.Service('typeChecker').check(match);
@@ -61,4 +72,7 @@ __decorate([
 __decorate([
     (0, test_utils_1.test)()
 ], KeepingViewsInSyncTest, "generatesValidTypesFileWithNoSkillViews", null);
+__decorate([
+    (0, test_utils_1.test)()
+], KeepingViewsInSyncTest, "exportUndefinedApp", null);
 //# sourceMappingURL=KeepingViewsInSync.test.js.map

package/build/__tests__/behavioral/views/KeepingViewsInSync.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"KeepingViewsInSync.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/views/KeepingViewsInSync.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uDAAqD;AAGrD,yFAAgE;AAChE,yFAA4D;AAE5D,MAAqB,sBAAuB,SAAQ,2BAAiB;IACvD,MAAM,CAAC,aAAa,GAAG,OAAO,CAAA;IAChC,MAAM,CAAC,MAAM,CAAY;IAEvB,MAAM,CAAC,KAAK,CAAC,UAAU;QAC7B,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,aAAa;QAChC,mBAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC;QACrD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;QAC3C,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9B,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,iDAAiD;QACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;YACxD,QAAQ,EAAE,WAAW;YACrB,MAAM,EAAE,IAAI;SACf,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,uCAAuC;QAC1D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;YACxD,QAAQ,EAAE,MAAM;YAChB,YAAY,EAAE,MAAM;YACpB,SAAS,EAAE,MAAM;SACpB,CAAC,CAAA;QACF,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9B,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAA8B;QACrE,MAAM,KAAK,GAAG,sBAAQ,CAAC,gCAAgC,CACnD,gBAAgB,EAChB,OAAO,CAAC,KAAK,CAChB,CAAA;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAClD,CAAC;;AAjDL,yCAkDC;AAxC0B;IADtB,IAAA,iBAAI,GAAE;iDAGN;AAGsB;IADtB,IAAA,iBAAI,GAAE;sEAKN;AAGsB;IADtB,IAAA,iBAAI,GAAE;qFAQN;AAGsB;IADtB,IAAA,iBAAI,GAAE;2EASN"}
+{"version":3,"file":"KeepingViewsInSync.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/views/KeepingViewsInSync.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uEAAyD;AACzD,uDAAqD;AAGrD,yFAAgE;AAChE,yFAA4D;AAE5D,MAAqB,sBAAuB,SAAQ,2BAAiB;IACvD,MAAM,CAAC,aAAa,GAAG,OAAO,CAAA;IAChC,MAAM,CAAC,MAAM,CAAY;IAEvB,MAAM,CAAC,KAAK,CAAC,UAAU;QAC7B,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,aAAa;QAChC,mBAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC;QACrD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;QAC3C,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9B,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,iDAAiD;QACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;YACxD,QAAQ,EAAE,WAAW;YACrB,MAAM,EAAE,IAAI;SACf,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,uCAAuC;QAC1D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC;YACxD,QAAQ,EAAE,MAAM;YAChB,YAAY,EAAE,MAAM;YACpB,SAAS,EAAE,MAAM;SACpB,CAAC,CAAA;QACF,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9B,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,kBAAkB;QACrC,MAAM,UAAU,GACZ,wBAAwB;YACxB;;;UAGF,CAAA;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;QACtD,6BAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QAE9C,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAC3D,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAA8B;QACrE,MAAM,KAAK,GAAG,sBAAQ,CAAC,gCAAgC,CACnD,gBAAgB,EAChB,OAAO,CAAC,KAAK,CAChB,CAAA;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAClD,CAAC;;AAhEL,yCAiEC;AAvD0B;IADtB,IAAA,iBAAI,GAAE;iDAGN;AAGsB;IADtB,IAAA,iBAAI,GAAE;sEAKN;AAGsB;IADtB,IAAA,iBAAI,GAAE;qFAQN;AAGsB;IADtB,IAAA,iBAAI,GAAE;2EASN;AAGsB;IADtB,IAAA,iBAAI,GAAE;sDAaN"}

package/build/__tests__/behavioral/watchers/WatchingForChanges.test.js

@@ -65,8 +65,7 @@ class WatchingForChangesTest extends AbstractCliTest_1.default {
             const filename = `index-${idx}.js`;
             spruce_skill_utils_1.diskUtil.writeFile(this.resolvePath('build', filename), 'console.log("hello world")');
             expectedChanges.push({
-                schemaId: 'generatedFile',
-                version: spruce_skill_utils_1.CORE_SCHEMA_VERSION.constValue,
+                id: 'generatedFile',
                 values: {
                     action: 'generated',
                     path: this.resolvePath('build', filename),
@@ -87,8 +86,7 @@ class WatchingForChangesTest extends AbstractCliTest_1.default {
             spruce_skill_utils_1.diskUtil.createDir(newDirDest);
             const expected = [
                 {
-                    schemaId: 'generatedDir',
-                    version: 'v2020_07_22',
+                    id: 'generatedDir',
                     values: {
                         action: 'generated',
                         name: 'new_dir',
@@ -106,8 +104,7 @@ class WatchingForChangesTest extends AbstractCliTest_1.default {
             spruce_skill_utils_1.diskUtil.deleteDir(newDirDest);
             const expected = [
                 {
-                    schemaId: 'generatedDir',
-                    version: 'v2020_07_22',
+                    id: 'generatedDir',
                     values: {
                         action: 'deleted',
                         name: 'new_dir',
@@ -125,8 +122,7 @@ class WatchingForChangesTest extends AbstractCliTest_1.default {
             spruce_skill_utils_1.diskUtil.deleteFile(newFile);
             const expected = [
                 {
-                    schemaId: 'generatedFile',
-                    version: 'v2020_07_22',
+                    id: 'generatedFile',
                     values: {
                         action: 'deleted',
                         name: 'test.js',
@@ -146,8 +142,7 @@ class WatchingForChangesTest extends AbstractCliTest_1.default {
             spruce_skill_utils_1.diskUtil.deleteFile(newFile);
             const expected = [
                 {
-                    schemaId: 'generatedFile',
-                    version: 'v2020_07_22',
+                    id: 'generatedFile',
                     values: {
                         action: 'deleted',
                         name: 'test.js',

package/build/__tests__/behavioral/watchers/WatchingForChanges.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"WatchingForChanges.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/watchers/WatchingForChanges.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WatchingForChanges.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/watchers/WatchingForChanges.test.ts"],"names":[],"mappings":"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"}