From 9cde2265989e06e3dc6b4c90c1f18f2c89a10bd9 Mon Sep 17 00:00:00 2001
From: Evan Morikawa <evan@evanmorikawa.com>
Date: Wed, 9 Nov 2016 17:28:53 -0500
Subject: [PATCH] refactor(registry): move all registries into src/registries

---
 .../unread-notifications/spec/main-spec.es6        |  2 +-
 spec/database-object-registry-spec.es6             |  2 +-
 .../component-registry-spec.coffee                 |  2 +-
 .../extension-registry-spec.coffee                 |  2 +-
 spec/stores/task-queue-spec.coffee                 |  2 +-
 src/flux/models/utils.coffee                       |  4 ++--
 src/flux/stores/database-setup-query-builder.es6   |  2 +-
 src/flux/stores/draft-editing-session.coffee       |  2 +-
 src/flux/stores/draft-helpers.es6                  |  2 +-
 src/flux/stores/draft-store.es6                    |  4 ++--
 src/flux/stores/message-store.coffee               |  2 +-
 src/flux/stores/send-actions-store.es6             |  2 +-
 src/flux/stores/task-queue.coffee                  |  2 +-
 src/flux/tasks/multi-send-session-close-task.es6   |  2 +-
 src/flux/tasks/send-draft-task.es6                 |  2 +-
 src/flux/tasks/syncback-metadata-task.es6          |  2 +-
 src/global/nylas-exports.es6                       | 14 +++++++-------
 src/nylas-env.coffee                               |  4 ++--
 src/package.coffee                                 |  4 ++--
 src/{ => registries}/command-registry.es6          |  0
 src/{ => registries}/component-registry.coffee     |  4 ++--
 src/{ => registries}/database-object-registry.es6  |  0
 src/{ => registries}/extension-registry.es6        |  4 ++--
 src/{ => registries}/serializable-registry.es6     |  0
 src/{ => registries}/service-registry.es6          |  0
 src/{ => registries}/sound-registry.coffee         |  0
 src/{ => registries}/store-registry.es6            |  0
 src/{ => registries}/task-registry.es6             |  0
 src/window-event-handler.coffee                    |  2 +-
 29 files changed, 34 insertions(+), 34 deletions(-)
 rename spec/{ => registries}/component-registry-spec.coffee (98%)
 rename spec/{ => registries}/extension-registry-spec.coffee (97%)
 rename src/{ => registries}/command-registry.es6 (100%)
 rename src/{ => registries}/component-registry.coffee (98%)
 rename src/{ => registries}/database-object-registry.es6 (100%)
 rename src/{ => registries}/extension-registry.es6 (93%)
 rename src/{ => registries}/serializable-registry.es6 (100%)
 rename src/{ => registries}/service-registry.es6 (100%)
 rename src/{ => registries}/sound-registry.coffee (100%)
 rename src/{ => registries}/store-registry.es6 (100%)
 rename src/{ => registries}/task-registry.es6 (100%)

diff --git a/internal_packages/unread-notifications/spec/main-spec.es6 b/internal_packages/unread-notifications/spec/main-spec.es6
index f5d901f62..a3a0b986a 100644
--- a/internal_packages/unread-notifications/spec/main-spec.es6
+++ b/internal_packages/unread-notifications/spec/main-spec.es6
@@ -5,7 +5,7 @@ import Category from '../../../src/flux/models/category'
 import CategoryStore from '../../../src/flux/stores/category-store'
 import DatabaseStore from '../../../src/flux/stores/database-store'
 import AccountStore from '../../../src/flux/stores/account-store'
-import SoundRegistry from '../../../src/sound-registry'
+import SoundRegistry from '../../../src/registries/sound-registry'
 import NativeNotifications from '../../../src/native-notifications'
 import {Notifier} from '../lib/main'
 
diff --git a/spec/database-object-registry-spec.es6 b/spec/database-object-registry-spec.es6
index a3b8f4f79..0fdb785dd 100644
--- a/spec/database-object-registry-spec.es6
+++ b/spec/database-object-registry-spec.es6
@@ -2,7 +2,7 @@
 import _ from 'underscore';
 import Model from '../src/flux/models/model';
 import Attributes from '../src/flux/attributes';
