@sprucelabs/spruce-cli 19.0.0 → 19.1.1

package/build/__tests__/behavioral/events/KeepingEventsInSync.test.js

@@ -24,7 +24,7 @@ var _AbstractEventTest2 = _interopRequireDefault(require("../../../tests/Abstrac
 var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class;
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var coreContract = _spruceEventUtils.eventContractUtil.unifyContracts(_mercuryCoreEvents.coreEventContracts);
@@ -45,17 +45,15 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
     value: function () {
       var _hasSyncEventsAction = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
         return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return this.Cli();
-              case 2:
-                _testUtils.assert.isFunction(this.Action('event', 'sync').execute);
-              case 3:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return this.Cli();
+            case 2:
+              _testUtils.assert.isFunction(this.Action('event', 'sync').execute);
+            case 3:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
@@ -71,24 +69,22 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
         var _this = this;
         var results;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.FeatureFixture().installCachedFeatures('eventsInNodeModule');
-              case 2:
-                _context2.next = 4;
-                return this.skipInstallSkillPrompts(function () {
-                  return _this.Action('event', 'sync').execute({});
-                });
-              case 4:
-                results = _context2.sent;
-                _context2.next = 7;
-                return this.assertValidSyncEventsResults(results);
-              case 7:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.FeatureFixture().installCachedFeatures('eventsInNodeModule');
+            case 2:
+              _context2.next = 4;
+              return this.skipInstallSkillPrompts(function () {
+                return _this.Action('event', 'sync').execute({});
+              });
+            case 4:
+              results = _context2.sent;
+              _context2.next = 7;
+              return this.assertValidSyncEventsResults(results);
+            case 7:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
@@ -103,57 +99,55 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _mergesGlobalEvents = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
         var skills, skill2, results, fqen;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return this.FeatureFixture().installCachedFeatures('events');
-              case 2:
-                skills = this.getSkillFixture();
-                _context3.next = 5;
-                return skills.registerCurrentSkill({
-                  name: 'events in sync skill'
-                });
-              case 5:
-                _context3.next = 7;
-                return skills.seedDemoSkill({
-                  name: 'a temp skill'
-                });
-              case 7:
-                skill2 = _context3.sent;
-                _context3.next = 10;
-                return this.Service('dependency').add({
-                  id: skill2.id,
-                  namespace: skill2.slug
-                });
-              case 10:
-                _context3.next = 12;
-                return skills.registerEventContract(skill2, {
-                  eventSignatures: {
-                    'test-sync::v2021_01_01': {
-                      isGlobal: true
-                    }
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return this.FeatureFixture().installCachedFeatures('events');
+            case 2:
+              skills = this.getSkillFixture();
+              _context3.next = 5;
+              return skills.registerCurrentSkill({
+                name: 'events in sync skill'
+              });
+            case 5:
+              _context3.next = 7;
+              return skills.seedDemoSkill({
+                name: 'a temp skill'
+              });
+            case 7:
+              skill2 = _context3.sent;
+              _context3.next = 10;
+              return this.Service('dependency').add({
+                id: skill2.id,
+                namespace: skill2.slug
+              });
+            case 10:
+              _context3.next = 12;
+              return skills.registerEventContract(skill2, {
+                eventSignatures: {
+                  'test-sync::v2021_01_01': {
+                    isGlobal: true
                   }
-                });
-              case 12:
-                _context3.next = 14;
-                return this.Action('event', 'sync').execute({});
-              case 14:
-                results = _context3.sent;
-                _context3.next = 17;
-                return this.assertValidSyncEventsResults(results);
-              case 17:
-                fqen = _spruceEventUtils.eventNameUtil.join({
-                  eventName: 'test-sync',
-                  version: 'v2021_01_01',
-                  eventNamespace: skill2.slug
-                });
-                _context3.next = 20;
-                return this.assertGlobalEventsAreTyped(fqen);
-              case 20:
-              case "end":
-                return _context3.stop();
-            }
+                }
+              });
+            case 12:
+              _context3.next = 14;
+              return this.Action('event', 'sync').execute({});
+            case 14:
+              results = _context3.sent;
+              _context3.next = 17;
+              return this.assertValidSyncEventsResults(results);
+            case 17:
+              fqen = _spruceEventUtils.eventNameUtil.join({
+                eventName: 'test-sync',
+                version: 'v2021_01_01',
+                eventNamespace: skill2.slug
+              });
+              _context3.next = 20;
+              return this.assertGlobalEventsAreTyped(fqen);
+            case 20:
+            case "end":
+              return _context3.stop();
           }
         }, _callee3, this);
       }));
