@sprucelabs/heartwood-view-controllers 111.1.32 → 111.1.34

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

@@ -215,6 +215,26 @@ export declare namespace SpruceErrors.HeartwoodViewControllers {
     }
     type InvalidSkillViewControllerEntity = SchemaEntity<SpruceErrors.HeartwoodViewControllers.InvalidSkillViewControllerSchema>;
 }
+export declare namespace SpruceErrors.HeartwoodViewControllers {
+    interface InvalidAppController {
+        'id': string;
+    }
+    interface InvalidAppControllerSchema extends SpruceSchema.Schema {
+        id: 'invalidAppController';
+        namespace: 'HeartwoodViewControllers';
+        name: 'Invalid app controller';
+        moduleToImportFromWhenRemote: '@sprucelabs/heartwood-view-controllers';
+        fields: {
+            /** . */
+            'id': {
+                type: 'id';
+                isRequired: true;
+                options: undefined;
+            };
+        };
+    }
+    type InvalidAppControllerEntity = SchemaEntity<SpruceErrors.HeartwoodViewControllers.InvalidAppControllerSchema>;
+}
 export declare namespace SpruceErrors.HeartwoodViewControllers {
     interface ExportFailed {
     }

package/build/.spruce/errors/heartwoodViewControllers/invalidAppController.schema.d.ts

@@ -0,0 +1,3 @@
+import { SpruceErrors } from '../errors.types';
+declare const invalidAppControllerSchema: SpruceErrors.HeartwoodViewControllers.InvalidAppControllerSchema;
+export default invalidAppControllerSchema;

package/build/.spruce/errors/heartwoodViewControllers/invalidAppController.schema.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+const invalidAppControllerSchema = {
+    id: 'invalidAppController',
+    namespace: 'HeartwoodViewControllers',
+    name: 'Invalid app controller',
+    moduleToImportFromWhenRemote: '@sprucelabs/heartwood-view-controllers',
+    fields: {
+        /** . */
+        'id': {
+            type: 'id',
+            isRequired: true,
+            options: undefined
+        },
+    }
+};
+schema_1.SchemaRegistry.getInstance().trackSchema(invalidAppControllerSchema);
+exports.default = invalidAppControllerSchema;

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

@@ -33,6 +33,9 @@ export interface InvalidViewControllerNameErrorOptions extends SpruceErrors.Hear
 export interface InvalidSkillViewControllerErrorOptions extends SpruceErrors.HeartwoodViewControllers.InvalidSkillViewController, ISpruceErrorOptions {
     code: 'INVALID_SKILL_VIEW_CONTROLLER';
 }
+export interface InvalidAppControllerErrorOptions extends SpruceErrors.HeartwoodViewControllers.InvalidAppController, ISpruceErrorOptions {
+    code: 'INVALID_APP_CONTROLLER';
+}
 export interface ExportFailedErrorOptions extends SpruceErrors.HeartwoodViewControllers.ExportFailed, ISpruceErrorOptions {
     code: 'EXPORT_FAILED';
 }
@@ -60,5 +63,5 @@ export interface CellDeletedErrorOptions extends SpruceErrors.HeartwoodViewContr
 export interface AppNotFoundErrorOptions extends SpruceErrors.HeartwoodViewControllers.AppNotFound, ISpruceErrorOptions {
     code: 'APP_NOT_FOUND';
 }
-type ErrorOptions = ViewAlreadyDestroyedErrorOptions | ToolNotFoundErrorOptions | StepNotCompleteErrorOptions | SlideNotFoundErrorOptions | RowDeletedErrorOptions | PersonNotFoundErrorOptions | NoFieldVcSetErrorOptions | MissingStorageErrorOptions | InvalidViewControllerSourceErrorOptions | InvalidViewControllerNameErrorOptions | InvalidSkillViewControllerErrorOptions | ExportFailedErrorOptions | EventNotFoundErrorOptions | DuplicateToolIdErrorOptions | DuplicateRowIdErrorOptions | DuplicateEventIdErrorOptions | DateNotSelectedErrorOptions | DateAlreadySelectedErrorOptions | CellDeletedErrorOptions | AppNotFoundErrorOptions;
+type ErrorOptions = ViewAlreadyDestroyedErrorOptions | ToolNotFoundErrorOptions | StepNotCompleteErrorOptions | SlideNotFoundErrorOptions | RowDeletedErrorOptions | PersonNotFoundErrorOptions | NoFieldVcSetErrorOptions | MissingStorageErrorOptions | InvalidViewControllerSourceErrorOptions | InvalidViewControllerNameErrorOptions | InvalidSkillViewControllerErrorOptions | InvalidAppControllerErrorOptions | ExportFailedErrorOptions | EventNotFoundErrorOptions | DuplicateToolIdErrorOptions | DuplicateRowIdErrorOptions | DuplicateEventIdErrorOptions | DateNotSelectedErrorOptions | DateAlreadySelectedErrorOptions | CellDeletedErrorOptions | AppNotFoundErrorOptions;
 export default ErrorOptions;

package/build/errors/SpruceError.js

@@ -77,6 +77,9 @@ class SpruceError extends error_1.default {
             case 'APP_NOT_FOUND':
                 message = `I could not find an App with the namespace '${options.namespace}'!`;
                 break;
+            case 'INVALID_APP_CONTROLLER':
+                message = 'A Invalid app controller just happened!';
+                break;
             default:
                 message = super.friendlyMessage();
         }

package/build/errors/invalidAppController.builder.d.ts

@@ -0,0 +1,11 @@
+declare const _default: {
+    id: string;
+    name: string;
+    fields: {
+        id: {
+            type: "id";
+            isRequired: true;
+        };
+    };
+};
+export default _default;

package/build/errors/invalidAppController.builder.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+exports.default = (0, schema_1.buildErrorSchema)({
+    id: 'invalidAppController',
+    name: 'Invalid app controller',
+    fields: {
+        id: {
+            type: 'id',
+            isRequired: true,
+        },
+    },
+});

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

@@ -215,6 +215,26 @@ export declare namespace SpruceErrors.HeartwoodViewControllers {
     }
     type InvalidSkillViewControllerEntity = SchemaEntity<SpruceErrors.HeartwoodViewControllers.InvalidSkillViewControllerSchema>;
 }