-import DatabaseObjectRegistry from '../src/database-object-registry';
+import DatabaseObjectRegistry from '../src/registries/database-object-registry';
 
 class GoodTest extends Model {
   static attributes = _.extend({}, Model.attributes, {
diff --git a/spec/component-registry-spec.coffee b/spec/registries/component-registry-spec.coffee
similarity index 98%
rename from spec/component-registry-spec.coffee
rename to spec/registries/component-registry-spec.coffee
index 89e86f9b5..e7414e62c 100644
--- a/spec/component-registry-spec.coffee
+++ b/spec/registries/component-registry-spec.coffee
@@ -1,5 +1,5 @@
 React = require 'react'
-ComponentRegistry = require '../src/component-registry'
+ComponentRegistry = require '../../src/registries/component-registry'
 
 class TestComponent extends React.Component
   @displayName: 'TestComponent'
diff --git a/spec/extension-registry-spec.coffee b/spec/registries/extension-registry-spec.coffee
similarity index 97%
rename from spec/extension-registry-spec.coffee
rename to spec/registries/extension-registry-spec.coffee
index 609e6d805..c2d79b803 100644
--- a/spec/extension-registry-spec.coffee
+++ b/spec/registries/extension-registry-spec.coffee
@@ -1,4 +1,4 @@
-ExtensionRegistry = require('../src/extension-registry')
+ExtensionRegistry = require('../../src/registries/extension-registry')
 
 class TestExtension
   @name: 'TestExtension'
diff --git a/spec/stores/task-queue-spec.coffee b/spec/stores/task-queue-spec.coffee
index 49f885ddf..93afce196 100644
--- a/spec/stores/task-queue-spec.coffee
+++ b/spec/stores/task-queue-spec.coffee
@@ -2,7 +2,7 @@ Actions = require('../../src/flux/actions').default
 DatabaseStore = require('../../src/flux/stores/database-store').default
 TaskQueue = require '../../src/flux/stores/task-queue'
 Task = require('../../src/flux/tasks/task').default
-TaskRegistry = require('../../src/task-registry').default
+TaskRegistry = require('../../src/registries/task-registry').default
 
 {APIError,
  TimeoutError} = require '../../src/flux/errors'
diff --git a/src/flux/models/utils.coffee b/src/flux/models/utils.coffee
index 9150d96ab..77a719c13 100644
--- a/src/flux/models/utils.coffee
+++ b/src/flux/models/utils.coffee
@@ -4,8 +4,8 @@ path = require('path')
 moment = require('moment-timezone')
 
 DefaultResourcePath = null
-TaskRegistry = require('../../task-registry').default
-DatabaseObjectRegistry = require('../../database-object-registry').default
+TaskRegistry = require('../../registries/task-registry').default
+DatabaseObjectRegistry = require('../../registries/database-object-registry').default
 
 imageData = null
 
diff --git a/src/flux/stores/database-setup-query-builder.es6 b/src/flux/stores/database-setup-query-builder.es6
index dc6af137d..74622cafc 100644
--- a/src/flux/stores/database-setup-query-builder.es6
+++ b/src/flux/stores/database-setup-query-builder.es6
@@ -1,5 +1,5 @@
 /* eslint global-require:0 */
-import DatabaseObjectRegistry from '../../database-object-registry';
+import DatabaseObjectRegistry from '../../registries/database-object-registry';
 import {tableNameForJoin} from '../models/utils';
 
 import Attributes from '../attributes';
diff --git a/src/flux/stores/draft-editing-session.coffee b/src/flux/stores/draft-editing-session.coffee
index 5899aa5b3..c4a5becc3 100644
--- a/src/flux/stores/draft-editing-session.coffee
+++ b/src/flux/stores/draft-editing-session.coffee
@@ -6,7 +6,7 @@ ContactStore = require './contact-store'
 DatabaseStore = require('./database-store').default
 UndoStack = require('../../undo-stack').default
 DraftHelpers = require '../stores/draft-helpers'
-ExtensionRegistry = require '../../extension-registry'
+ExtensionRegistry = require '../../registries/extension-registry'
 {Listener, Publisher} = require '../modules/reflux-coffee'
 SyncbackDraftTask = require('../tasks/syncback-draft-task').default
 CoffeeHelpers = require '../coffee-helpers'
diff --git a/src/flux/stores/draft-helpers.es6 b/src/flux/stores/draft-helpers.es6
index 2997ceb07..581564494 100644
--- a/src/flux/stores/draft-helpers.es6
+++ b/src/flux/stores/draft-helpers.es6
@@ -1,7 +1,7 @@
 import Actions from '../actions'
 import DatabaseStore from './database-store'
 import Message from '../models/message'
-import * as ExtensionRegistry from '../../extension-registry'
+import * as ExtensionRegistry from '../../registries/extension-registry'
 import SyncbackDraftFilesTask from '../tasks/syncback-draft-files-task'
 import DOMUtils from '../../dom-utils'
 
diff --git a/src/flux/stores/draft-store.es6 b/src/flux/stores/draft-store.es6
index 135976751..a69b873fd 100644
--- a/src/flux/stores/draft-store.es6
+++ b/src/flux/stores/draft-store.es6
@@ -15,8 +15,8 @@ import DestroyDraftTask from '../tasks/destroy-draft-task';
 import Thread from '../models/thread';
 import Message from '../models/message';
 import Actions from '../actions';
-import SoundRegistry from '../../sound-registry';
-import * as ExtensionRegistry from '../../extension-registry';
+import SoundRegistry from '../../registries/sound-registry';
+import * as ExtensionRegistry from '../../registries/extension-registry';
 
 
 const {DefaultSendActionKey} = SendActionsStore
diff --git a/src/flux/stores/message-store.coffee b/src/flux/stores/message-store.coffee
index c483202fc..693037b3b 100644
--- a/src/flux/stores/message-store.coffee
+++ b/src/flux/stores/message-store.coffee
@@ -8,7 +8,7 @@ FocusedPerspectiveStore = require('./focused-perspective-store').default
 FocusedContentStore = require "./focused-content-store"
 ChangeUnreadTask = require('../tasks/change-unread-task').default
 NylasAPI = require '../nylas-api'
-ExtensionRegistry = require('../../extension-registry')
+ExtensionRegistry = require('../../registries/extension-registry')
 {deprecate} = require '../../deprecate-utils'
 async = require 'async'
 _ = require 'underscore'
diff --git a/src/flux/stores/send-actions-store.es6 b/src/flux/stores/send-actions-store.es6
index 456df7beb..4198b4a13 100644
--- a/src/flux/stores/send-actions-store.es6
+++ b/src/flux/stores/send-actions-store.es6
@@ -3,7 +3,7 @@ import _str from 'underscore.string'
 import NylasStore from 'nylas-store'
 import Actions from '../actions'
 import SendDraftTask from '../tasks/send-draft-task';
-import * as ExtensionRegistry from '../../extension-registry';
+import * as ExtensionRegistry from '../../registries/extension-registry';
 
 
 const ACTION_CONFIG_KEY = "core.sending.defaultSendType";
diff --git a/src/flux/stores/task-queue.coffee b/src/flux/stores/task-queue.coffee
index 653a7ef1b..5de762ce2 100644
--- a/src/flux/stores/task-queue.coffee
+++ b/src/flux/stores/task-queue.coffee
@@ -6,7 +6,7 @@ path = require 'path'
 CoffeeHelpers = require '../coffee-helpers'
 
 Task = require("../tasks/task").default
-TaskRegistry = require('../../task-registry').default
+TaskRegistry = require('../../registries/task-registry').default
 Utils = require "../models/utils"
 Reflux = require 'reflux'
 Actions = require('../actions').default
diff --git a/src/flux/tasks/multi-send-session-close-task.es6 b/src/flux/tasks/multi-send-session-close-task.es6
index decb1cf3b..7ba900a96 100644
--- a/src/flux/tasks/multi-send-session-close-task.es6
+++ b/src/flux/tasks/multi-send-session-close-task.es6
@@ -4,7 +4,7 @@ import Actions from '../actions';
 import {APIError} from '../errors';
 import NylasAPI from '../nylas-api';
 import TaskQueue from '../../flux/stores/task-queue';
-import SoundRegistry from '../../sound-registry';
+import SoundRegistry from '../../registries/sound-registry';
 import MultiSendToIndividualTask from './multi-send-to-individual-task';
 
 
diff --git a/src/flux/tasks/send-draft-task.es6 b/src/flux/tasks/send-draft-task.es6
index b8ac3b4e0..655a7e0d6 100644
--- a/src/flux/tasks/send-draft-task.es6
+++ b/src/flux/tasks/send-draft-task.es6
@@ -5,7 +5,7 @@ import Actions from '../actions';
 import Message from '../models/message';
 import NylasAPI from '../nylas-api';
 import {APIError, RequestEnsureOnceError} from '../errors';
-import SoundRegistry from '../../sound-registry';
+import SoundRegistry from '../../registries/sound-registry';
 import DatabaseStore from '../stores/database-store';
 import AccountStore from '../stores/account-store';
 import BaseDraftTask from './base-draft-task';
diff --git a/src/flux/tasks/syncback-metadata-task.es6 b/src/flux/tasks/syncback-metadata-task.es6
index 8f0aaf2b0..47647b8c3 100644
--- a/src/flux/tasks/syncback-metadata-task.es6
+++ b/src/flux/tasks/syncback-metadata-task.es6
@@ -1,5 +1,5 @@
 import SyncbackModelTask from './syncback-model-task'
-import DatabaseObjectRegistry from '../../database-object-registry'
+import DatabaseObjectRegistry from '../../registries/database-object-registry'
 
 export default class SyncbackMetadataTask extends SyncbackModelTask {
 
diff --git a/src/global/nylas-exports.es6 b/src/global/nylas-exports.es6
index ed544d409..12dc03e53 100644
--- a/src/global/nylas-exports.es6
+++ b/src/global/nylas-exports.es6
@@ -1,8 +1,8 @@
 /* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
-import TaskRegistry from '../task-registry'
-import StoreRegistry from '../store-registry'
-import DatabaseObjectRegistry from '../database-object-registry'
+import TaskRegistry from '../registries/task-registry'
+import StoreRegistry from '../registries/store-registry'
+import DatabaseObjectRegistry from '../registries/database-object-registry'
 
 const resolveExport = (requireValue) => {
   return requireValue.default || requireValue;
@@ -161,13 +161,13 @@ lazyLoadAndRegisterStore(`FocusedPerspectiveStore`, 'focused-perspective-store')
 lazyLoadAndRegisterStore(`SearchableComponentStore`, 'searchable-component-store');
 lazyLoad(`CustomContenteditableComponents`, 'components/overlaid-components/custom-contenteditable-components');
 
-lazyLoad(`ServiceRegistry`, `service-registry`);
+lazyLoad(`ServiceRegistry`, `registries/service-registry`);
 
 // Decorators
 lazyLoad(`InflatesDraftClientId`, 'decorators/inflates-draft-client-id');
 
 // Extensions
-lazyLoad(`ExtensionRegistry`, 'extension-registry');
+lazyLoad(`ExtensionRegistry`, 'registries/extension-registry');
 lazyLoad(`ComposerExtension`, 'extensions/composer-extension');
 lazyLoad(`MessageViewExtension`, 'extensions/message-view-extension');
 lazyLoad(`ContenteditableExtension`, 'extensions/contenteditable-extension');
@@ -181,7 +181,7 @@ lazyLoadWithGetter(`ReactTestUtils`, () => require('react-addons-test-utils'));
 lazyLoadWithGetter(`Keytar`, () => require('keytar')); // atom-keytar access through native module
 
 // React Components
-lazyLoad(`ComponentRegistry`, 'component-registry');
+lazyLoad(`ComponentRegistry`, 'registries/component-registry');
 lazyLoad(`PriorityUICoordinator`, 'priority-ui-coordinator');
 
 // Utils
@@ -200,7 +200,7 @@ lazyLoad(`MessageUtils`, 'flux/models/message-utils');
 lazyLoad(`EditorAPI`, 'components/contenteditable/editor-api');
 
 // Services
-lazyLoad(`SoundRegistry`, 'sound-registry');
+lazyLoad(`SoundRegistry`, 'registries/sound-registry');
 lazyLoad(`MailRulesTemplates`, 'mail-rules-templates');
 lazyLoad(`MailRulesProcessor`, 'mail-rules-processor');
 lazyLoad(`MailboxPerspective`, 'mailbox-perspective');
diff --git a/src/nylas-env.coffee b/src/nylas-env.coffee
index e879223c1..89626762d 100644
--- a/src/nylas-env.coffee
+++ b/src/nylas-env.coffee
@@ -12,7 +12,7 @@ fs = require 'fs-plus'
 
 WindowEventHandler = require './window-event-handler'
 StylesElement = require './styles-element'
-StoreRegistry = require('./store-registry').default
+StoreRegistry = require('./registries/store-registry').default
 
 Utils = require './flux/models/utils'
 {APIError} = require './flux/errors'
@@ -139,7 +139,7 @@ class NylasEnvConstructor
 
     Config = require './config'
     KeymapManager = require('./keymap-manager').default
-    CommandRegistry = require('./command-registry').default
+    CommandRegistry = require('./registries/command-registry').default
     PackageManager = require './package-manager'
     ThemeManager = require './theme-manager'
     StyleManager = require './style-manager'
diff --git a/src/package.coffee b/src/package.coffee
index e84f17f66..26e01a1cc 100644
--- a/src/package.coffee
+++ b/src/package.coffee
@@ -9,8 +9,8 @@ Q = require 'q'
 
 ModuleCache = require './module-cache'
 
-TaskRegistry = require('./task-registry').default
-DatabaseObjectRegistry = require('./database-object-registry').default
+TaskRegistry = require('./registries/task-registry').default
+DatabaseObjectRegistry = require('./registries/database-object-registry').default
 
 try
   packagesCache = require('../package.json')?._N1Packages ? {}
diff --git a/src/command-registry.es6 b/src/registries/command-registry.es6
similarity index 100%
rename from src/command-registry.es6
rename to src/registries/command-registry.es6
diff --git a/src/component-registry.coffee b/src/registries/component-registry.coffee
similarity index 98%
rename from src/component-registry.coffee
rename to src/registries/component-registry.coffee
index 882ee9c0b..b9354774c 100644
--- a/src/component-registry.coffee
+++ b/src/registries/component-registry.coffee
@@ -1,7 +1,7 @@
 _ = require 'underscore'
 
-{Listener, Publisher} = require './flux/modules/reflux-coffee'
-CoffeeHelpers = require './flux/coffee-helpers'
+{Listener, Publisher} = require '../flux/modules/reflux-coffee'
+CoffeeHelpers = require '../flux/coffee-helpers'
 
 DeprecatedRoles = {
   'thread:BulkAction': 'ThreadActionsToolbarButton',
diff --git a/src/database-object-registry.es6 b/src/registries/database-object-registry.es6
similarity index 100%
rename from src/database-object-registry.es6
rename to src/registries/database-object-registry.es6
diff --git a/src/extension-registry.es6 b/src/registries/extension-registry.es6
similarity index 93%
rename from src/extension-registry.es6
rename to src/registries/extension-registry.es6
index 516b46995..0ca09fad4 100644
--- a/src/extension-registry.es6
+++ b/src/registries/extension-registry.es6
@@ -1,6 +1,6 @@
 import _ from 'underscore';
-import {Listener, Publisher} from './flux/modules/reflux-coffee';
-import {includeModule} from './flux/coffee-helpers';
+import {Listener, Publisher} from '../flux/modules/reflux-coffee';
+import {includeModule} from '../flux/coffee-helpers';
 
 export class Registry {
 
diff --git a/src/serializable-registry.es6 b/src/registries/serializable-registry.es6
similarity index 100%
rename from src/serializable-registry.es6
rename to src/registries/serializable-registry.es6
diff --git a/src/service-registry.es6 b/src/registries/service-registry.es6
similarity index 100%
rename from src/service-registry.es6
rename to src/registries/service-registry.es6
diff --git a/src/sound-registry.coffee b/src/registries/sound-registry.coffee
similarity index 100%
rename from src/sound-registry.coffee
rename to src/registries/sound-registry.coffee
diff --git a/src/store-registry.es6 b/src/registries/store-registry.es6
similarity index 100%
rename from src/store-registry.es6
rename to src/registries/store-registry.es6
diff --git a/src/task-registry.es6 b/src/registries/task-registry.es6
similarity index 100%
rename from src/task-registry.es6
rename to src/registries/task-registry.es6
diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
index a1f5f4016..45ede6510 100644
--- a/src/window-event-handler.coffee
+++ b/src/window-event-handler.coffee
@@ -62,7 +62,7 @@ class WindowEventHandler
       NylasEnv.errorLogger.openLogs()
 
     NylasEnv.commands.add document.body, 'window:toggle-component-regions', ->
-      ComponentRegistry = require './component-registry'
+      ComponentRegistry = require './registries/component-registry'
       ComponentRegistry.toggleComponentRegions()
 
     webContents = NylasEnv.getCurrentWindow().webContents