From c46e1a151977fd4f27dcb77e8a9acda9d8c3beb0 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Fri, 13 Apr 2018 17:54:53 -0400
Subject: [PATCH] Move top-level functions to `Signal.Util`

---
 preload.js                                                 | 1 +
 .../conversation/media-gallery/AttachmentListSection.tsx   | 2 +-
 .../conversation/media-gallery/groupMessagesByDate.ts      | 2 +-
 ts/types/Attachment.ts                                     | 2 +-
 ts/{ => util}/GoogleChrome.ts                              | 2 +-
 ts/util/index.ts                                           | 7 +++++++
 ts/{ => util}/missingCaseError.ts                          | 0
 7 files changed, 12 insertions(+), 4 deletions(-)
 rename ts/{ => util}/GoogleChrome.ts (96%)
 create mode 100644 ts/util/index.ts
 rename ts/{ => util}/missingCaseError.ts (100%)

diff --git a/preload.js b/preload.js
index 0bf24c705..7af805981 100644
--- a/preload.js
+++ b/preload.js
@@ -196,6 +196,7 @@ window.Signal.Types.Errors = require('./js/modules/types/errors');
 window.Signal.Types.Message = Message;
 window.Signal.Types.MIME = require('./ts/types/MIME');
 window.Signal.Types.Settings = require('./js/modules/types/settings');
+window.Signal.Util = require('./ts/util');
 
 window.Signal.Views = {};
 window.Signal.Views.Initialization = require('./js/modules/views/initialization');
diff --git a/ts/components/conversation/media-gallery/AttachmentListSection.tsx b/ts/components/conversation/media-gallery/AttachmentListSection.tsx
index cefa30805..3a013f6d6 100644
--- a/ts/components/conversation/media-gallery/AttachmentListSection.tsx
+++ b/ts/components/conversation/media-gallery/AttachmentListSection.tsx
@@ -6,7 +6,7 @@ import React from 'react';
 import { DocumentListEntry } from './DocumentListEntry';
 import { ImageThumbnail } from './ImageThumbnail';
 import { Message } from './propTypes/Message';
-import { missingCaseError } from '../../../missingCaseError';
+import { missingCaseError } from '../../../util/missingCaseError';
 
 const styles = {
   container: {
diff --git a/ts/components/conversation/media-gallery/groupMessagesByDate.ts b/ts/components/conversation/media-gallery/groupMessagesByDate.ts
index 845c9e37e..fac79dcb3 100644
--- a/ts/components/conversation/media-gallery/groupMessagesByDate.ts
+++ b/ts/components/conversation/media-gallery/groupMessagesByDate.ts
@@ -5,7 +5,7 @@ import moment from 'moment';
 import { compact, groupBy, sortBy } from 'lodash';
 
 import { Message } from './propTypes/Message';
-// import { missingCaseError } from '../../../missingCaseError';
+// import { missingCaseError } from '../../../util/missingCaseError';
 
 type StaticSectionType = 'today' | 'yesterday' | 'thisWeek' | 'thisMonth';
 type YearMonthSectionType = 'yearMonth';
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index c33f6f8c5..fa4e09106 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -3,7 +3,7 @@
  */
 import is from '@sindresorhus/is';
 
-import * as GoogleChrome from '../GoogleChrome';
+import * as GoogleChrome from '../util/GoogleChrome';
 import { MIMEType } from './MIME';
 
 export interface Attachment {
diff --git a/ts/GoogleChrome.ts b/ts/util/GoogleChrome.ts
similarity index 96%
rename from ts/GoogleChrome.ts
rename to ts/util/GoogleChrome.ts
index 7d31c7249..0b652b297 100644
--- a/ts/GoogleChrome.ts
+++ b/ts/util/GoogleChrome.ts
@@ -1,7 +1,7 @@
 /**
  * @prettier
  */
-import * as MIME from './types/MIME';
+import * as MIME from '../types/MIME';
 
 interface MIMETypeSupportMap {
   [key: string]: boolean;
diff --git a/ts/util/index.ts b/ts/util/index.ts
new file mode 100644
index 000000000..9376b0e0b
--- /dev/null
+++ b/ts/util/index.ts
@@ -0,0 +1,7 @@
+/**
+ * @prettier
+ */
+import * as GoogleChrome from './GoogleChrome';
+import { missingCaseError } from './missingCaseError';
+
+export { GoogleChrome, missingCaseError };
diff --git a/ts/missingCaseError.ts b/ts/util/missingCaseError.ts
similarity index 100%
rename from ts/missingCaseError.ts
rename to ts/util/missingCaseError.ts