Upgrade Flow (#168)

Author: sstur

.flowconfig

@@ -1,5 +1,5 @@
 [ignore]
-.*/node_modules/@lerna/.*
+.*/node_modules/immutable/dist/immutable.js.flow
 
 [include]
 
@@ -8,7 +8,6 @@
 [options]
 module.system=haste
 esproposal.class_static_fields=enable
-unsafe.enable_getters_and_setters=true
 
 module.name_mapper='^draft-js-import-element$' -> '<PROJECT_ROOT>/packages/draft-js-import-element/src/main'
 module.name_mapper='^draft-js-utils$' -> '<PROJECT_ROOT>/packages/draft-js-utils/src/main'

package.json

@@ -26,7 +26,7 @@
     "eslint-plugin-flowtype": "^2.35.1",
     "eslint-plugin-react": "^7.3.0",
     "expect": "^1.20.1",
-    "flow-bin": "0.42.0",
+    "flow-bin": "^0.92.1",
     "jest": "^20.0.4",
     "lerna": "^3.10.7",
     "prettier-eslint-cli": "^4.3.0",

packages/draft-js-export-markdown/src/stateToMarkdown.js

@@ -182,9 +182,11 @@ class MarkupGenerator {
       this.listItemCounts[blockDepth] + 1);
   }
 
-  insertLineBreaks() {
+  insertLineBreaks(n: number) {
     if (this.currentBlock > 0) {
-      this.output.push('\n');
+      for (let i = 0; i < n; i++) {
+        this.output.push('\n');
+      }
     }
   }
 

packages/draft-js-import-html/src/stateFromHTML.js

@@ -14,11 +14,13 @@ type Options = {
   customInlineFn?: CustomInlineFn;
 };
 
+const defaultOptions: Options = {};
+
 export default function stateFromHTML(
   html: string,
   options?: Options,
 ): ContentState {
-  let {parser, ...otherOptions} = options || {};
+  let {parser, ...otherOptions} = options || defaultOptions;
   if (parser == null) {
     parser = parseHTML;
   }

packages/synthetic-dom/src/SyntheticDOM.js

@@ -31,6 +31,10 @@ export class Node {
   nodeType: number;
   nodeName: string;
   nodeValue: string;
+  childNodes: ?Array<Node>;
+  toString(isXHTML: ?boolean): string {
+    return isXHTML ? '' : '';
+  }
 }
 
 export class TextNode extends Node {
@@ -41,7 +45,8 @@ export class TextNode extends Node {
     this.nodeValue = value;
   }
 
-  toString(): string {
+  // eslint-disable-next-line no-unused-vars
+  toString(isXHTML: ?boolean): string {
     return escape(this.nodeValue);
   }
 }
@@ -50,7 +55,7 @@ export class ElementNode extends Node {
   _name: string;
   _attrMap: Map<string, Attr>;
   _isSelfClosing: boolean;
-  childNodes: Array<Node>;
+  childNodes: ?Array<Node>;
   attributes: AttrList;
 
   constructor(name: string, attributes: ?AttrList, childNodes: ?Array<Node>) {
@@ -72,14 +77,10 @@ export class ElementNode extends Node {
   }
 
   appendChild(node: Node) {
-    if (node.nodeType === NODE_TYPE_FRAGMENT) {
-      if (node.childNodes != null) {
-        // $FlowIssue - Flow doesn't realize that node is a FragmentNode.
-        let childNodes: Array<Node> = node.childNodes;
-        this.childNodes.push(...childNodes);
-      }
+    if (node.nodeType === NODE_TYPE_FRAGMENT && node.childNodes) {
+      this.childNodes && this.childNodes.push(...node.childNodes);
     } else {
-      this.childNodes.push(node);
+      this.childNodes && this.childNodes.push(node);
     }
   }
 
@@ -108,23 +109,16 @@ export class ElementNode extends Node {
       return '<' + this._name + attrString + (isXHTML ? '/>' : '>');
     }
     let childNodes = this.childNodes
-      .map((node) => node.toString(isXHTML))
-      .join('');
+      ? this.childNodes.map((node) => node.toString(isXHTML)).join('')
+      : '';
     return (
-      '<' +
-      this._name +
-      attrString +
-      '>' +
-      childNodes +
-      '</' +
-      this._name +
-      '>'
+      '<' + this._name + attrString + '>' + childNodes + '</' + this._name + '>'
     );
   }
 }
 
 export class FragmentNode extends Node {
-  childNodes: Array<Node>;
+  childNodes: ?Array<Node>;
 
   constructor(childNodes: Array<Node>) {
     super(...arguments);
@@ -136,19 +130,18 @@ export class FragmentNode extends Node {
   }
 
   appendChild(node: Node) {
-    if (node.nodeType === NODE_TYPE_FRAGMENT) {
-      if (node.childNodes != null) {
-        // $FlowIssue - Flow doesn't realize that node is a FragmentNode.
-        let childNodes: Array<Node> = node.childNodes;
-        this.childNodes.push(...childNodes);
-      }
+    if (node.nodeType === NODE_TYPE_FRAGMENT && node.childNodes) {
+      this.childNodes && this.childNodes.push(...node.childNodes);
     } else {
-      this.childNodes.push(node);
+      this.childNodes && this.childNodes.push(node);
     }
   }
 
   toString(isXHTML: ?boolean): string {
-    return this.childNodes.map((node) => node.toString(isXHTML)).join('');
+    let childNodes = this.childNodes;
+    return childNodes
+      ? childNodes.map((node) => node.toString(isXHTML)).join('')
+      : '';
   }
 }
 

packages/synthetic-dom/src/__tests__/SyntheticDOM-test.js

@@ -46,7 +46,7 @@ describe('Elements', () => {
   it('should ignore children for self-closing (void) tags', () => {
     let p = new ElementNode('p');
     let element = new ElementNode('hr', null, [p]);
-    expect(element.childNodes.length).toBe(0);
+    expect(element.childNodes && element.childNodes.length).toBe(0);
     expect(element.toString()).toBe('<hr>');
   });
 
@@ -65,11 +65,11 @@ describe('Elements', () => {
       {name: 'className', value: 'def'},
     ];
     let element = new ElementNode('div', attrs, [p]);
-    expect(element.childNodes.length).toBe(1);
-    let firstChild = element.childNodes[0];
+    expect(element.childNodes && element.childNodes.length).toBe(1);
+    let firstChild = element.childNodes ? element.childNodes[0] : null;
     // Weird branching to make Flow happy.
     if (firstChild instanceof ElementNode) {
-      expect(firstChild.childNodes.length).toBe(2);
+      expect(firstChild.childNodes && firstChild.childNodes.length).toBe(2);
     } else {
       expect(firstChild).toBeAn(ElementNode);
     }

yarn.lock

@@ -2927,9 +2927,10 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
-[email protected]:
-  version "0.42.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.42.0.tgz#05dd754b6b052de7b150f9210e2160746961e3cf"
+flow-bin@^0.92.1:
+  version "0.92.1"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.92.1.tgz#32c136c07235f30c42dc0549a0790f370fad4070"
+  integrity sha512-F5kC5oQOR2FXROAeybJHFqgZP+moKV9fa/53QK4Q4WayTQHdA0KSl48KD1gP0A9mioRLiKUegTva/7I15cX3Iw==
 
 flush-write-stream@^1.0.0:
   version "1.1.0"