@@ -169,25 +163,23 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
         var _this2 = this;
         var contents;
         return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return this.FeatureFixture().installCachedFeatures('eventsInNodeModule');
-              case 2:
-                _context4.next = 4;
-                return this.skipInstallSkillPrompts(function () {
-                  return _this2.Action('event', 'sync').execute({
-                    skillEventContractTypesFile: 'testy test'
-                  });
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return this.FeatureFixture().installCachedFeatures('eventsInNodeModule');
+            case 2:
+              _context4.next = 4;
+              return this.skipInstallSkillPrompts(function () {
+                return _this2.Action('event', 'sync').execute({
+                  skillEventContractTypesFile: 'testy test'
                 });
-              case 4:
-                contents = _spruceSkillUtils.diskUtil.readFile(this.eventContractPath);
-                _testUtils.assert.doesInclude(contents, "declare module 'testy test'");
-              case 6:
-              case "end":
-                return _context4.stop();
-            }
+              });
+            case 4:
+              contents = _spruceSkillUtils.diskUtil.readFile(this.eventContractPath);
+              _testUtils.assert.doesInclude(contents, "declare module 'testy test'");
+            case 6:
+            case "end":
+              return _context4.stop();
           }
         }, _callee4, this);
       }));
@@ -202,26 +194,24 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _canSyncOnlyCoreEvents = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
         var promise, results;
         return _regenerator["default"].wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                _context5.next = 2;
-                return this.FeatureFixture().installCachedFeatures('eventsInNodeModule');
-              case 2:
-                promise = this.syncCoreEventsPretendingToBeMercuryTypes();
-                _context5.next = 5;
-                return this.skipInstallSkillPrompts();
-              case 5:
-                _context5.next = 7;
-                return promise;
-              case 7:
-                results = _context5.sent;
-                _context5.next = 10;
-                return this.assertValidSyncEventsResults(results, true);
-              case 10:
-              case "end":
-                return _context5.stop();
-            }
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return this.FeatureFixture().installCachedFeatures('eventsInNodeModule');
+            case 2:
+              promise = this.syncCoreEventsPretendingToBeMercuryTypes();
+              _context5.next = 5;
+              return this.skipInstallSkillPrompts();
+            case 5:
+              _context5.next = 7;
+              return promise;
+            case 7:
+              results = _context5.sent;
+              _context5.next = 10;
+              return this.assertValidSyncEventsResults(results, true);
+            case 10:
+            case "end":
+              return _context5.stop();
           }
         }, _callee5, this);
       }));
@@ -236,30 +226,28 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _syncingSchemasDoesNotSyncEventSchemasIfEventsHaveNeverBeenSynced = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
         var cli, event, wasHit, results;
         return _regenerator["default"].wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                _context6.next = 2;
-                return this.FeatureFixture().installCachedFeatures('events');
-              case 2:
-                cli = _context6.sent;
-                event = cli.getFeature('event');
-                wasHit = false; //@ts-ignore
-                event.getEventContractBuilder = function () {
-                  wasHit = true;
-                };
-                _context6.next = 8;
-                return this.Action('schema', 'sync').execute({});
-              case 8:
-                results = _context6.sent;
-                this.assertCoreEventContractsSavedToDisk(false);
-                this.assertCorePayloadSchemasAreCreated(results, false);
-                _testUtils.assert.isFalse(wasHit);
-                _testUtils.assert.isFalse(_spruceSkillUtils.diskUtil.doesFileExist(this.eventContractPath));
-              case 13:
-              case "end":
-                return _context6.stop();
-            }
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return this.FeatureFixture().installCachedFeatures('events');
+            case 2:
+              cli = _context6.sent;
+              event = cli.getFeature('event');
+              wasHit = false; //@ts-ignore
+              event.getEventContractBuilder = function () {
+                wasHit = true;
+              };
+              _context6.next = 8;
+              return this.Action('schema', 'sync').execute({});
+            case 8:
+              results = _context6.sent;
+              this.assertCoreEventContractsSavedToDisk(false);
+              this.assertCorePayloadSchemasAreCreated(results, false);
+              _testUtils.assert.isFalse(wasHit);
+              _testUtils.assert.isFalse(_spruceSkillUtils.diskUtil.doesFileExist(this.eventContractPath));
+            case 13:
+            case "end":
+              return _context6.stop();
           }
         }, _callee6, this);
       }));
