Upgrade to Flow explicit inexact object type syntax

Reviewed By: dunnbobcat

Differential Revision: D19416353

fbshipit-source-id: 26f111ed06e8ad7cee6717dbcb391f94e096f91a

src/model/decorators/DraftDecorator.js

@@ -43,6 +43,7 @@ export type DraftDecorator = {
   strategy: DraftDecoratorStrategy,
   component: Function,
   props?: Object,
+  ...
 };
 
 /**
@@ -57,7 +58,6 @@ export type DraftDecoratorComponentProps = {
   decoratedText: string,
   dir: ?HTMLDir,
   end: number,
-
   // Many folks mistakenly assume that there will always be an 'entityKey'
   // passed to a DecoratorComponent.
   // To find the `entityKey`, Draft calls
@@ -66,8 +66,8 @@ export type DraftDecoratorComponentProps = {
   // undefined. That's why `getEntityKeyAt()` is typed to return `?string`.
   // See https://github.com/facebook/draft-js/blob/2da3dcb1c4c106d1b2a0f07b3d0275b8d724e777/src/model/immutable/BlockNode.js#L51
   entityKey: ?string,
-
   key: React.Key,
   offsetKey: string,
   start: number,
+  ...
 };

src/model/decorators/DraftDecoratorType.js

@@ -29,16 +29,15 @@ export type DraftDecoratorType = {
     block: BlockNodeRecord,
     contentState: ContentState,
   ): List<?string>,
-
   /**
    * Given a decorator key, return the component to use when rendering
    * this decorated range.
    */
   getComponentForKey(key: string): Function,
-
   /**
    * Given a decorator key, optionally return the props to use when rendering
    * this decorated range.
    */
   getPropsForKey(key: string): ?Object,
+  ...
 };

src/model/encoding/EntityRange.js

@@ -21,4 +21,5 @@ export type EntityRange = {
   key: number,
   offset: number,
   length: number,
+  ...
 };

src/model/encoding/InlineStyleRange.js

@@ -18,4 +18,5 @@ export type InlineStyleRange = {
   style: string,
   offset: number,
   length: number,
+  ...
 };

src/model/encoding/RawDraftContentBlock.js

@@ -28,4 +28,5 @@ export type RawDraftContentBlock = {
   entityRanges: ?Array<EntityRange>,
   data?: Object,
   children?: Array<RawDraftContentBlock>,
+  ...
 };

src/model/encoding/RawDraftContentState.js

@@ -25,5 +25,6 @@ import type {RawDraftEntity} from 'RawDraftEntity';
  */
 export type RawDraftContentState = {
   blocks: Array<RawDraftContentBlock>,
-  entityMap: {[key: string]: RawDraftEntity},
+  entityMap: {[key: string]: RawDraftEntity, ...},
+  ...
 };

src/model/encoding/RawDraftEntity.js

@@ -20,5 +20,6 @@ import type {DraftEntityType} from 'DraftEntityType';
 export type RawDraftEntity = {
   type: DraftEntityType,
   mutability: DraftEntityMutability,
-  data: ?{[key: string]: any},
+  data: ?{[key: string]: any, ...},
+  ...
 };

src/model/encoding/convertFromHTMLToContentBlocks.js

