@sprucelabs/spruce-event-plugin 62.3.43 → 62.3.45

package/build/errors/SpruceError.js

@@ -9,7 +9,7 @@ class SpruceError extends error_1.default {
     friendlyMessage() {
         const { options } = this;
         let message;
-        switch (options === null || options === void 0 ? void 0 : options.code) {
+        switch (options?.code) {
             case 'EVENT_PLUGIN_ERROR':
                 message = 'A event plugin error just happened!';
                 break;

package/build/plugins/event.plugin.js

@@ -44,7 +44,7 @@ class EventFeaturePlugin {
             this.hasLocalContractBeenUpdated = spruce_skill_utils_1.diskUtil.hasFileChanged(this.combinedContractsFile);
             this._shouldConnectToApi = true;
         }
-        catch (_a) {
+        catch {
             this.log.info('Events have not been synced locally.');
             this._shouldConnectToApi = false;
         }
@@ -53,7 +53,6 @@ class EventFeaturePlugin {
         this.bootHandler = cb;
     }
     async execute() {
-        var _a;
         this.isExecuting = true;
         let willBootResolve;
         let willBootReject;
@@ -70,7 +69,7 @@ class EventFeaturePlugin {
                 await willBoot(event);
             }
             willBootResolve();
-            await Promise.all((_a = this.preRequisites) !== null && _a !== void 0 ? _a : []);
+            await Promise.all(this.preRequisites ?? []);
             if (this.getShouldRegisterEventsAndListeners()) {
                 await this.loadEvents();
                 if (!this.hasLocalContractBeenUpdated &&
@@ -107,7 +106,6 @@ class EventFeaturePlugin {
         }
     }
     async finishExecute() {
-        var _a;
         this.isExecuting = false;
         this._isBooted = true;
         const didBoot = this.getListener('skill', 'did-boot');
@@ -115,7 +113,7 @@ class EventFeaturePlugin {
             await this.queueDidBoot(didBoot);
         }
         else {
-            (_a = this.bootHandler) === null || _a === void 0 ? void 0 : _a.call(this);
+            this.bootHandler?.();
         }
     }
     getShouldCacheListeners() {
@@ -125,7 +123,6 @@ class EventFeaturePlugin {
         return process.env.SHOULD_REGISTER_EVENTS_AND_LISTENERS !== 'false';
     }
     async queueDidBoot(didBoot) {
-        var _a;
         const promise = new Promise((resolve, reject) => {
             this.skill.onBoot(async () => {
                 try {
@@ -140,11 +137,17 @@ class EventFeaturePlugin {
                 }
             });
         });
-        (_a = this.bootHandler) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.bootHandler?.();
         await promise;
     }
     async buildSpruceEvent(eventName, targetAndPayload) {
-        return Object.assign(Object.assign(Object.assign({ skill: this.skill, log: this.log.buildLog(eventName) }, targetAndPayload), this.skill.getContext()), { connectToApiAsSkill: async () => this.connectToApi() });
+        return {
+            skill: this.skill,
+            log: this.log.buildLog(eventName),
+            ...targetAndPayload,
+            ...this.skill.getContext(),
+            connectToApiAsSkill: async () => this.connectToApi(),
+        };
     }
     async checkHealth() {
         try {
@@ -212,7 +215,7 @@ class EventFeaturePlugin {
         await Promise.all([this.loadContracts(), this.loadListeners()]);
     }
     async connectToApi(options) {
-        if ((options === null || options === void 0 ? void 0 : options.shouldWaitForWillBoot) !== false) {
+        if (options?.shouldWaitForWillBoot !== false) {
             await this.willBootPromise;
         }
         if (this.isDestroyed) {
@@ -237,7 +240,7 @@ class EventFeaturePlugin {
                     friendlyMessage: `Stop! I need you to run \`spruce set.remote\` so I know where to connect! Or, you can set HOST in the env directly.`,
                 });
             }
-            this.log.info('Connecting to Mercury at', host !== null && host !== void 0 ? host : 'Production');
+            this.log.info('Connecting to Mercury at', host ?? 'Production');
             this.apiClientPromise = this.connectAndAuthenticate(MercuryClientFactory, host, contracts);
             const { client } = await this.apiClientPromise;
             return client;
@@ -275,7 +278,7 @@ class EventFeaturePlugin {
                     apiKey,
                 });
                 currentSkill = skill;
-                this.log.info(`Authenticated with namespace: ${currentSkill === null || currentSkill === void 0 ? void 0 : currentSkill.slug}.`);
+                this.log.info(`Authenticated with namespace: ${currentSkill?.slug}.`);
             }
             catch (err) {
                 await client.disconnect();
@@ -362,11 +365,14 @@ class EventFeaturePlugin {
         client.setShouldAutoRegisterListeners(false);
         const remoteListeners = this.listeners
             .filter((l) => l.eventNamespace !== 'skill')
-            .map((l) => (Object.assign(Object.assign({}, l), { fqen: spruce_event_utils_1.eventNameUtil.join({
+            .map((l) => ({
+            ...l,
+            fqen: spruce_event_utils_1.eventNameUtil.join({
                 eventName: l.eventName,
                 eventNamespace: l.eventNamespace,
                 version: l.version,
-            }) })));
+            }),
+        }));
         if (remoteListeners.length > 0 && !this.areListenersCached()) {
             await client.emitAndFlattenResponses('register-listeners::v2020_12_25', {
                 payload: {
@@ -380,18 +386,17 @@ class EventFeaturePlugin {
         const all = remoteListeners.map(async (listener) => {
             const { fqen, callback } = listener;
             await client.on(fqen, async (targetAndPayload) => {
-                var _a, _b;
                 const now = Date.now();
                 this.log.info(`Incoming - ${fqen}`);
                 const event = await this.buildSpruceEvent(fqen, targetAndPayload);
                 const decorator = spruce_test_fixtures_1.ClientProxyDecorator.getInstance();
-                event.client = decorator.decorateEmitToPassProxyToken(event.client, (_a = targetAndPayload === null || targetAndPayload === void 0 ? void 0 : targetAndPayload.source) === null || _a === void 0 ? void 0 : _a.proxyToken);
+                event.client = decorator.decorateEmitToPassProxyToken(event.client, targetAndPayload?.source?.proxyToken);
                 try {
                     const results = await callback(event);
                     return results;
                 }
                 catch (err) {
-                    this.log.error(`FQEN:`, fqen, (_b = err.stack) !== null && _b !== void 0 ? _b : err.message, '\n\n************************************\n\n', JSON.stringify(targetAndPayload), '\n\n************************************\n\n');
+                    this.log.error(`FQEN:`, fqen, err.stack ?? err.message, '\n\n************************************\n\n', JSON.stringify(targetAndPayload), '\n\n************************************\n\n');
                     throw err;
                 }
                 finally {
@@ -437,7 +442,6 @@ class EventFeaturePlugin {
         return undefined;
     }
     async loadListeners() {
-        var _a;
         this.log.info('Loading listeners');
         const isInstalled = await this.isInstalled();
         if (!isInstalled && !this.listenersPath) {
@@ -453,7 +457,7 @@ class EventFeaturePlugin {
         const cacher = new ListenerCacher_1.default({
             cwd: this.skill.rootDir,
             listeners,
-            host: (_a = this.getHost()) !== null && _a !== void 0 ? _a : '***NO HOST SET***',
+            host: this.getHost() ?? '***NO HOST SET***',
         });
         this.listenerCacher = cacher; //exposed for testing
         this.haveListenersChanged = cacher.haveListenersChanged();
@@ -480,12 +484,11 @@ class EventFeaturePlugin {
         if (currentSkill) {
             this.eventsIRegistered = [];
             this.allEventSignatures.forEach((signature) => {
-                var _a;
                 if (signature.eventNamespace === currentSkill.slug) {
                     this.eventsIRegistered.push({
                         eventName: signature.eventName,
                         eventNamespace: currentSkill.slug,
-                        version: (_a = signature.version) !== null && _a !== void 0 ? _a : '***coming soon***',
+                        version: signature.version ?? '***coming soon***',
                         signature: signature.signature,
                         fullyQualifiedEventName: signature.fullyQualifiedEventName,
                     });

package/build/tests/AbstractEventPluginTest.js

@@ -46,8 +46,11 @@ class AbstractEventPluginTest extends spruce_test_fixtures_1.AbstractSpruceFixtu
         return destination;
     }
     static async Skill(options) {
-        const { plugins = [event_plugin_1.default] } = options !== null && options !== void 0 ? options : {};
-        const skill = await super.Skill(Object.assign({ plugins }, options));
+        const { plugins = [event_plugin_1.default] } = options ?? {};
+        const skill = await super.Skill({
+            plugins,
+            ...options,
+        });
         return skill;
     }
     static resolveTestPath(pathAfterTestDirsAndFiles) {

package/build/tests/constants.js

@@ -2,9 +2,8 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEMO_NUMBER_DELAYED_CONNECT = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
 dotenv_1.default.config();
-exports.DEMO_NUMBER_DELAYED_CONNECT = (_a = process.env.DEMO_NUMBER_DELAYED_CONNECT) !== null && _a !== void 0 ? _a : '***missing***';
+exports.DEMO_NUMBER_DELAYED_CONNECT = process.env.DEMO_NUMBER_DELAYED_CONNECT ?? '***missing***';

package/build/tests/fixtures/EventFixture.js

@@ -27,7 +27,7 @@ class EventFixture {
     buildEventContract(eventName, eventSignature) {
         return {
             eventSignatures: {
-                [eventName]: eventSignature !== null && eventSignature !== void 0 ? eventSignature : {
+                [eventName]: eventSignature ?? {
                     emitPayloadSchema: (0, spruce_event_utils_1.buildEmitTargetAndPayloadSchema)({
                         eventName,
                         targetSchema: {
@@ -77,7 +77,7 @@ class EventFixture {
     }
     async registerSkillAndSetupListeners(options) {
         mercury_client_1.MercuryClientFactory.setIsTestMode(true);
-        const { eventSignature, onUnregisterListeners, onListen: onSetListener, onAttachListeners, onSetShouldAutoRegisterListeners, onAttachListener, } = options !== null && options !== void 0 ? options : {};
+        const { eventSignature, onUnregisterListeners, onListen: onSetListener, onAttachListeners, onSetShouldAutoRegisterListeners, onAttachListener, } = options ?? {};
         const { skill, client } = await this.skillFixture.loginAsDemoSkill({
             name: 'skill1',
         });
@@ -95,7 +95,7 @@ class EventFixture {
         if (onUnregisterListeners) {
             const client2 = await this.mercuryFixture.connectToApi();
             await client2.on('unregister-listeners::v2020_12_25', async () => {
-                onUnregisterListeners === null || onUnregisterListeners === void 0 ? void 0 : onUnregisterListeners();
+                onUnregisterListeners?.();
                 return { unregisterCount: 0 };
             });
         }
@@ -108,7 +108,7 @@ class EventFixture {
                 //@ts-ignore
                 pluginClient.on = async (fqen, cb) => {
                     if (fqen.includes('seed-skill')) {
-                        onSetListener === null || onSetListener === void 0 ? void 0 : onSetListener(pluginClient);
+                        onSetListener?.(pluginClient);
                     }
                     else if (fqen.includes('test')) {
                         return;
@@ -131,7 +131,7 @@ class EventFixture {
             //@ts-ignore
             events.attachListeners = async (client) => {
                 const results = await oldAttachListeners(client);
-                onAttachListeners === null || onAttachListeners === void 0 ? void 0 : onAttachListeners(client);
+                onAttachListeners?.(client);
                 return results;
             };
         }
@@ -143,12 +143,12 @@ class EventFixture {
                 client.setShouldAutoRegisterListeners = (should) => {
                     //@ts-ignore
                     client.shouldAutoRegisterListeners = should;
-                    onSetShouldAutoRegisterListeners === null || onSetShouldAutoRegisterListeners === void 0 ? void 0 : onSetShouldAutoRegisterListeners(should);
+                    onSetShouldAutoRegisterListeners?.(should);
                 };
                 //@ts-ignore
                 client.on = () => {
                     //@ts-ignore
-                    onAttachListener === null || onAttachListener === void 0 ? void 0 : onAttachListener(client);
+                    onAttachListener?.(client);
                 };
                 return client;
             };
@@ -158,7 +158,7 @@ class EventFixture {
     generateGoodContractFileForSkill(slug, eventSignature) {
         const sourceContents = spruce_skill_utils_1.diskUtil.readFile(spruce_skill_utils_1.diskUtil.resolvePath(this.cwd, 'build', '.spruce', 'events', 'source.events.contract.js'));
         let updatedContents = sourceContents.replace('{{namespace}}', slug);
-        updatedContents = updatedContents.replace('{{eventSignature}}', JSON.stringify(eventSignature !== null && eventSignature !== void 0 ? eventSignature : {
+        updatedContents = updatedContents.replace('{{eventSignature}}', JSON.stringify(eventSignature ?? {
             emitPayloadSchema: {
                 id: 'targetAndPayload',
                 fields: {

package/package.json

@@ -10,7 +10,7 @@
       "@sprucelabs/spruce-test-fixtures"
     ]
   },
-  "version": "62.3.43",
+  "version": "62.3.45",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -59,24 +59,24 @@
     "lint.tsc": "tsc -p . --noEmit"
   },
   "dependencies": {
-    "@sprucelabs/error": "^6.0.475",
-    "@sprucelabs/mercury-types": "^47.0.526",
-    "@sprucelabs/schema": "^30.0.484",
-    "@sprucelabs/spruce-core-schemas": "^40.1.470",
-    "@sprucelabs/spruce-event-utils": "^40.1.246",
-    "@sprucelabs/spruce-skill-booter": "^62.3.43",
-    "@sprucelabs/spruce-skill-utils": "^31.0.543",
-    "@sprucelabs/spruce-test-fixtures": "^62.3.43"
+    "@sprucelabs/error": "^6.0.479",
+    "@sprucelabs/mercury-types": "^47.0.529",
+    "@sprucelabs/schema": "^30.0.488",
+    "@sprucelabs/spruce-core-schemas": "^40.1.473",
+    "@sprucelabs/spruce-event-utils": "^40.1.249",
+    "@sprucelabs/spruce-skill-booter": "^62.3.45",
+    "@sprucelabs/spruce-skill-utils": "^31.0.547",
+    "@sprucelabs/spruce-test-fixtures": "^62.3.45"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.459",
-    "@sprucelabs/jest-json-reporter": "^8.0.475",
-    "@sprucelabs/mercury-client": "^42.0.525",
-    "@sprucelabs/mercury-core-events": "^24.3.287",
-    "@sprucelabs/resolve-path-aliases": "^2.0.454",
+    "@sprucelabs/esm-postbuild": "^6.0.462",
+    "@sprucelabs/jest-json-reporter": "^8.0.480",
+    "@sprucelabs/mercury-client": "^42.0.528",
+    "@sprucelabs/mercury-core-events": "^24.3.290",
+    "@sprucelabs/resolve-path-aliases": "^2.0.457",
     "@sprucelabs/semantic-release": "^5.0.2",
-    "@sprucelabs/test": "^9.0.50",
-    "@sprucelabs/test-utils": "^5.1.425",
+    "@sprucelabs/test": "^9.0.51",
+    "@sprucelabs/test-utils": "^5.1.432",
     "chokidar-cli": "^3.0.0",
     "dotenv": "^16.4.5",
     "eslint": "^9.12.0",
@@ -106,5 +106,5 @@
       "^#spruce/(.*)$": "<rootDir>/build/.spruce/$1"
     }
   },
-  "gitHead": "fe785957ada88b5b1157f978f43eccfcf4cce0c2"
+  "gitHead": "59b913c0b16c2e83a7506abd5618082abfcd1f65"
 }

package/tsconfig.json

@@ -3,10 +3,9 @@
 		"skipLibCheck": true,
 		"module": "commonjs",
 		"esModuleInterop": true,
-		"target": "ES2017",
+		"target": "ES2020",
 		"lib": [
 			"DOM",
-			"es2017",
 			"ES2020"
 		],
 		"declaration": true,