@@ -274,34 +262,32 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _syncingSchemaAfterSyncEventsSyncsSchemasAndDoesNotWriteCoreEvents = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
         var cli, event, wasHit, oldGetter, results;
         return _regenerator["default"].wrap(function _callee7$(_context7) {
-          while (1) {
-            switch (_context7.prev = _context7.next) {
-              case 0:
-                _context7.next = 2;
-                return this.FeatureFixture().installCachedFeatures('events');
-              case 2:
-                cli = _context7.sent;
-                _context7.next = 5;
-                return this.Action('event', 'sync').execute({});
-              case 5:
-                event = cli.getFeature('event');
-                wasHit = false;
-                oldGetter = event.getEventContractBuilder.bind(event); //@ts-ignore
-                event.getEventContractBuilder = function () {
-                  wasHit = true;
-                  return oldGetter();
-                };
-                _context7.next = 11;
-                return this.Action('schema', 'sync').execute({});
-              case 11:
-                results = _context7.sent;
-                _testUtils.assert.isTrue(wasHit);
-                _context7.next = 15;
-                return this.assertValidSyncSchemasResults(results, false);
-              case 15:
-              case "end":
-                return _context7.stop();
-            }
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              _context7.next = 2;
+              return this.FeatureFixture().installCachedFeatures('events');
+            case 2:
+              cli = _context7.sent;
+              _context7.next = 5;
+              return this.Action('event', 'sync').execute({});
+            case 5:
+              event = cli.getFeature('event');
+              wasHit = false;
+              oldGetter = event.getEventContractBuilder.bind(event); //@ts-ignore
+              event.getEventContractBuilder = function () {
+                wasHit = true;
+                return oldGetter();
+              };
+              _context7.next = 11;
+              return this.Action('schema', 'sync').execute({});
+            case 11:
+              results = _context7.sent;
+              _testUtils.assert.isTrue(wasHit);
+              _context7.next = 15;
+              return this.assertValidSyncSchemasResults(results, false);
+            case 15:
+            case "end":
+              return _context7.stop();
           }
         }, _callee7, this);
       }));
@@ -316,25 +302,23 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _syncingSchemasAfterSyncingCoreEventsSavesCoreEvents = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
         var results;
         return _regenerator["default"].wrap(function _callee8$(_context8) {
-          while (1) {
-            switch (_context8.prev = _context8.next) {
-              case 0:
-                _context8.next = 2;
-                return this.FeatureFixture().installCachedFeatures('events');
-              case 2:
-                _context8.next = 4;
-                return this.syncCoreEventsPretendingToBeMercuryTypes();
-              case 4:
-                _context8.next = 6;
-                return this.Action('schema', 'sync').execute({});
-              case 6:
-                results = _context8.sent;
-                _context8.next = 9;
-                return this.assertValidSyncSchemasResults(results, true);
-              case 9:
-              case "end":
-                return _context8.stop();
-            }
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              _context8.next = 2;
+              return this.FeatureFixture().installCachedFeatures('events');
+            case 2:
+              _context8.next = 4;
+              return this.syncCoreEventsPretendingToBeMercuryTypes();
+            case 4:
+              _context8.next = 6;
+              return this.Action('schema', 'sync').execute({});
+            case 6:
+              results = _context8.sent;
+              _context8.next = 9;
+              return this.assertValidSyncSchemasResults(results, true);
+            case 9:
+            case "end":
+              return _context8.stop();
           }
         }, _callee8, this);
       }));
