@sprucelabs/heartwood-view-controllers 116.0.40 → 117.0.1

package/build/auth/Authenticator.d.ts

@@ -1,11 +1,11 @@
-import EventEmitter from 'events';
+import { MercuryEventEmitter } from '@sprucelabs/mercury-types';
 import { Person } from '@sprucelabs/spruce-core-schemas';
-import { Authenticator, AuthenticatorEventName, AuthenticatorEventPayloads, Storage } from '../types/heartwood.types';
+import { AuthContract, Authenticator, Storage } from '../types/heartwood.types';
 export default class AuthenticatorImpl implements Authenticator {
     static Class?: new (storage: Storage) => Authenticator;
     private static instance;
     private static storage;
-    protected eventEmitter: EventEmitter<AuthenticatorEmitterMap>;
+    protected emitter: MercuryEventEmitter<AuthContract>;
     protected storage: Storage;
     protected constructor(storage: Storage);
     static getInstance(): Authenticator;
@@ -15,18 +15,6 @@ export default class AuthenticatorImpl implements Authenticator {
     getSessionToken(): string | null;
     getPerson(): any;
     isLoggedIn(): boolean;
-    clearSession(): void;
-    addEventListener<N extends AuthenticatorEventName>(name: N, cb: AuthenticatorEventPayloads[N]): void;
-}
-export interface AuthenticatorEmitterMap {
-    'did-login': {
-        token: string;
-        person: Person;
-    }[];
-    'will-logout': {
-        person: Person;
-    }[];
-    'did-logout': {
-        person: Person;
-    }[];
+    clearSession(): Promise<void>;
+    addEventListener: MercuryEventEmitter<AuthContract>['on'];
 }

package/build/auth/Authenticator.js

@@ -3,11 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const events_1 = __importDefault(require("events"));
+const mercury_event_emitter_1 = require("@sprucelabs/mercury-event-emitter");
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
+const heartwood_types_1 = require("../types/heartwood.types");
 class AuthenticatorImpl {
     constructor(storage) {
-        this.eventEmitter = new events_1.default();
+        this.addEventListener = async (name, cb) => {
+            await this.emitter.on(name, cb);
+        };
+        this.emitter = new AuthEmitter();
         this.storage = storage;
     }
     static getInstance() {
@@ -29,7 +33,7 @@ class AuthenticatorImpl {
     setSessionToken(token, person) {
         this.storage.setItem('sessionToken', token);
         this.storage.setItem('person', JSON.stringify(person));
-        this.eventEmitter.emit('did-login', { token, person });
+        void this.emitter.emit('did-login', { token, person });
     }
     getSessionToken() {
         return this.storage.getItem('sessionToken') ?? null;
@@ -41,19 +45,20 @@ class AuthenticatorImpl {
     isLoggedIn() {
         return !!this.getSessionToken();
     }
-    clearSession() {
+    async clearSession() {
         if (!this.isLoggedIn()) {
             return;
         }
         const person = JSON.parse(this.storage.getItem('person') ?? '{}');
-        this.eventEmitter.emit('will-logout', { person });
+        await this.emitter.emit('will-logout', { person });
         this.storage.removeItem('sessionToken');
         this.storage.removeItem('person');
-        this.eventEmitter.emit('did-logout', { person });
-    }
-    addEventListener(name, cb) {
-        //@ts-ignore
-        this.eventEmitter.addListener(name, cb);
+        await this.emitter.emit('did-logout', { person });
     }
 }
 exports.default = AuthenticatorImpl;
+class AuthEmitter extends mercury_event_emitter_1.AbstractEventEmitter {
+    constructor() {
+        super(heartwood_types_1.authContract);
+    }
+}

package/build/esm/auth/Authenticator.d.ts

@@ -1,11 +1,11 @@
-import EventEmitter from 'events';
+import { MercuryEventEmitter } from '@sprucelabs/mercury-types';
 import { Person } from '@sprucelabs/spruce-core-schemas';
-import { Authenticator, AuthenticatorEventName, AuthenticatorEventPayloads, Storage } from '../types/heartwood.types';
+import { AuthContract, Authenticator, Storage } from '../types/heartwood.types';
 export default class AuthenticatorImpl implements Authenticator {
     static Class?: new (storage: Storage) => Authenticator;
     private static instance;
     private static storage;
-    protected eventEmitter: EventEmitter<AuthenticatorEmitterMap>;
+    protected emitter: MercuryEventEmitter<AuthContract>;
     protected storage: Storage;
     protected constructor(storage: Storage);
     static getInstance(): Authenticator;
@@ -15,18 +15,6 @@ export default class AuthenticatorImpl implements Authenticator {
     getSessionToken(): string | null;
     getPerson(): any;
     isLoggedIn(): boolean;
-    clearSession(): void;
-    addEventListener<N extends AuthenticatorEventName>(name: N, cb: AuthenticatorEventPayloads[N]): void;
-}
-export interface AuthenticatorEmitterMap {
-    'did-login': {
-        token: string;
-        person: Person;
-    }[];
-    'will-logout': {
-        person: Person;
-    }[];
-    'did-logout': {
-        person: Person;
-    }[];
+    clearSession(): Promise<void>;
+    addEventListener: MercuryEventEmitter<AuthContract>['on'];
 }

package/build/esm/auth/Authenticator.js

@@ -1,8 +1,21 @@
-import EventEmitter from 'events';
+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());
+    });
+};
+import { AbstractEventEmitter } from '@sprucelabs/mercury-event-emitter';
 import SpruceError from '../errors/SpruceError.js';
+import { authContract, } from '../types/heartwood.types.js';
 export default class AuthenticatorImpl {
     constructor(storage) {
-        this.eventEmitter = new EventEmitter();
+        this.addEventListener = (name, cb) => __awaiter(this, void 0, void 0, function* () {
+            yield this.emitter.on(name, cb);
+        });
+        this.emitter = new AuthEmitter();
         this.storage = storage;
     }
     static getInstance() {
@@ -25,7 +38,7 @@ export default class AuthenticatorImpl {
     setSessionToken(token, person) {
         this.storage.setItem('sessionToken', token);
         this.storage.setItem('person', JSON.stringify(person));
-        this.eventEmitter.emit('did-login', { token, person });
+        void this.emitter.emit('did-login', { token, person });
     }
     getSessionToken() {
         var _a;
@@ -39,18 +52,21 @@ export default class AuthenticatorImpl {
         return !!this.getSessionToken();
     }
     clearSession() {
-        var _a;
-        if (!this.isLoggedIn()) {
-            return;
-        }
-        const person = JSON.parse((_a = this.storage.getItem('person')) !== null && _a !== void 0 ? _a : '{}');
-        this.eventEmitter.emit('will-logout', { person });
-        this.storage.removeItem('sessionToken');
-        this.storage.removeItem('person');
-        this.eventEmitter.emit('did-logout', { person });
-    }
-    addEventListener(name, cb) {
-        //@ts-ignore
-        this.eventEmitter.addListener(name, cb);
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (!this.isLoggedIn()) {
+                return;
+            }
+            const person = JSON.parse((_a = this.storage.getItem('person')) !== null && _a !== void 0 ? _a : '{}');
+            yield this.emitter.emit('will-logout', { person });
+            this.storage.removeItem('sessionToken');
+            this.storage.removeItem('person');
+            yield this.emitter.emit('did-logout', { person });
+        });
+    }
+}
+class AuthEmitter extends AbstractEventEmitter {
+    constructor() {
+        super(authContract);
     }
 }

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

@@ -1,7 +1,7 @@
 import { DateUtil, Locale as ILocale, TimezoneName as ITimezoneName } from '@sprucelabs/calendar-utils';
 import { MercuryClient, MercuryClientFactory } from '@sprucelabs/mercury-client';
-import { PermissionContractId, PermissionId, SpruceSchemas } from '@sprucelabs/mercury-types';
-import { AddressFieldValue, FieldDefinitions, FieldError, Schema, SchemaFieldNames, SchemaPartialValues } from '@sprucelabs/schema';
+import { MercuryEventEmitter, PermissionContractId, PermissionId, SpruceSchemas } from '@sprucelabs/mercury-types';
+import { AddressFieldValue, FieldDefinitions, FieldError, Schema, SchemaFieldNames, SchemaPartialValues, SchemaValues } from '@sprucelabs/schema';
 import { Log } from '@sprucelabs/spruce-skill-utils';
 import { BarChartViewController, CalendarEventOptions, PagerViewController } from '..';
 import { fancyIcons, lineIcons } from '../constants';
@@ -44,31 +44,99 @@ import '@sprucelabs/mercury-core-events';
 export { default as MapViewController } from '../viewControllers/Map.vc';
 export type ErrorHandler = (message: string) => void;
 type Person = SpruceSchemas.Spruce.v2020_07_22.Person;
-type DidLoginPayload = (payload: {
-    token: string;
-    person: Person;
-}) => void;
-type DidLogoutPayload = (payload: {
-    person: Person;
-}) => void;
-export interface AuthenticatorEventPayloads {
-    'did-login': DidLoginPayload;
-    'will-logout': DidLoginPayload;
-    'did-logout': DidLogoutPayload;
-}
-export type AuthenticatorEventName = keyof AuthenticatorEventPayloads;
+export declare const didLoginPayload: {
+    id: string;
+    fields: {
+        token: {
+            type: "text";
+            isRequired: true;
+        };
+        person: {
+            type: "schema";
+            isRequired: true;
+            options: {
+                schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+            };
+        };
+    };
+};
+export declare const didLogoutPayload: {
+    id: string;
+    fields: {
+        person: {
+            type: "schema";
+            isRequired: true;
+            options: {
+                schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+            };
+        };
+    };
+};
+export type DidLoginPayload = SchemaValues<typeof didLoginPayload>;
+export type DidLogoutPayload = SchemaValues<typeof didLogoutPayload>;
 export interface Storage {
     removeItem(key: string): void;
     setItem(key: string, value: string): void;
     getItem(key: string): string | null;
 }
+export declare const authContract: {
+    eventSignatures: {
+        'did-login': {
+            emitPayloadSchema: {
+                id: string;
+                fields: {
+                    token: {
+                        type: "text";
+                        isRequired: true;
+                    };
+                    person: {
+                        type: "schema";
+                        isRequired: true;
+                        options: {
+                            schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+                        };
+                    };
+                };
+            };
+        };
+        'will-logout': {
+            emitPayloadSchema: {
+                id: string;
+                fields: {
+                    person: {
+                        type: "schema";
+                        isRequired: true;
+                        options: {
+                            schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+                        };
+                    };
+                };
+            };
+        };
+        'did-logout': {
+            emitPayloadSchema: {
+                id: string;
+                fields: {
+                    person: {
+                        type: "schema";
+                        isRequired: true;
+                        options: {
+                            schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+                        };
+                    };
+                };
+            };
+        };
+    };
+};
+export type AuthContract = typeof authContract;
 export interface Authenticator {
     getPerson(): Person | null;
     setSessionToken(token: string, person: Person): void;
     getSessionToken(): string | null;
     isLoggedIn(): boolean;
-    clearSession(): void;
-    addEventListener<N extends 'did-login' | 'did-logout' | 'will-logout'>(name: N, cb: AuthenticatorEventPayloads[N]): void;
+    clearSession(): Promise<void>;
+    addEventListener: MercuryEventEmitter<AuthContract>['on'];
 }
 export interface AuthenticatorStatic {
     getInstance(): Authenticator;

package/build/esm/types/heartwood.types.js

@@ -1,3 +1,47 @@
+import { buildEventContract, } from '@sprucelabs/mercury-types';
+import { buildSchema, } from '@sprucelabs/schema';
+import { personSchema } from '@sprucelabs/spruce-core-schemas';
 export * from './calendar.types.js';
 import '@sprucelabs/mercury-core-events';
 export { default as MapViewController } from '../viewControllers/Map.vc.js';
+export const didLoginPayload = buildSchema({
+    id: 'authDidLoginPayload',
+    fields: {
+        token: {
+            type: 'text',
+            isRequired: true,
+        },
+        person: {
+            type: 'schema',
+            isRequired: true,
+            options: {
+                schema: personSchema,
+            },
+        },
+    },
+});
+export const didLogoutPayload = buildSchema({
+    id: 'authDidLogoutPayload',
+    fields: {
+        person: {
+            type: 'schema',
+            isRequired: true,
+            options: {
+                schema: personSchema,
+            },
+        },
+    },
+});
+export const authContract = buildEventContract({
+    eventSignatures: {
+        'did-login': {
+            emitPayloadSchema: didLoginPayload,
+        },
+        'will-logout': {
+            emitPayloadSchema: didLogoutPayload,
+        },
+        'did-logout': {
+            emitPayloadSchema: didLogoutPayload,
+        },
+    },
+});

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

@@ -1,7 +1,7 @@
 import { DateUtil, Locale as ILocale, TimezoneName as ITimezoneName } from '@sprucelabs/calendar-utils';
 import { MercuryClient, MercuryClientFactory } from '@sprucelabs/mercury-client';
-import { PermissionContractId, PermissionId, SpruceSchemas } from '@sprucelabs/mercury-types';
-import { AddressFieldValue, FieldDefinitions, FieldError, Schema, SchemaFieldNames, SchemaPartialValues } from '@sprucelabs/schema';
+import { MercuryEventEmitter, PermissionContractId, PermissionId, SpruceSchemas } from '@sprucelabs/mercury-types';
+import { AddressFieldValue, FieldDefinitions, FieldError, Schema, SchemaFieldNames, SchemaPartialValues, SchemaValues } from '@sprucelabs/schema';
 import { Log } from '@sprucelabs/spruce-skill-utils';
 import { BarChartViewController, CalendarEventOptions, PagerViewController } from '..';
 import { fancyIcons, lineIcons } from '../constants';
@@ -44,31 +44,99 @@ import '@sprucelabs/mercury-core-events';
 export { default as MapViewController } from '../viewControllers/Map.vc';
 export type ErrorHandler = (message: string) => void;
 type Person = SpruceSchemas.Spruce.v2020_07_22.Person;
-type DidLoginPayload = (payload: {
-    token: string;
-    person: Person;
-}) => void;
-type DidLogoutPayload = (payload: {
-    person: Person;
-}) => void;
-export interface AuthenticatorEventPayloads {
-    'did-login': DidLoginPayload;
-    'will-logout': DidLoginPayload;
-    'did-logout': DidLogoutPayload;
-}
-export type AuthenticatorEventName = keyof AuthenticatorEventPayloads;
+export declare const didLoginPayload: {
+    id: string;
+    fields: {
+        token: {
+            type: "text";
+            isRequired: true;
+        };
+        person: {
+            type: "schema";
+            isRequired: true;
+            options: {
+                schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+            };
+        };
+    };
+};
+export declare const didLogoutPayload: {
+    id: string;
+    fields: {
+        person: {
+            type: "schema";
+            isRequired: true;
+            options: {
+                schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+            };
+        };
+    };
+};
+export type DidLoginPayload = SchemaValues<typeof didLoginPayload>;
+export type DidLogoutPayload = SchemaValues<typeof didLogoutPayload>;
 export interface Storage {
     removeItem(key: string): void;
     setItem(key: string, value: string): void;
     getItem(key: string): string | null;
 }
+export declare const authContract: {
+    eventSignatures: {
+        'did-login': {
+            emitPayloadSchema: {
+                id: string;
+                fields: {
+                    token: {
+                        type: "text";
+                        isRequired: true;
+                    };
+                    person: {
+                        type: "schema";
+                        isRequired: true;
+                        options: {
+                            schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+                        };
+                    };
+                };
+            };
+        };
+        'will-logout': {
+            emitPayloadSchema: {
+                id: string;
+                fields: {
+                    person: {
+                        type: "schema";
+                        isRequired: true;
+                        options: {
+                            schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+                        };
+                    };
+                };
+            };
+        };
+        'did-logout': {
+            emitPayloadSchema: {
+                id: string;
+                fields: {
+                    person: {
+                        type: "schema";
+                        isRequired: true;
+                        options: {
+                            schema: SpruceSchemas.Spruce.v2020_07_22.PersonSchema;
+                        };
+                    };
+                };
+            };
+        };
+    };
+};
+export type AuthContract = typeof authContract;
 export interface Authenticator {
     getPerson(): Person | null;
     setSessionToken(token: string, person: Person): void;
     getSessionToken(): string | null;
     isLoggedIn(): boolean;
-    clearSession(): void;
-    addEventListener<N extends 'did-login' | 'did-logout' | 'will-logout'>(name: N, cb: AuthenticatorEventPayloads[N]): void;
+    clearSession(): Promise<void>;
+    addEventListener: MercuryEventEmitter<AuthContract>['on'];
 }
 export interface AuthenticatorStatic {
     getInstance(): Authenticator;

package/build/types/heartwood.types.js

@@ -17,8 +17,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MapViewController = void 0;
+exports.authContract = exports.didLogoutPayload = exports.didLoginPayload = exports.MapViewController = void 0;
+const mercury_types_1 = require("@sprucelabs/mercury-types");
+const schema_1 = require("@sprucelabs/schema");
+const spruce_core_schemas_1 = require("@sprucelabs/spruce-core-schemas");
 __exportStar(require("./calendar.types"), exports);
 require("@sprucelabs/mercury-core-events");
 var Map_vc_1 = require("../viewControllers/Map.vc");
 Object.defineProperty(exports, "MapViewController", { enumerable: true, get: function () { return __importDefault(Map_vc_1).default; } });
+exports.didLoginPayload = (0, schema_1.buildSchema)({
+    id: 'authDidLoginPayload',
+    fields: {
+        token: {
+            type: 'text',
+            isRequired: true,
+        },
+        person: {
+            type: 'schema',
+            isRequired: true,
+            options: {
+                schema: spruce_core_schemas_1.personSchema,
+            },
+        },
+    },
+});
+exports.didLogoutPayload = (0, schema_1.buildSchema)({
+    id: 'authDidLogoutPayload',
+    fields: {
+        person: {
+            type: 'schema',
+            isRequired: true,
+            options: {
+                schema: spruce_core_schemas_1.personSchema,
+            },
+        },
+    },
+});
+exports.authContract = (0, mercury_types_1.buildEventContract)({
+    eventSignatures: {
+        'did-login': {
+            emitPayloadSchema: exports.didLoginPayload,
+        },
+        'will-logout': {
+            emitPayloadSchema: exports.didLogoutPayload,
+        },
+        'did-logout': {
+            emitPayloadSchema: exports.didLogoutPayload,
+        },
+    },
+});

package/package.json

@@ -13,7 +13,7 @@
   "sideEffects": false,
   "license": "MIT",
   "description": "All the power of Heartwood in one, convenient package.",
-  "version": "116.0.40",
+  "version": "117.0.1",
   "skill": {
     "namespace": "HeartwoodViewControllers",
     "commandOverrides": {
@@ -72,51 +72,51 @@
     "lint.tsc": "tsc -p . --noEmit"
   },
   "dependencies": {
-    "@babel/core": "^7.26.7",
+    "@babel/core": "^7.26.8",
     "@babel/plugin-transform-class-properties": "^7.25.9",
-    "@babel/plugin-transform-runtime": "^7.25.9",
-    "@babel/preset-env": "^7.26.7",
+    "@babel/plugin-transform-runtime": "^7.26.8",
+    "@babel/preset-env": "^7.26.8",
     "@babel/preset-typescript": "^7.26.0",
     "@sprucelabs/calendar-utils": "^42.0.607",
-    "@sprucelabs/error": "^6.0.570",
+    "@sprucelabs/error": "^6.0.571",
     "@sprucelabs/globby": "^2.0.501",
-    "@sprucelabs/mercury-core-events": "^25.1.15",
-    "@sprucelabs/mercury-types": "^47.2.11",
-    "@sprucelabs/schema": "^31.0.28",
-    "@sprucelabs/spruce-core-schemas": "^40.1.616",
-    "@sprucelabs/spruce-event-utils": "^40.2.13",
-    "@sprucelabs/spruce-skill-utils": "^31.2.29",
-    "@sprucelabs/test-utils": "^5.2.2",
+    "@sprucelabs/mercury-core-events": "^25.1.16",
+    "@sprucelabs/mercury-types": "^47.2.12",
+    "@sprucelabs/schema": "^31.0.29",
+    "@sprucelabs/spruce-core-schemas": "^40.1.617",
+    "@sprucelabs/spruce-event-utils": "^40.2.14",
+    "@sprucelabs/spruce-skill-utils": "^31.2.30",
+    "@sprucelabs/test-utils": "^5.2.3",
     "@swc/core": "1.2.103",
     "babel-loader": "^9.2.1",
     "babel-plugin-module-resolver": "^5.0.2",
     "dot-prop": "^9.0.0",
     "dotenv": "^16.4.7",
-    "esbuild": "^0.24.2",
+    "esbuild": "^0.25.0",
     "object-set": "^1.0.1",
     "terser-webpack-plugin": "5.3.1",
     "uglify-js": "^3.19.3",
     "webpack": "5.70.0"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.543",
-    "@sprucelabs/jest-json-reporter": "^8.0.571",
-    "@sprucelabs/mercury-client": "^42.0.707",
-    "@sprucelabs/mercury-event-emitter": "^42.0.707",
-    "@sprucelabs/resolve-path-aliases": "^2.0.528",
+    "@sprucelabs/esm-postbuild": "^6.0.544",
+    "@sprucelabs/jest-json-reporter": "^8.0.572",
+    "@sprucelabs/mercury-client": "^42.0.708",
+    "@sprucelabs/mercury-event-emitter": "^42.0.708",
+    "@sprucelabs/resolve-path-aliases": "^2.0.529",
     "@sprucelabs/semantic-release": "^5.0.2",
-    "@sprucelabs/test": "^9.0.68",
+    "@sprucelabs/test": "^9.0.69",
     "@types/node": "^22.13.1",
     "@types/terser-webpack-plugin": "^5.2.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "chokidar-cli": "^3.0.0",
     "enzyme": "^3.11.0",
-    "eslint": "^9.19.0",
+    "eslint": "^9.20.0",
     "eslint-config-spruce": "^11.2.26",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "jsdom": "^26.0.0",
-    "prettier": "^3.4.2",
+    "prettier": "^3.5.0",
     "ts-node": "^10.9.2",
     "tsc-watch": "^6.2.1",
     "tsconfig-paths": "^4.2.0",