@@ -241,6 +241,7 @@ type ContentBlockConfig = {
   prevSibling: ?string,
   nextSibling: ?string,
   childConfigs: Array<ContentBlockConfig>,
+  ...
 };
 
 /**
@@ -338,6 +339,7 @@ class ContentBlocksBuilder {
   getContentBlocks(): {
     contentBlocks: ?Array<BlockNodeRecord>,
     entityMap: EntityMap,
+    ...
   } {
     if (this.contentBlocks.length === 0) {
       if (experimentalTreeDataSupport) {
@@ -725,6 +727,7 @@ class ContentBlocksBuilder {
   ): {
     text: string,
     characterList: List<CharacterMetadata>,
+    ...
   } {
     const l = blockConfigs.length - 1;
     let text = '';
@@ -753,7 +756,11 @@ const convertFromHTMLToContentBlocks = (
   html: string,
   DOMBuilder: Function = getSafeBodyFromHTML,
   blockRenderMap?: DraftBlockRenderMap = DefaultDraftBlockRenderMap,
-): ?{contentBlocks: ?Array<BlockNodeRecord>, entityMap: EntityMap} => {
+): ?{
+  contentBlocks: ?Array<BlockNodeRecord>,
+  entityMap: EntityMap,
+  ...
+} => {
   // Be ABSOLUTELY SURE that the dom builder you pass here won't execute
   // arbitrary code in whatever environment you're running this in. For an
   // example of how we try to do this in-browser, see getSafeBodyFromHTML.

src/model/entity/DraftEntity.js

@@ -37,48 +37,38 @@ function logWarning(oldMethodCall, newMethodCall) {
 
 export type DraftEntityMapObject = {
   getLastCreatedEntityKey: () => string,
-
   create: (
     type: DraftEntityType,
     mutability: DraftEntityMutability,
     data?: Object,
   ) => string,
-
   add: (instance: DraftEntityInstance) => string,
-
   get: (key: string) => DraftEntityInstance,
-
   mergeData: (
     key: string,
-    toMerge: {[key: string]: any},
+    toMerge: {[key: string]: any, ...},
   ) => DraftEntityInstance,
-
   replaceData: (
     key: string,
-    newData: {[key: string]: any},
+    newData: {[key: string]: any, ...},
   ) => DraftEntityInstance,
-
   __getLastCreatedEntityKey: () => string,
-
   __create: (
     type: DraftEntityType,
     mutability: DraftEntityMutability,
     data?: Object,
   ) => string,
-
   __add: (instance: DraftEntityInstance) => string,
-
   __get: (key: string) => DraftEntityInstance,
-
   __mergeData: (
     key: string,
-    toMerge: {[key: string]: any},
+    toMerge: {[key: string]: any, ...},
   ) => DraftEntityInstance,
-
   __replaceData: (
     key: string,
-    newData: {[key: string]: any},
+    newData: {[key: string]: any, ...},
   ) => DraftEntityInstance,
+  ...
 };
 
 /**
@@ -163,7 +153,7 @@ const DraftEntity: DraftEntityMapObject = {
    */
   mergeData: function(
     key: string,
-    toMerge: {[key: string]: any},
+    toMerge: {[key: string]: any, ...},
   ): DraftEntityInstance {
     logWarning('DraftEntity.mergeData', 'contentState.mergeEntityData');
     return DraftEntity.__mergeData(key, toMerge);
@@ -177,7 +167,7 @@ const DraftEntity: DraftEntityMapObject = {
    */
   replaceData: function(
     key: string,
-    newData: {[key: string]: any},
+    newData: {[key: string]: any, ...},
   ): DraftEntityInstance {
     logWarning('DraftEntity.replaceData', 'contentState.replaceEntityData');
     return DraftEntity.__replaceData(key, newData);
@@ -239,7 +229,7 @@ const DraftEntity: DraftEntityMapObject = {
    */
   __mergeData: function(
     key: string,
-    toMerge: {[key: string]: any},
+    toMerge: {[key: string]: any, ...},
   ): DraftEntityInstance {
     const instance = DraftEntity.__get(key);
     const newData = {...instance.getData(), ...toMerge};
@@ -253,7 +243,7 @@ const DraftEntity: DraftEntityMapObject = {
    */
   __replaceData: function(
     key: string,
-    newData: {[key: string]: any},
+    newData: {[key: string]: any, ...},
   ): DraftEntityInstance {
     const instance = DraftEntity.__get(key);
     const newInstance = instance.set('data', newData);

src/model/immutable/BlockNode.js

@@ -25,6 +25,7 @@ export type BlockNodeConfig = {
   key?: BlockNodeKey,
   text?: string,
   type?: DraftBlockType,
+  ...
 };
 
 // https://github.com/facebook/draft-js/issues/1492

src/model/immutable/BlockTree.js

@@ -28,6 +28,7 @@ const returnTrue = function() {
 const defaultLeafRange: {
   start: ?number,
   end: ?number,
+  ...
 } = {
   start: null,
   end: null,
@@ -40,6 +41,7 @@ const defaultDecoratorRange: {
   end: ?number,
   decoratorKey: ?string,
   leaves: ?List<LeafRange>,
+  ...
 } = {
   start: null,
   end: null,

src/model/immutable/CharacterMetadata.js

@@ -22,6 +22,7 @@ type CharacterMetadataConfigValueType = DraftInlineStyle | ?string;
 type CharacterMetadataConfig = {
   style?: CharacterMetadataConfigValueType,
   entity?: CharacterMetadataConfigValueType,
+  ...
 };
 
 const EMPTY_SET = OrderedSet();

src/model/immutable/ContentBlockNode.js

@@ -33,6 +33,7 @@ type ContentBlockNodeConfig = BlockNodeConfig & {
   parent?: ?BlockNodeKey,
   prevSibling?: ?BlockNodeKey,
   nextSibling?: ?BlockNodeKey,
+  ...
 };
 
 const EMPTY_SET = OrderedSet();

src/model/immutable/ContentState.js

@@ -36,6 +36,7 @@ const defaultRecord: {
   blockMap: ?BlockMap,
   selectionBefore: ?SelectionState,
   selectionAfter: ?SelectionState,
+  ...
 } = {
   entityMap: null,
   blockMap: null,
@@ -144,13 +145,19 @@ class ContentState extends ContentStateRecord {
     return this;
   }
 
-  mergeEntityData(key: string, toMerge: {[key: string]: any}): ContentState {
+  mergeEntityData(
+    key: string,
+    toMerge: {[key: string]: any, ...},
+  ): ContentState {
     // TODO: update this when we fully remove DraftEntity
     DraftEntity.__mergeData(key, toMerge);
     return this;
   }
 
-  replaceEntityData(key: string, newData: {[key: string]: any}): ContentState {
+  replaceEntityData(
+    key: string,
+    newData: {[key: string]: any, ...},
+  ): ContentState {
     // TODO: update this when we fully remove DraftEntity
     DraftEntity.__replaceData(key, newData);
     return this;
@@ -169,7 +176,9 @@ class ContentState extends ContentStateRecord {
 
   static createFromBlockArray(
     // TODO: update flow type when we completely deprecate the old entity API
-    blocks: Array<BlockNodeRecord> | {contentBlocks: Array<BlockNodeRecord>},
+    blocks:
+      | Array<BlockNodeRecord>
+      | {contentBlocks: Array<BlockNodeRecord>, ...},
     entityMap: ?any,
   ): ContentState {
     // TODO: remove this when we completely deprecate the old entity API

src/model/immutable/DraftBlockRenderConfig.js

@@ -17,4 +17,5 @@ export type DraftBlockRenderConfig = {
   element: string,
   wrapper?: React.Node,
   aliasedElements?: Array<string>,
+  ...
 };

src/model/immutable/EditorState.js

@@ -41,6 +41,7 @@ type EditorStateRecordType = {
   selection: ?SelectionState,
   treeMap: ?OrderedMap<string, List<any>>,
   undoStack: Stack<ContentState>,
+  ...
 };
 
 const defaultRecord: EditorStateRecordType = {

src/model/immutable/EditorStateCreationConfig.js

@@ -20,4 +20,5 @@ export type EditorStateCreationConfig = {
   currentContent: ContentState,
   decorator: ?DraftDecoratorType,
   selection: SelectionState,
+  ...
 };

src/model/immutable/SelectionState.js

@@ -22,6 +22,7 @@ const defaultRecord: {
   focusOffset: number,
   isBackward: boolean,
   hasFocus: boolean,
+  ...
 } = {
   anchorKey: '',
   anchorOffset: 0,

src/model/modifier/DraftRange.js

@@ -14,4 +14,5 @@
 export type DraftRange = {
   start: number,
   end: number,
+  ...
 };

src/model/modifier/RichTextUtils.js

@@ -16,51 +16,38 @@ import type EditorState from 'EditorState';
 import type SelectionState from 'SelectionState';
 import type URI from 'URI';
 
-export type DataObjectForLink = {
-  url: string,
-};
+export type DataObjectForLink = {url: string, ...};
 
 export type RichTextUtils = {
   currentBlockContainsLink: (editorState: EditorState) => boolean,
-
   getCurrentBlockType: (editorState: EditorState) => DraftBlockType,
-
   getDataObjectForLinkURL: (uri: URI) => DataObjectForLink,
-
   handleKeyCommand: (
     editorState: EditorState,
     command: DraftEditorCommand | string,
   ) => ?EditorState,
-
   insertSoftNewline: (editorState: EditorState) => EditorState,
-
   onBackspace: (editorState: EditorState) => ?EditorState,
-
   onDelete: (editorState: EditorState) => ?EditorState,
-
   onTab: (
     event: SyntheticKeyboardEvent<>,
     editorState: EditorState,
     maxDepth: number,
   ) => EditorState,
-
   toggleBlockType: (
     editorState: EditorState,
     blockType: DraftBlockType,
   ) => EditorState,
-
   toggleCode: (editorState: EditorState) => EditorState,
-
   toggleInlineStyle: (
     editorState: EditorState,
     inlineStyle: string,
   ) => EditorState,
-
   toggleLink: (
     editorState: EditorState,
     targetSelection: SelectionState,
     entityKey: ?string,
   ) => EditorState,
-
   tryToRemoveBlockStyle: (editorState: EditorState) => ?ContentState,
+  ...
 };

src/model/paste/DraftPasteProcessor.js

@@ -38,7 +38,11 @@ const DraftPasteProcessor = {
   processHTML(
     html: string,
     blockRenderMap?: DraftBlockRenderMap,
-  ): ?{contentBlocks: ?Array<BlockNodeRecord>, entityMap: EntityMap} {
+  ): ?{
+    contentBlocks: ?Array<BlockNodeRecord>,
+    entityMap: EntityMap,
+    ...
+  } {
     return convertFromHTMLToContentBlocks(
       html,
       getSafeBodyFromHTML,

src/model/transaction/removeEntitiesAtEdges.js

@@ -75,6 +75,7 @@ function getRemovalRange(
 ): {
   start: number,
   end: number,
+  ...
 } {
   let removalRange;