@@ -349,27 +333,25 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _syncCoreEventsPretendingToBeMercuryTypes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
         var results, builder;
         return _regenerator["default"].wrap(function _callee9$(_context9) {
-          while (1) {
-            switch (_context9.prev = _context9.next) {
-              case 0:
-                _context9.next = 2;
-                return this.Action('event', 'sync').execute({
-                  shouldSyncOnlyCoreEvents: true,
-                  eventBuilderFile: '../../../builder',
-                  skillEventContractTypesFile: '../../builder'
-                });
-              case 2:
-                results = _context9.sent;
-                builder = "\nexport function buildEventContract(..._: any[]):any { return _[0] }\nexport function buildPermissionContract(..._: any[]):any { return _[0] }\n";
-                _spruceSkillUtils.diskUtil.writeFile(this.resolvePath('src', 'builder.ts'), builder);
-                _context9.next = 7;
-                return this.Service('pkg').uninstall(['@sprucelabs/mercury-types', '@sprucelabs/mercury-client', '@sprucelabs/spruce-event-plugin']);
-              case 7:
-                return _context9.abrupt("return", results);
-              case 8:
-              case "end":
-                return _context9.stop();
-            }
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              _context9.next = 2;
+              return this.Action('event', 'sync').execute({
+                shouldSyncOnlyCoreEvents: true,
+                eventBuilderFile: '../../../builder',
+                skillEventContractTypesFile: '../../builder'
+              });
+            case 2:
+              results = _context9.sent;
+              builder = "\nexport function buildEventContract(..._: any[]):any { return _[0] }\nexport function buildPermissionContract(..._: any[]):any { return _[0] }\n";
+              _spruceSkillUtils.diskUtil.writeFile(this.resolvePath('src', 'builder.ts'), builder);
+              _context9.next = 7;
+              return this.Service('pkg').uninstall(['@sprucelabs/mercury-types', '@sprucelabs/mercury-client', '@sprucelabs/spruce-event-plugin']);
+            case 7:
+              return _context9.abrupt("return", results);
+            case 8:
+            case "end":
+              return _context9.stop();
           }
         }, _callee9, this);
       }));
@@ -385,17 +367,15 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
         var shouldSyncOnlyCoreEvents,
           _args10 = arguments;
         return _regenerator["default"].wrap(function _callee10$(_context10) {
-          while (1) {
-            switch (_context10.prev = _context10.next) {
-              case 0:
-                shouldSyncOnlyCoreEvents = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : false;
-                _testUtils.assert.isFalsy(results.errors);
-                _context10.next = 4;
-                return this.assertValidSyncSchemasResults(results, shouldSyncOnlyCoreEvents);
-              case 4:
-              case "end":
-                return _context10.stop();
-            }
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              shouldSyncOnlyCoreEvents = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : false;
+              _testUtils.assert.isFalsy(results.errors);
+              _context10.next = 4;
+              return this.assertValidSyncSchemasResults(results, shouldSyncOnlyCoreEvents);
+            case 4:
+            case "end":
+              return _context10.stop();
           }
         }, _callee10, this);
       }));
@@ -410,15 +390,13 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _assertGlobalEventsAreTyped = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(eventName) {
         var contents;
         return _regenerator["default"].wrap(function _callee11$(_context11) {
-          while (1) {
-            switch (_context11.prev = _context11.next) {
-              case 0:
-                contents = _spruceSkillUtils.diskUtil.readFile(this.eventContractPath);
-                _testUtils.assert.doesInclude(contents, "'".concat(eventName, "':"));
-              case 2:
-              case "end":
-                return _context11.stop();
-            }
+          while (1) switch (_context11.prev = _context11.next) {
+            case 0:
+              contents = _spruceSkillUtils.diskUtil.readFile(this.eventContractPath);
+              _testUtils.assert.doesInclude(contents, "'".concat(eventName, "':"));
+            case 2:
+            case "end":
+              return _context11.stop();
           }
         }, _callee11, this);
       }));