+export declare namespace SpruceErrors.HeartwoodViewControllers {
+    interface InvalidAppController {
+        'id': string;
+    }
+    interface InvalidAppControllerSchema extends SpruceSchema.Schema {
+        id: 'invalidAppController';
+        namespace: 'HeartwoodViewControllers';
+        name: 'Invalid app controller';
+        moduleToImportFromWhenRemote: '@sprucelabs/heartwood-view-controllers';
+        fields: {
+            /** . */
+            'id': {
+                type: 'id';
+                isRequired: true;
+                options: undefined;
+            };
+        };
+    }
+    type InvalidAppControllerEntity = SchemaEntity<SpruceErrors.HeartwoodViewControllers.InvalidAppControllerSchema>;
+}
 export declare namespace SpruceErrors.HeartwoodViewControllers {
     interface ExportFailed {
     }

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

@@ -33,6 +33,9 @@ export interface InvalidViewControllerNameErrorOptions extends SpruceErrors.Hear
 export interface InvalidSkillViewControllerErrorOptions extends SpruceErrors.HeartwoodViewControllers.InvalidSkillViewController, ISpruceErrorOptions {
     code: 'INVALID_SKILL_VIEW_CONTROLLER';
 }
+export interface InvalidAppControllerErrorOptions extends SpruceErrors.HeartwoodViewControllers.InvalidAppController, ISpruceErrorOptions {
+    code: 'INVALID_APP_CONTROLLER';
+}
 export interface ExportFailedErrorOptions extends SpruceErrors.HeartwoodViewControllers.ExportFailed, ISpruceErrorOptions {
     code: 'EXPORT_FAILED';
 }
@@ -60,5 +63,5 @@ export interface CellDeletedErrorOptions extends SpruceErrors.HeartwoodViewContr
 export interface AppNotFoundErrorOptions extends SpruceErrors.HeartwoodViewControllers.AppNotFound, ISpruceErrorOptions {
     code: 'APP_NOT_FOUND';
 }
-type ErrorOptions = ViewAlreadyDestroyedErrorOptions | ToolNotFoundErrorOptions | StepNotCompleteErrorOptions | SlideNotFoundErrorOptions | RowDeletedErrorOptions | PersonNotFoundErrorOptions | NoFieldVcSetErrorOptions | MissingStorageErrorOptions | InvalidViewControllerSourceErrorOptions | InvalidViewControllerNameErrorOptions | InvalidSkillViewControllerErrorOptions | ExportFailedErrorOptions | EventNotFoundErrorOptions | DuplicateToolIdErrorOptions | DuplicateRowIdErrorOptions | DuplicateEventIdErrorOptions | DateNotSelectedErrorOptions | DateAlreadySelectedErrorOptions | CellDeletedErrorOptions | AppNotFoundErrorOptions;
+type ErrorOptions = ViewAlreadyDestroyedErrorOptions | ToolNotFoundErrorOptions | StepNotCompleteErrorOptions | SlideNotFoundErrorOptions | RowDeletedErrorOptions | PersonNotFoundErrorOptions | NoFieldVcSetErrorOptions | MissingStorageErrorOptions | InvalidViewControllerSourceErrorOptions | InvalidViewControllerNameErrorOptions | InvalidSkillViewControllerErrorOptions | InvalidAppControllerErrorOptions | ExportFailedErrorOptions | EventNotFoundErrorOptions | DuplicateToolIdErrorOptions | DuplicateRowIdErrorOptions | DuplicateEventIdErrorOptions | DateNotSelectedErrorOptions | DateAlreadySelectedErrorOptions | CellDeletedErrorOptions | AppNotFoundErrorOptions;
 export default ErrorOptions;

package/build/esm/errors/SpruceError.js

@@ -73,6 +73,9 @@ export default class SpruceError extends AbstractSpruceError {
             case 'APP_NOT_FOUND':
                 message = `I could not find an App with the namespace '${options.namespace}'!`;
                 break;
+            case 'INVALID_APP_CONTROLLER':
+                message = 'A Invalid app controller just happened!';
+                break;
             default:
                 message = super.friendlyMessage();
         }

package/build/esm/errors/invalidAppController.builder.d.ts

@@ -0,0 +1,11 @@
+declare const _default: {
+    id: string;
+    name: string;
+    fields: {
+        id: {
+            type: "id";
+            isRequired: true;
+        };
+    };
+};
+export default _default;

package/build/esm/errors/invalidAppController.builder.js

@@ -0,0 +1,11 @@
+import { buildErrorSchema } from '@sprucelabs/schema';
+export default buildErrorSchema({
+    id: 'invalidAppController',
+    name: 'Invalid app controller',
+    fields: {
+        id: {
+            type: 'id',
+            isRequired: true,
+        },
+    },
+});

package/build/esm/index.d.ts

@@ -4,7 +4,7 @@ export * from './utilities/removeUniversalViewOptions';
 export * from './.spruce/schemas/schemas.types';
 export { default as AbstractSkillViewController } from './skillViewControllers/Abstract.svc';
 export { default as AbstractViewController } from './viewControllers/Abstract.vc';
-export { default as AbstractAppViewController } from './viewControllers/Abstract.avc';
+export { default as AbstractAppController } from './viewControllers/Abstract.ac';
 export * from './viewControllers/BigForm.vc';
 export { default as ButtonGroupViewController } from './viewControllers/ButtonGroup.vc';
 export * from './viewControllers/ButtonGroup.vc';

package/build/esm/index.js

@@ -4,7 +4,7 @@ export * from './utilities/removeUniversalViewOptions.js';
 export * from './.spruce/schemas/schemas.types.js';
 export { default as AbstractSkillViewController } from './skillViewControllers/Abstract.svc.js';
 export { default as AbstractViewController } from './viewControllers/Abstract.vc.js';
-export { default as AbstractAppViewController } from './viewControllers/Abstract.avc.js';
+export { default as AbstractAppController } from './viewControllers/Abstract.ac.js';
 export * from './viewControllers/BigForm.vc.js';
 export { default as ButtonGroupViewController } from './viewControllers/ButtonGroup.vc.js';
 export * from './viewControllers/ButtonGroup.vc.js';

package/build/esm/tests/utilities/navigationAssert.d.ts

@@ -1,5 +1,5 @@
 import { PermissionContractId } from '@sprucelabs/mercury-types';
-import { Navigation, SkillViewController, SkillViewControllerId, ViewController } from '../../types/heartwood.types';
+import { AppController, Navigation, SkillViewController, SkillViewControllerId, ViewController } from '../../types/heartwood.types';
 declare const navigationAssert: {
     rendersButton(vc: ViewController<Navigation>, id: string): void;
     buttonRedirectsTo(options: {
@@ -12,7 +12,9 @@ declare const navigationAssert: {
     }): void;
     rendersButtons(vc: ViewController<Navigation>, ids: string[]): void;
     rendersButtonLabels(vc: ViewController<Navigation>): void;
-    skillViewRendersNavigation(vc: Pick<SkillViewController, "renderNavigation">): ViewController<import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Navigation>;
+    skillViewRendersNavigation(vc: Pick<SkillViewController, "renderNavigation">, msg?: string): ViewController<import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Navigation>;
+    appRendersNavigation(vc: Pick<AppController, "renderNavigation">): ViewController<import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Navigation>;
+    appDoesNotRenderNavigation(vc: Pick<AppController, "renderNavigation">): void;
     skillViewDoesNotRenderNavigation(vc: Pick<SkillViewController, "renderNavigation">): void;
     buttonRequiresViewPermissions(vc: ViewController<Navigation>, button: string, permissionContractId: PermissionContractId): void;
 };

package/build/esm/tests/utilities/navigationAssert.js

@@ -22,12 +22,20 @@ const navigationAssert = {
         const model = renderUtil.render(vc);
         assert.isTrue(model.shouldRenderButtonLabels, `Your navigation should render button labels but it is not! Try shouldRenderButtonLabels: true`);
     },
-    skillViewRendersNavigation(vc) {
+    skillViewRendersNavigation(vc, msg) {
         var _a;
         const nav = (_a = vc.renderNavigation) === null || _a === void 0 ? void 0 : _a.call(vc);
-        assert.isTruthy(nav, `Your skill view did not render a navigation! Implement renderNavigation() and use this.Controller('navigation', {}) to render one.`);
+        assert.isTruthy(nav, msg !== null && msg !== void 0 ? msg : `Your skill view did not render a navigation! Implement renderNavigation() and use this.Controller('navigation', {}) to render one.`);
         return nav.controller;
     },
+    appRendersNavigation(vc) {
+        return this.skillViewRendersNavigation(vc, `Your AppController did not render a navigation! Implement renderNavigation() and use this.Controller('navigation', {}) to render one.`);
+    },
+    appDoesNotRenderNavigation(vc) {
+        var _a;
+        const nav = (_a = vc.renderNavigation) === null || _a === void 0 ? void 0 : _a.call(vc);
+        assert.isNull(nav, `Your AppController should not render a navigation! Implement renderNavigation() and return null.`);
+    },
     skillViewDoesNotRenderNavigation(vc) {
         var _a;
         const nav = (_a = vc.renderNavigation) === null || _a === void 0 ? void 0 : _a.call(vc);

package/build/esm/types/heartwood.types.d.ts

@@ -210,6 +210,7 @@ export type ImportedViewController = (new (options: ViewControllerOptions) => Vi
 };
 export type ViewControllerId = keyof ViewControllerMap;
 export type SkillViewControllerId = keyof SkillViewControllerMap;
+export type AppControllerId = keyof AppControllerMap;
 export interface RedirectOptions {
     shouldTrackHistory?: boolean;
 }
@@ -349,6 +350,8 @@ export interface SkillViewControllerMap {
 }
 export interface SkillViewControllerArgsMap {
 }
+export interface AppControllerMap {
+}
 export type ControllerOptions<N extends ViewControllerId, O extends ViewControllerOptionsMap = ViewControllerOptionsMap> = Omit<N extends keyof O ? O[N] : Record<string, never>, UniversalViewOptionFields>;
 export type MapUtil = typeof mapUtil;
 export interface OpenNavigationOptions {
@@ -511,15 +514,18 @@ export interface ActiveRecordSearchOptions {
     shouldSearchClientSide?: boolean;
     placeholder?: string;
 }
-export interface AppViewController {
+export interface AppController {
     renderNavigation?(): Navigation | null | undefined;
     renderToolBelt?(): ToolBelt | null | undefined;
-    load?(options: AppViewControllerLoadOptions): Promise<void>;
+    load(options: AppControllerLoadOptions): Promise<void>;
 }
-export type AppViewControllerConstructor = (new (options: ViewControllerOptions) => AppViewController) & {
+export type BuiltAppController = AppController & {
+    id: string;
+};
+export type AppControllerConstructor = (new (options: ViewControllerOptions) => AppController) & {
     id: string;
 };
-export interface AppViewControllerLoadOptions {
+export interface AppControllerLoadOptions {
     router: Router;
     authenticator: Authenticator;
     authorizer: Authorizer;

package/build/esm/viewControllers/Abstract.ac.d.ts

@@ -0,0 +1,9 @@
+import { AppController, AppControllerLoadOptions, ControllerOptions, ViewControllerId, ViewControllerMap, ViewControllerOptions, ViewControllerPlugins } from '../types/heartwood.types';
+export default abstract class AbstractAppController implements AppController {
+    static id: string;
+    protected plugins: ViewControllerPlugins;
+    private views;
+    constructor(options: ViewControllerOptions);
+    load(options: AppControllerLoadOptions): Promise<void>;
+    Controller<N extends ViewControllerId, O extends ControllerOptions<N>>(id: N, options: O): ViewControllerMap[N];
+}

package/build/esm/viewControllers/Abstract.ac.js

@@ -0,0 +1,22 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+export default class AbstractAppController {
+    constructor(options) {
+        const { plugins, vcFactory } = options;
+        this.plugins = plugins;
+        this.views = vcFactory;
+    }
+    load(options) {
+        return __awaiter(this, void 0, void 0, function* () { });
+    }
+    Controller(id, options) {
+        return this.views.Controller(id, options);
+    }
+}

package/build/esm/viewControllers/ViewControllerFactory.d.ts

@@ -1,6 +1,6 @@
 import { DateUtil } from '@sprucelabs/calendar-utils';
 import { Log } from '@sprucelabs/spruce-skill-utils';
-import { ConfirmHandler, ControllerOptions, ImportedViewController, RenderInDialogHandler, ViewController, ViewControllerMap, ViewControllerId, VoteHandler, Device, MapUtil, ViewControllerConstructor, ToastHandler, ViewControllerPlugins, ViewControllerPluginsByName, ConnectToApi, ViewControllerPlugin, ViewControllerPluginOptions, ViewControllerOptions, AppViewController, AppViewControllerConstructor } from '../types/heartwood.types';
+import { ConfirmHandler, ControllerOptions, ImportedViewController, RenderInDialogHandler, ViewController, ViewControllerMap, ViewControllerId, VoteHandler, Device, MapUtil, ViewControllerConstructor, ToastHandler, ViewControllerPlugins, ViewControllerPluginsByName, ConnectToApi, ViewControllerPlugin, ViewControllerPluginOptions, ViewControllerOptions, AppController, AppControllerConstructor, AppControllerId, AppControllerMap } from '../types/heartwood.types';
 export default class ViewControllerFactory {
     static Class?: typeof ViewControllerFactory;
     private controllerMap;
@@ -22,16 +22,20 @@ export default class ViewControllerFactory {
     static Factory(options: ViewControllerFactoryOptions): ViewControllerFactory;
     setController<Vc extends ViewController<any>>(name: string, Class: ViewControllerConstructor<Vc>): void;
     mixinControllers(map: Record<string, ViewControllerConstructor<ViewController<any>>>): void;
-    importControllers<Vc extends ImportedViewController>(Vcs: Vc[], plugins?: ViewControllerPluginsByName, App?: AppViewControllerConstructor): void;
+    importControllers<Vc extends ImportedViewController>(Vcs: Vc[], plugins?: ViewControllerPluginsByName, App?: AppControllerConstructor): void;
     private importPlugins;
     BuildPlugin<P extends ViewControllerPlugin>(Plugin: new (options: ViewControllerPluginOptions) => P): P;
-    BuildApp<A extends AppViewController>(App: new (options: ViewControllerOptions) => A): A;
+    BuildApp<A extends AppController>(App: new (options: ViewControllerOptions) => A): A & {
+        id: string;
+    };
     hasController(name: string): boolean;
     hasApp(namespace: string): boolean;
     getController<N extends ViewControllerId>(name: N): any;
     setDates(dates: DateUtil): void;
     addPlugin(named: string, plugin: ViewControllerPlugin): void;
-    App(namespace: string): AppViewController;
+    App<Id extends AppControllerId>(namespace: Id): AppControllerMap[Id] & {
+        id: Id;
+    };
     Controller<N extends ViewControllerId, O extends ControllerOptions<N>>(id: N, options: O): ViewControllerMap[N];
     protected buildViewContructorOptions(name: string, options?: Record<string, any>): ViewControllerOptions;
     private sharedConstructorOptions;

package/build/esm/viewControllers/ViewControllerFactory.js

@@ -84,7 +84,19 @@ export default class ViewControllerFactory {
         return new Plugin(this.sharedConstructorOptions());
     }
     BuildApp(App) {
-        return new App(this.buildViewContructorOptions('App'));
+        const app = new App(this.buildViewContructorOptions('App'));
+        //@ts-ignore
+        if (app.id) {
+            throw new SpruceError({
+                code: 'INVALID_APP_CONTROLLER',
+                friendlyMessage: `Property \`id\` is reserved in your AppController. Please rename it to \`_id\`.`,
+                //@ts-ignore
+                id: App.id,
+            });
+        }
+        //@ts-ignore
+        app.id = App.id;
+        return app;
     }
     hasController(name) {
         //@ts-ignore
@@ -131,7 +143,7 @@ export default class ViewControllerFactory {
         if (instance.id) {
             throw new SpruceError({
                 code: 'INVALID_SKILL_VIEW_CONTROLLER',
-                friendlyMessage: `Property \`id\` is reserved. Please rename it to \`_id\`.`,
+                friendlyMessage: `Property \`id\` is reserved in your ViewController. Please rename it to \`_id\`.`,
                 id,
             });
         }

package/build/esm/viewControllers/ViewControllerImporter.d.ts

@@ -1,4 +1,4 @@
-import { AppViewControllerConstructor, ImportedViewController, ViewControllerPluginsByName } from '../types/heartwood.types';
+import { AppControllerConstructor, ImportedViewController, ViewControllerPluginsByName } from '../types/heartwood.types';
 export default class ViewControllerImporter {
     static Class?: typeof ViewControllerImporter;
     protected constructor();
@@ -9,7 +9,7 @@ export default class ViewControllerImporter {
 }
 interface ImportResults {
     controllers: ImportedViewController[];
-    App?: AppViewControllerConstructor;
+    App?: AppControllerConstructor;
     plugins: ViewControllerPluginsByName;
 }
 export {};

package/build/index.d.ts

@@ -4,7 +4,7 @@ export * from './utilities/removeUniversalViewOptions';
 export * from './.spruce/schemas/schemas.types';
 export { default as AbstractSkillViewController } from './skillViewControllers/Abstract.svc';
 export { default as AbstractViewController } from './viewControllers/Abstract.vc';
-export { default as AbstractAppViewController } from './viewControllers/Abstract.avc';
+export { default as AbstractAppController } from './viewControllers/Abstract.ac';
 export * from './viewControllers/BigForm.vc';
 export { default as ButtonGroupViewController } from './viewControllers/ButtonGroup.vc';
 export * from './viewControllers/ButtonGroup.vc';

package/build/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dialogSchema = exports.buttonSchema = exports.lineIconSchema = exports.fancyIconSchema = exports.selectInputSchema = exports.skillViewSchema = exports.bigFormSchema = exports.calendarEventColorsSchema = exports.buildSkillView = exports.buildForm = exports.buildBigForm = exports.AuthenticatorImpl = exports.PolarAreaViewController = exports.MockActiveRecordCard = exports.activeRecordCardAssert = exports.buildActiveRecordList = exports.buildActiveRecordCard = exports.AbstractInputViewController = exports.AutocompleteInputViewController = exports.AbstractCalendarEventViewController = exports.RatingsViewController = exports.ProgressViewController = exports.StatsViewController = exports.FeedViewController = exports.ActiveRecordListViewController = exports.ActiveRecordCardViewController = exports.TalkingSprucebotViewController = exports.ButtonBarViewController = exports.CalendarViewController = exports.SwipeCardViewControllerImpl = exports.SwipeViewControllerImpl = exports.PagerViewController = exports.ProgressNavigatorViewController = exports.CountdownTimerViewController = exports.FormBuilderCardViewControllerImpl = exports.LoginViewController = exports.BarChartViewController = exports.ToolBeltViewController = exports.FormViewControllerImpl = exports.ListCellViewController = exports.ListRowViewController = exports.ListViewController = exports.NavigationViewController = exports.DialogViewController = exports.ConfirmViewController = exports.CardViewControllerImpl = exports.ButtonGroupViewController = exports.AbstractAppViewController = exports.AbstractViewController = exports.AbstractSkillViewController = void 0;
+exports.dialogSchema = exports.buttonSchema = exports.lineIconSchema = exports.fancyIconSchema = exports.selectInputSchema = exports.skillViewSchema = exports.bigFormSchema = exports.calendarEventColorsSchema = exports.buildSkillView = exports.buildForm = exports.buildBigForm = exports.AuthenticatorImpl = exports.PolarAreaViewController = exports.MockActiveRecordCard = exports.activeRecordCardAssert = exports.buildActiveRecordList = exports.buildActiveRecordCard = exports.AbstractInputViewController = exports.AutocompleteInputViewController = exports.AbstractCalendarEventViewController = exports.RatingsViewController = exports.ProgressViewController = exports.StatsViewController = exports.FeedViewController = exports.ActiveRecordListViewController = exports.ActiveRecordCardViewController = exports.TalkingSprucebotViewController = exports.ButtonBarViewController = exports.CalendarViewController = exports.SwipeCardViewControllerImpl = exports.SwipeViewControllerImpl = exports.PagerViewController = exports.ProgressNavigatorViewController = exports.CountdownTimerViewController = exports.FormBuilderCardViewControllerImpl = exports.LoginViewController = exports.BarChartViewController = exports.ToolBeltViewController = exports.FormViewControllerImpl = exports.ListCellViewController = exports.ListRowViewController = exports.ListViewController = exports.NavigationViewController = exports.DialogViewController = exports.ConfirmViewController = exports.CardViewControllerImpl = exports.ButtonGroupViewController = exports.AbstractAppController = exports.AbstractViewController = exports.AbstractSkillViewController = void 0;
 exports.ratingsInputSchema = exports.listRatingsInputSchema = exports.ratingsSchema = exports.progressSchema = exports.statsStatSchema = exports.statsSchema = exports.toggleInputSchema = exports.listToggleInputSchema = exports.addressInputSchema = exports.buttonBarButtonSchema = exports.buttonBarSchema = exports.toolBeltToolSchema = exports.toolBeltSchema = exports.calendarTimeSchema = exports.calendarPersonSchema = exports.calendarSchema = exports.themePropsSchema = exports.themeSchema = exports.cardFooterButtonSchema = exports.criticalErrorSchema = exports.sprucebotTypedMessageSentenceSchema = exports.sprucebotTypedMessageAvatarSchema = exports.selectInputChoiceSchema = exports.calendarEventColorOverrideSchema = exports.portalSchema = exports.listTextInputSchema = exports.listSelectInputSchema = exports.listCellButtonSchema = exports.dropdownButtonSchema = exports.bigFormSectionSchema = exports.textInputSchema = exports.phoneInputSchema = exports.inputSchema = exports.dropdownSchema = exports.sprucebotTypedMessageSchema = exports.talkingSprucebotSchema = exports.sprucebotAvatarSchema = exports.formBuilderImportExportObjectSchema = exports.listCellSchema = exports.listRowSchema = exports.listSchema = exports.layoutSchema = exports.cardSectionSchema = exports.cardHeaderSchema = exports.cardFooterSchema = exports.cardBodySchema = exports.cardSchema = exports.formSectionSchema = exports.formSchema = exports.textSchema = void 0;
 exports.barChartAssert = exports.progressNavigatorAssert = exports.countdownTimerInteractor = exports.countdownTimerAssert = exports.calendarInteractor = exports.interactor = exports.normalizeScopeFromVc = exports.autocompleteInteractor = exports.formAssert = exports.autocompleteAssert = exports.listAssert = exports.buttonAssert = exports.deviceAssert = exports.navigationAssert = exports.toolBeltAssert = exports.toastAssert = exports.vcPluginAssert = exports.vcDurationAssert = exports.pagerAssert = exports.vcAssert = exports.vcAssertUtil = exports.feedAssert = exports.feedInteractor = exports.normalizeFormSectionFieldNamesUtil = exports.ViewControllerError = exports.SpyDevice = exports.StubStorage = exports.ViewControllerFactory = exports.ViewControllerImporter = exports.ViewControllerExporter = exports.pagerSchema = exports.polarAreaDataItemSchema = exports.polarAreaSchema = exports.inputButtonSchema = exports.mapPinSchema = exports.mapSchema = exports.latLngSchema = exports.formBuilderImportExportPageSchema = exports.autocompleteSuggestionSchema = exports.autocompleteInputSchema = exports.feedSchema = exports.calendarShiftSchema = exports.receiptTotalSchema = exports.receiptSectionSchema = exports.receiptLineItemSchema = exports.receiptHeaderSchema = exports.receiptSchema = exports.listDateInputSchema = exports.calendarSelectedDateSchema = exports.calendarEventSchema = void 0;
 exports.barChartDataSetSchema = exports.barChartDataPointSchema = exports.barChartSchema = exports.progressDetailsSchema = exports.progressNavigatorStepSchema = exports.progressNavigatorSchema = exports.countdownTimerSchema = exports.destinationSkillViewControllerSchema = exports.permissionContractReferenceSchema = exports.navigationButtonSchema = exports.navigationSchema = exports.ToolBeltStateMachine = exports.removeUniversalViewOptions = exports.buildSkillViewLayout = exports.splitCardsIntoLayouts = exports.listUtil = exports.mapInteractor = exports.mapAssert = exports.renderUtil = exports.routerTestPatcher = exports.dialogTestPatcher = exports.confirmTestPatcher = exports.calendarSeeder = exports.interactionUtil = void 0;
@@ -29,8 +29,8 @@ var Abstract_svc_1 = require("./skillViewControllers/Abstract.svc");
 Object.defineProperty(exports, "AbstractSkillViewController", { enumerable: true, get: function () { return __importDefault(Abstract_svc_1).default; } });
 var Abstract_vc_1 = require("./viewControllers/Abstract.vc");
 Object.defineProperty(exports, "AbstractViewController", { enumerable: true, get: function () { return __importDefault(Abstract_vc_1).default; } });
-var Abstract_avc_1 = require("./viewControllers/Abstract.avc");
-Object.defineProperty(exports, "AbstractAppViewController", { enumerable: true, get: function () { return __importDefault(Abstract_avc_1).default; } });
+var Abstract_ac_1 = require("./viewControllers/Abstract.ac");
+Object.defineProperty(exports, "AbstractAppController", { enumerable: true, get: function () { return __importDefault(Abstract_ac_1).default; } });
 __exportStar(require("./viewControllers/BigForm.vc"), exports);
 var ButtonGroup_vc_1 = require("./viewControllers/ButtonGroup.vc");
 Object.defineProperty(exports, "ButtonGroupViewController", { enumerable: true, get: function () { return __importDefault(ButtonGroup_vc_1).default; } });

package/build/tests/utilities/navigationAssert.d.ts

@@ -1,5 +1,5 @@
 import { PermissionContractId } from '@sprucelabs/mercury-types';
-import { Navigation, SkillViewController, SkillViewControllerId, ViewController } from '../../types/heartwood.types';
+import { AppController, Navigation, SkillViewController, SkillViewControllerId, ViewController } from '../../types/heartwood.types';
 declare const navigationAssert: {
     rendersButton(vc: ViewController<Navigation>, id: string): void;
     buttonRedirectsTo(options: {
@@ -12,7 +12,9 @@ declare const navigationAssert: {
     }): void;
     rendersButtons(vc: ViewController<Navigation>, ids: string[]): void;
     rendersButtonLabels(vc: ViewController<Navigation>): void;
-    skillViewRendersNavigation(vc: Pick<SkillViewController, "renderNavigation">): ViewController<import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Navigation>;
+    skillViewRendersNavigation(vc: Pick<SkillViewController, "renderNavigation">, msg?: string): ViewController<import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Navigation>;
+    appRendersNavigation(vc: Pick<AppController, "renderNavigation">): ViewController<import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Navigation>;
+    appDoesNotRenderNavigation(vc: Pick<AppController, "renderNavigation">): void;
     skillViewDoesNotRenderNavigation(vc: Pick<SkillViewController, "renderNavigation">): void;
     buttonRequiresViewPermissions(vc: ViewController<Navigation>, button: string, permissionContractId: PermissionContractId): void;
 };

package/build/tests/utilities/navigationAssert.js

@@ -26,11 +26,19 @@ const navigationAssert = {
         const model = render_utility_1.default.render(vc);
         test_utils_1.assert.isTrue(model.shouldRenderButtonLabels, `Your navigation should render button labels but it is not! Try shouldRenderButtonLabels: true`);
     },
-    skillViewRendersNavigation(vc) {
+    skillViewRendersNavigation(vc, msg) {
         const nav = vc.renderNavigation?.();
-        test_utils_1.assert.isTruthy(nav, `Your skill view did not render a navigation! Implement renderNavigation() and use this.Controller('navigation', {}) to render one.`);
+        test_utils_1.assert.isTruthy(nav, msg ??
+            `Your skill view did not render a navigation! Implement renderNavigation() and use this.Controller('navigation', {}) to render one.`);
         return nav.controller;
     },
+    appRendersNavigation(vc) {
+        return this.skillViewRendersNavigation(vc, `Your AppController did not render a navigation! Implement renderNavigation() and use this.Controller('navigation', {}) to render one.`);
+    },
+    appDoesNotRenderNavigation(vc) {
+        const nav = vc.renderNavigation?.();
+        test_utils_1.assert.isNull(nav, `Your AppController should not render a navigation! Implement renderNavigation() and return null.`);
+    },
     skillViewDoesNotRenderNavigation(vc) {
         const nav = vc.renderNavigation?.();
         test_utils_1.assert.isNull(nav, `Your skill view should not render a navigation! Implement renderNavigation() and return null.`);

package/build/types/heartwood.types.d.ts

@@ -210,6 +210,7 @@ export type ImportedViewController = (new (options: ViewControllerOptions) => Vi
 };
 export type ViewControllerId = keyof ViewControllerMap;
 export type SkillViewControllerId = keyof SkillViewControllerMap;
+export type AppControllerId = keyof AppControllerMap;
 export interface RedirectOptions {
     shouldTrackHistory?: boolean;
 }
@@ -349,6 +350,8 @@ export interface SkillViewControllerMap {
 }
 export interface SkillViewControllerArgsMap {
 }
+export interface AppControllerMap {
+}
 export type ControllerOptions<N extends ViewControllerId, O extends ViewControllerOptionsMap = ViewControllerOptionsMap> = Omit<N extends keyof O ? O[N] : Record<string, never>, UniversalViewOptionFields>;
 export type MapUtil = typeof mapUtil;
 export interface OpenNavigationOptions {
@@ -511,15 +514,18 @@ export interface ActiveRecordSearchOptions {
     shouldSearchClientSide?: boolean;
     placeholder?: string;
 }
-export interface AppViewController {
+export interface AppController {
     renderNavigation?(): Navigation | null | undefined;
     renderToolBelt?(): ToolBelt | null | undefined;
-    load?(options: AppViewControllerLoadOptions): Promise<void>;
+    load(options: AppControllerLoadOptions): Promise<void>;
 }
-export type AppViewControllerConstructor = (new (options: ViewControllerOptions) => AppViewController) & {
+export type BuiltAppController = AppController & {
+    id: string;
+};
+export type AppControllerConstructor = (new (options: ViewControllerOptions) => AppController) & {
     id: string;
 };
-export interface AppViewControllerLoadOptions {
+export interface AppControllerLoadOptions {
     router: Router;
     authenticator: Authenticator;
     authorizer: Authorizer;

package/build/viewControllers/Abstract.ac.d.ts

@@ -0,0 +1,9 @@
+import { AppController, AppControllerLoadOptions, ControllerOptions, ViewControllerId, ViewControllerMap, ViewControllerOptions, ViewControllerPlugins } from '../types/heartwood.types';
+export default abstract class AbstractAppController implements AppController {
+    static id: string;
+    protected plugins: ViewControllerPlugins;
+    private views;
+    constructor(options: ViewControllerOptions);
+    load(options: AppControllerLoadOptions): Promise<void>;
+    Controller<N extends ViewControllerId, O extends ControllerOptions<N>>(id: N, options: O): ViewControllerMap[N];
+}

package/build/viewControllers/Abstract.ac.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class AbstractAppController {
+    constructor(options) {
+        const { plugins, vcFactory } = options;
+        this.plugins = plugins;
+        this.views = vcFactory;
+    }
+    async load(options) { }
+    Controller(id, options) {
+        return this.views.Controller(id, options);
+    }
+}
+exports.default = AbstractAppController;

package/build/viewControllers/ViewControllerFactory.d.ts

@@ -1,6 +1,6 @@
 import { DateUtil } from '@sprucelabs/calendar-utils';
 import { Log } from '@sprucelabs/spruce-skill-utils';
-import { ConfirmHandler, ControllerOptions, ImportedViewController, RenderInDialogHandler, ViewController, ViewControllerMap, ViewControllerId, VoteHandler, Device, MapUtil, ViewControllerConstructor, ToastHandler, ViewControllerPlugins, ViewControllerPluginsByName, ConnectToApi, ViewControllerPlugin, ViewControllerPluginOptions, ViewControllerOptions, AppViewController, AppViewControllerConstructor } from '../types/heartwood.types';
+import { ConfirmHandler, ControllerOptions, ImportedViewController, RenderInDialogHandler, ViewController, ViewControllerMap, ViewControllerId, VoteHandler, Device, MapUtil, ViewControllerConstructor, ToastHandler, ViewControllerPlugins, ViewControllerPluginsByName, ConnectToApi, ViewControllerPlugin, ViewControllerPluginOptions, ViewControllerOptions, AppController, AppControllerConstructor, AppControllerId, AppControllerMap } from '../types/heartwood.types';
 export default class ViewControllerFactory {
     static Class?: typeof ViewControllerFactory;
     private controllerMap;
@@ -22,16 +22,20 @@ export default class ViewControllerFactory {
     static Factory(options: ViewControllerFactoryOptions): ViewControllerFactory;
     setController<Vc extends ViewController<any>>(name: string, Class: ViewControllerConstructor<Vc>): void;
     mixinControllers(map: Record<string, ViewControllerConstructor<ViewController<any>>>): void;
-    importControllers<Vc extends ImportedViewController>(Vcs: Vc[], plugins?: ViewControllerPluginsByName, App?: AppViewControllerConstructor): void;
+    importControllers<Vc extends ImportedViewController>(Vcs: Vc[], plugins?: ViewControllerPluginsByName, App?: AppControllerConstructor): void;
     private importPlugins;
     BuildPlugin<P extends ViewControllerPlugin>(Plugin: new (options: ViewControllerPluginOptions) => P): P;
-    BuildApp<A extends AppViewController>(App: new (options: ViewControllerOptions) => A): A;
+    BuildApp<A extends AppController>(App: new (options: ViewControllerOptions) => A): A & {
+        id: string;
+    };
     hasController(name: string): boolean;
     hasApp(namespace: string): boolean;
     getController<N extends ViewControllerId>(name: N): any;
     setDates(dates: DateUtil): void;
     addPlugin(named: string, plugin: ViewControllerPlugin): void;
-    App(namespace: string): AppViewController;
+    App<Id extends AppControllerId>(namespace: Id): AppControllerMap[Id] & {
+        id: Id;
+    };
     Controller<N extends ViewControllerId, O extends ControllerOptions<N>>(id: N, options: O): ViewControllerMap[N];
     protected buildViewContructorOptions(name: string, options?: Record<string, any>): ViewControllerOptions;
     private sharedConstructorOptions;

package/build/viewControllers/ViewControllerFactory.js

@@ -82,7 +82,19 @@ class ViewControllerFactory {
         return new Plugin(this.sharedConstructorOptions());
     }
     BuildApp(App) {
-        return new App(this.buildViewContructorOptions('App'));
+        const app = new App(this.buildViewContructorOptions('App'));
+        //@ts-ignore
+        if (app.id) {
+            throw new SpruceError_1.default({
+                code: 'INVALID_APP_CONTROLLER',
+                friendlyMessage: `Property \`id\` is reserved in your AppController. Please rename it to \`_id\`.`,
+                //@ts-ignore
+                id: App.id,
+            });
+        }
+        //@ts-ignore
+        app.id = App.id;
+        return app;
     }
     hasController(name) {
         //@ts-ignore
@@ -129,7 +141,7 @@ class ViewControllerFactory {
         if (instance.id) {
             throw new SpruceError_1.default({
                 code: 'INVALID_SKILL_VIEW_CONTROLLER',
-                friendlyMessage: `Property \`id\` is reserved. Please rename it to \`_id\`.`,
+                friendlyMessage: `Property \`id\` is reserved in your ViewController. Please rename it to \`_id\`.`,
                 id,
             });
         }

package/build/viewControllers/ViewControllerImporter.d.ts

@@ -1,4 +1,4 @@
-import { AppViewControllerConstructor, ImportedViewController, ViewControllerPluginsByName } from '../types/heartwood.types';
+import { AppControllerConstructor, ImportedViewController, ViewControllerPluginsByName } from '../types/heartwood.types';
 export default class ViewControllerImporter {
     static Class?: typeof ViewControllerImporter;
     protected constructor();
@@ -9,7 +9,7 @@ export default class ViewControllerImporter {
 }
 interface ImportResults {
     controllers: ImportedViewController[];
-    App?: AppViewControllerConstructor;
+    App?: AppControllerConstructor;
     plugins: ViewControllerPluginsByName;
 }
 export {};

package/package.json

@@ -13,7 +13,7 @@
   "sideEffects": false,
   "license": "MIT",
   "description": "All the power of Heartwood in one, convenient package.",
-  "version": "111.1.32",
+  "version": "111.1.34",
   "skill": {
     "namespace": "HeartwoodViewControllers",
     "commandOverrides": {

package/build/esm/viewControllers/Abstract.avc.d.ts

@@ -1,5 +0,0 @@
-import { AppViewController, ViewControllerOptions } from '../types/heartwood.types';
-export default abstract class AbstractAppViewController implements AppViewController {
-    static id: string;
-    constructor(_options: ViewControllerOptions);
-}

package/build/esm/viewControllers/Abstract.avc.js

@@ -1,3 +0,0 @@
-export default class AbstractAppViewController {
-    constructor(_options) { }
-}

package/build/viewControllers/Abstract.avc.d.ts

@@ -1,5 +0,0 @@
-import { AppViewController, ViewControllerOptions } from '../types/heartwood.types';
-export default abstract class AbstractAppViewController implements AppViewController {
-    static id: string;
-    constructor(_options: ViewControllerOptions);
-}

package/build/viewControllers/Abstract.avc.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class AbstractAppViewController {
-    constructor(_options) { }
-}
-exports.default = AbstractAppViewController;