@@ -433,29 +411,27 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _assertValidSyncSchemasResults = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(results, shouldSyncOnlyCoreEvents) {
         var coreContractContents, search;
         return _regenerator["default"].wrap(function _callee12$(_context12) {
-          while (1) {
-            switch (_context12.prev = _context12.next) {
-              case 0:
-                _testUtils.assert.isFalsy(results.errors);
-                this.assertCoreEventContractsSavedToDisk(shouldSyncOnlyCoreEvents);
-                this.assertCorePayloadSchemasAreCreated(results, shouldSyncOnlyCoreEvents);
-                _context12.next = 5;
-                return this.assertEventsHavePayloads(results);
-              case 5:
-                _context12.next = 7;
-                return this.assertCombinedContractContents();
-              case 7:
-                coreContractContents = _spruceSkillUtils.diskUtil.readFile(this.eventContractPath);
-                search = "did-message::v2020_12_25': MercuryDidMessageEventContract_v2020_12_25['eventSignatures']['did-message::v2020_12_25']";
-                if (shouldSyncOnlyCoreEvents) {
-                  _testUtils.assert.doesInclude(coreContractContents, search);
-                } else {
-                  _testUtils.assert.doesNotInclude(coreContractContents, search);
-                }
-              case 10:
-              case "end":
-                return _context12.stop();
-            }
+          while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              _testUtils.assert.isFalsy(results.errors);
+              this.assertCoreEventContractsSavedToDisk(shouldSyncOnlyCoreEvents);
+              this.assertCorePayloadSchemasAreCreated(results, shouldSyncOnlyCoreEvents);
+              _context12.next = 5;
+              return this.assertEventsHavePayloads(results);
+            case 5:
+              _context12.next = 7;
+              return this.assertCombinedContractContents();
+            case 7:
+              coreContractContents = _spruceSkillUtils.diskUtil.readFile(this.eventContractPath);
+              search = "did-message::v2020_12_25': MercuryDidMessageEventContract_v2020_12_25['eventSignatures']['did-message::v2020_12_25']";
+              if (shouldSyncOnlyCoreEvents) {
+                _testUtils.assert.doesInclude(coreContractContents, search);
+              } else {
+                _testUtils.assert.doesNotInclude(coreContractContents, search);
+              }
+            case 10:
+            case "end":
+              return _context12.stop();
           }
         }, _callee12, this);
       }));
@@ -470,33 +446,31 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _assertCombinedContractContents = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
         var imported, localContract, sigs, _iterator, _step, sig;
         return _regenerator["default"].wrap(function _callee13$(_context13) {
-          while (1) {
-            switch (_context13.prev = _context13.next) {
-              case 0:
-                _context13.next = 2;
-                return this.importCombinedContractsFile();
-              case 2:
-                imported = _context13.sent;
-                _testUtils.assert.isTruthy(imported);
-                _testUtils.assert.isArray(imported);
-                localContract = _spruceEventUtils.eventContractUtil.unifyContracts(imported);
-                _testUtils.assert.isTruthy(localContract);
-                sigs = _spruceEventUtils.eventContractUtil.getNamedEventSignatures(coreContract);
-                _iterator = _createForOfIteratorHelper(sigs);
-                try {
-                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                    sig = _step.value;
-                    _spruceEventUtils.eventContractUtil.getSignatureByName(localContract, sig.fullyQualifiedEventName);
-                  }
-                } catch (err) {
-                  _iterator.e(err);
-                } finally {
-                  _iterator.f();
+          while (1) switch (_context13.prev = _context13.next) {
+            case 0:
+              _context13.next = 2;
+              return this.importCombinedContractsFile();
+            case 2:
+              imported = _context13.sent;
+              _testUtils.assert.isTruthy(imported);
+              _testUtils.assert.isArray(imported);
+              localContract = _spruceEventUtils.eventContractUtil.unifyContracts(imported);
+              _testUtils.assert.isTruthy(localContract);
+              sigs = _spruceEventUtils.eventContractUtil.getNamedEventSignatures(coreContract);
+              _iterator = _createForOfIteratorHelper(sigs);
+              try {
+                for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                  sig = _step.value;
+                  _spruceEventUtils.eventContractUtil.getSignatureByName(localContract, sig.fullyQualifiedEventName);
                 }
-              case 10:
-              case "end":
-                return _context13.stop();
-            }
+              } catch (err) {
+                _iterator.e(err);
+              } finally {
+                _iterator.f();
+              }
+            case 10:
+            case "end":
+              return _context13.stop();
           }
         }, _callee13, this);
       }));
@@ -511,23 +485,21 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
       var _importCombinedContractsFile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
         var eventContractsFile, contents, imported;
         return _regenerator["default"].wrap(function _callee14$(_context14) {
-          while (1) {
-            switch (_context14.prev = _context14.next) {
-              case 0:
-                eventContractsFile = this.eventContractPath; // hack import to bring types in when importing contract file
-                if (_spruceSkillUtils.diskUtil.doesDirExist(this.resolvePath('node_modules/@sprucelabs/mercury-types'))) {
-                  contents = _spruceSkillUtils.diskUtil.readFile(eventContractsFile);
-                  _spruceSkillUtils.diskUtil.writeFile(eventContractsFile, "import '@sprucelabs/mercury-types'\n".concat(contents));
-                }
-                _context14.next = 4;
-                return this.Service('import').importDefault(eventContractsFile);
-              case 4:
-                imported = _context14.sent;
-                return _context14.abrupt("return", imported);
-              case 6:
-              case "end":
-                return _context14.stop();
-            }
+          while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              eventContractsFile = this.eventContractPath; // hack import to bring types in when importing contract file
+              if (_spruceSkillUtils.diskUtil.doesDirExist(this.resolvePath('node_modules/@sprucelabs/mercury-types'))) {
+                contents = _spruceSkillUtils.diskUtil.readFile(eventContractsFile);
+                _spruceSkillUtils.diskUtil.writeFile(eventContractsFile, "import '@sprucelabs/mercury-types'\n".concat(contents));
+              }
+              _context14.next = 4;
+              return this.Service('import').importDefault(eventContractsFile);
+            case 4:
+              imported = _context14.sent;
+              return _context14.abrupt("return", imported);
+            case 6:
+            case "end":
+              return _context14.stop();
           }
         }, _callee14, this);
       }));
@@ -546,26 +518,24 @@ var KeepingEventsInSyncTest = (_dec = (0, _testUtils.test)(), _dec2 = (0, _testU
           signature,
           _args15 = arguments;
         return _regenerator["default"].wrap(function _callee15$(_context15) {
-          while (1) {
-            switch (_context15.prev = _context15.next) {
-              case 0:
-                eventName = _args15.length > 1 && _args15[1] !== undefined ? _args15[1] : 'authenticate';
-                _context15.next = 3;
-                return this.importCombinedContractsFile();
-              case 3:
-                imported = _context15.sent;
-                contract = _spruceEventUtils.eventContractUtil.unifyContracts(imported);
-                _testUtils.assert.isTruthy(contract);
-                (0, _mercuryTypes.validateEventContract)(contract);
-                signature = _spruceEventUtils.eventContractUtil.getSignatureByName(contract, eventName);
-                _testUtils.assert.isTruthy(signature.emitPayloadSchema);
-                (0, _schema.validateSchema)(signature.emitPayloadSchema);
-                _testUtils.assert.isTruthy(signature.responsePayloadSchema);
-                (0, _schema.validateSchema)(signature.responsePayloadSchema);
-              case 12:
-              case "end":
-                return _context15.stop();
-            }
+          while (1) switch (_context15.prev = _context15.next) {
+            case 0:
+              eventName = _args15.length > 1 && _args15[1] !== undefined ? _args15[1] : 'authenticate';
+              _context15.next = 3;
+              return this.importCombinedContractsFile();
+            case 3:
+              imported = _context15.sent;
+              contract = _spruceEventUtils.eventContractUtil.unifyContracts(imported);
+              _testUtils.assert.isTruthy(contract);
+              (0, _mercuryTypes.validateEventContract)(contract);
+              signature = _spruceEventUtils.eventContractUtil.getSignatureByName(contract, eventName);
+              _testUtils.assert.isTruthy(signature.emitPayloadSchema);
+              (0, _schema.validateSchema)(signature.emitPayloadSchema);
+              _testUtils.assert.isTruthy(signature.responsePayloadSchema);
+              (0, _schema.validateSchema)(signature.responsePayloadSchema);
+            case 12:
+            case "end":
+              return _context15.stop();
           }
         }, _callee15, this);
       }));