{"body":"[Fiber] Child Reconciler + New Coroutines Primitive","files":[{"status":"M","path":"src\/isomorphic\/classic\/element\/ReactElement.js"},{"status":"M","path":"src\/isomorphic\/classic\/element\/ReactElementValidator.js"},{"status":"M","path":"src\/renderers\/noop\/__tests__\/ReactNoop-test.js"},{"status":"A","path":"src\/renderers\/shared\/fiber\/ReactChildFiber.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiber.js"},{"status":"A","path":"src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js"},{"status":"A","path":"src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js"},{"status":"D","path":"src\/renderers\/shared\/fiber\/ReactFiberFunctionalComponent.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberReconciler.js"},{"status":"A","path":"src\/renderers\/shared\/fiber\/ReactReifiedYield.js"},{"status":"D","path":"src\/renderers\/shared\/fiber\/ReactStateNode.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactTypesOfWork.js"},{"status":"A","path":"src\/renderers\/shared\/fiber\/isomorphic\/ReactCoroutine.js"},{"status":"A","path":"src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js"},{"status":"M","path":"src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactComponent-test.js"}],"parents":["263615573c1812395ff0eb04911b3e55ac213bb1","fd4f74ef955b6d627af8a9fc55a61c828564a67e"],"patch":"diff --git a\/src\/isomorphic\/classic\/element\/ReactElement.js b\/src\/isomorphic\/classic\/element\/ReactElement.js\nindex 4e81544924..98af361b09 100644\n--- a\/src\/isomorphic\/classic\/element\/ReactElement.js\n+++ b\/src\/isomorphic\/classic\/element\/ReactElement.js\n@@ -398,4 +398,6 @@ ReactElement.isValidElement = function(object) {\n );\n };\n \n+ReactElement.REACT_ELEMENT_TYPE = REACT_ELEMENT_TYPE;\n+\n module.exports = ReactElement;\ndiff --git a\/src\/isomorphic\/classic\/element\/ReactElementValidator.js b\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\nindex 2b7e9da3d5..4d4121f981 100644\n--- a\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\n+++ b\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\n@@ -184,7 +184,8 @@ function validatePropTypes(element) {\n var ReactElementValidator = {\n \n createElement: function(type, props, children) {\n- var validType = typeof type === 'string' || typeof type === 'function';\n+ var validType = typeof type === 'string' || typeof type === 'function' ||\n+ (type !== null && typeof type === 'object');\n \/\/ We warn in this case but don't throw. We expect the element creation to\n \/\/ succeed and there will likely be errors in render.\n warning(\ndiff --git a\/src\/renderers\/noop\/__tests__\/ReactNoop-test.js b\/src\/renderers\/noop\/__tests__\/ReactNoop-test.js\nindex b71978e2cd..1ce47ee5c2 100644\n--- a\/src\/renderers\/noop\/__tests__\/ReactNoop-test.js\n+++ b\/src\/renderers\/noop\/__tests__\/ReactNoop-test.js\n@@ -13,11 +13,14 @@\n \n var React;\n var ReactNoop;\n+var ReactCoroutine;\n \n describe('ReactComponent', function() {\n beforeEach(function() {\n React = require('React');\n ReactNoop = require('ReactNoop');\n+ ReactCoroutine = require('ReactCoroutine');\n+ spyOn(console, 'log');\n });\n \n it('should render a simple component', function() {\n@@ -38,11 +41,14 @@ describe('ReactComponent', function() {\n it('should render a simple component, in steps if needed', function() {\n \n function Bar() {\n- return

Hello World<\/div>;\n+ return

Hello World<\/div><\/span>;\n }\n \n function Foo() {\n- return ;\n+ return [\n+ ,\n+ ,\n+ ];\n }\n \n ReactNoop.render();\n@@ -53,5 +59,47 @@ describe('ReactComponent', function() {\n \/\/ console.log('Done');\n });\n \n+ it('should render a coroutine', function() {\n+\n+ function Continuation({ isSame }) {\n+ return {isSame ? 'foo==bar' : 'foo!=bar'}<\/span>;\n+ }\n+\n+ \/\/ An alternative API could mark Continuation as something that needs\n+ \/\/ yielding. E.g. Continuation.yieldType = 123;\n+ function Child({ bar }) {\n+ return ReactCoroutine.createYield({\n+ bar: bar,\n+ }, Continuation, null);\n+ }\n+\n+ function Indirection() {\n+ return [, ];\n+ }\n+\n+ function HandleYields(props, yields) {\n+ return yields.map(y =>\n+ \n+ );\n+ }\n+\n+ \/\/ An alternative API could mark Parent as something that needs\n+ \/\/ yielding. E.g. Parent.handler = HandleYields;\n+ function Parent(props) {\n+ return ReactCoroutine.createCoroutine(\n+ props.children,\n+ HandleYields,\n+ props\n+ );\n+ }\n+\n+ function App() {\n+ return

<\/Parent><\/div>;\n+ }\n+\n+ ReactNoop.render();\n+ ReactNoop.flush();\n+\n+ });\n \n });\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\nnew file mode 100644\nindex 0000000000..bbb666cab0\n--- \/dev\/null\n+++ b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n@@ -0,0 +1,129 @@\n+\/**\n+ * Copyright 2013-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactChildFiber\n+ * @flow\n+ *\/\n+\n+'use strict';\n+\n+import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';\n+import type { Fiber } from 'ReactFiber';\n+\n+import type { ReactNodeList } from 'ReactTypes';\n+\n+var {\n+ REACT_ELEMENT_TYPE,\n+} = require('ReactElement');\n+var {\n+ REACT_COROUTINE_TYPE,\n+ REACT_YIELD_TYPE,\n+} = require('ReactCoroutine');\n+\n+var ReactFiber = require('ReactFiber');\n+var ReactReifiedYield = require('ReactReifiedYield');\n+\n+function createSubsequentChild(parent : Fiber, previousSibling : Fiber, newChildren) : Fiber {\n+ if (typeof newChildren !== 'object' || newChildren === null) {\n+ return previousSibling;\n+ }\n+\n+ switch (newChildren.$$typeof) {\n+ case REACT_ELEMENT_TYPE: {\n+ const element = (newChildren : ReactElement);\n+ const child = ReactFiber.createFiberFromElement(element);\n+ previousSibling.sibling = child;\n+ child.parent = parent;\n+ return child;\n+ }\n+\n+ case REACT_COROUTINE_TYPE: {\n+ const coroutine = (newChildren : ReactCoroutine);\n+ const child = ReactFiber.createFiberFromCoroutine(coroutine);\n+ previousSibling.sibling = child;\n+ child.parent = parent;\n+ return child;\n+ }\n+\n+ case REACT_YIELD_TYPE: {\n+ const yieldNode = (newChildren : ReactYield);\n+ const reifiedYield = ReactReifiedYield.createReifiedYield(yieldNode);\n+ const child = ReactFiber.createFiberFromYield(yieldNode);\n+ child.output = reifiedYield;\n+ previousSibling.sibling = child;\n+ child.parent = parent;\n+ return child;\n+ }\n+ }\n+\n+ if (Array.isArray(newChildren)) {\n+ let prev : Fiber = previousSibling;\n+ for (var i = 0; i < newChildren.length; i++) {\n+ prev = createSubsequentChild(parent, prev, newChildren[i]);\n+ }\n+ return prev;\n+ } else {\n+ console.log('Unknown child', newChildren);\n+ return previousSibling;\n+ }\n+}\n+\n+function createFirstChild(parent, newChildren) {\n+ if (typeof newChildren !== 'object' || newChildren === null) {\n+ return null;\n+ }\n+\n+ switch (newChildren.$$typeof) {\n+ case REACT_ELEMENT_TYPE: {\n+ const element = (newChildren : ReactElement);\n+ const child = ReactFiber.createFiberFromElement(element);\n+ child.parent = parent;\n+ return child;\n+ }\n+\n+ case REACT_COROUTINE_TYPE: {\n+ const coroutine = (newChildren : ReactCoroutine);\n+ const child = ReactFiber.createFiberFromCoroutine(coroutine);\n+ child.parent = parent;\n+ return child;\n+ }\n+\n+ case REACT_YIELD_TYPE: {\n+ \/\/ A yield results in a fragment fiber whose output is the continuation.\n+ \/\/ TODO: When there is only a single child, we can optimize this to avoid\n+ \/\/ the fragment.\n+ const yieldNode = (newChildren : ReactYield);\n+ const reifiedYield = ReactReifiedYield.createReifiedYield(yieldNode);\n+ const child = ReactFiber.createFiberFromYield(yieldNode);\n+ child.output = reifiedYield;\n+ child.parent = parent;\n+ return child;\n+ }\n+ }\n+\n+ if (Array.isArray(newChildren)) {\n+ var first : ?Fiber = null;\n+ var prev : ?Fiber = null;\n+ for (var i = 0; i < newChildren.length; i++) {\n+ if (prev == null) {\n+ prev = createFirstChild(parent, newChildren[i]);\n+ first = prev;\n+ } else {\n+ prev = createSubsequentChild(parent, prev, newChildren[i]);\n+ }\n+ }\n+ return first;\n+ } else {\n+ console.log('Unknown child', newChildren);\n+ return null;\n+ }\n+}\n+\n+exports.reconcileChildFibers = function(parent : Fiber, firstChild : ?Fiber, newChildren : ReactNodeList) : ?Fiber {\n+ return createFirstChild(parent, newChildren);\n+};\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiber.js b\/src\/renderers\/shared\/fiber\/ReactFiber.js\nindex 9e99e8998c..eb17068b6c 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiber.js\n@@ -12,31 +12,47 @@\n \n 'use strict';\n \n-type StateNode = {};\n-type EffectHandler = () => void;\n-type EffectTag = number;\n+var ReactTypesOfWork = require('ReactTypesOfWork');\n+var {\n+ IndeterminateComponent,\n+ ClassComponent,\n+ HostComponent,\n+ CoroutineComponent,\n+ YieldComponent,\n+} = ReactTypesOfWork;\n+\n+var ReactElement = require('ReactElement');\n+\n+import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';\n \n export type Fiber = {\n \n+ \/\/ Tag identifying the type of fiber.\n tag: number,\n \n- parent: ?Fiber,\n+ \/\/ Singly Linked List Tree Structure.\n+ parent: ?Fiber, \/\/ Consider a regenerated temporary parent stack instead.\n child: ?Fiber,\n sibling: ?Fiber,\n \n- input: ?Object,\n- output: ?Object,\n+ \/\/ Input is the data coming into process this fiber. Arguments.\n+ input: any, \/\/ This type will be more specific once we overload the tag.\n+ \/\/ Output is the return value of this fiber, or a linked list of return values\n+ \/\/ if this returns multiple values. Such as a fragment.\n+ output: any, \/\/ This type will be more specific once we overload the tag.\n \n- handler: EffectHandler,\n- handlerTag: EffectTag,\n+ \/\/ Used by multi-stage coroutines.\n+ stage: number, \/\/ Consider reusing the tag field instead.\n \n+ \/\/ This will be used to quickly determine if a subtree has no pending changes.\n hasPendingChanges: bool,\n \n- stateNode: StateNode,\n+ \/\/ The local state associated with this fiber.\n+ stateNode: ?Object,\n \n };\n \n-module.exports = function(tag : number) : Fiber {\n+var createFiber = function(tag : number) : Fiber {\n return {\n \n tag: tag,\n@@ -48,12 +64,53 @@ module.exports = function(tag : number) : Fiber {\n input: null,\n output: null,\n \n- handler: function() {},\n- handlerTag: 0,\n+ stage: 0,\n \n hasPendingChanges: true,\n \n- stateNode: {},\n+ stateNode: null,\n \n };\n };\n+\n+function shouldConstruct(Component) {\n+ return !!(Component.prototype && Component.prototype.isReactComponent);\n+}\n+\n+exports.createFiberFromElement = function(element : ReactElement) {\n+ const fiber = exports.createFiberFromElementType(element.type);\n+ if (typeof element.type === 'object') {\n+ \/\/ Hacky McHack\n+ element = ReactElement(fiber.input, null, element.ref, null, null, null, element.props);\n+ }\n+ fiber.input = element;\n+ return fiber;\n+};\n+\n+exports.createFiberFromElementType = function(type : mixed) {\n+ let fiber;\n+ if (typeof type === 'function') {\n+ fiber = shouldConstruct(type) ?\n+ createFiber(ClassComponent) :\n+ createFiber(IndeterminateComponent);\n+ } else if (typeof type === 'string') {\n+ fiber = createFiber(HostComponent);\n+ } else if (typeof type === 'object' && type !== null) {\n+ \/\/ Currently assumed to be a continuation and therefore is a fiber already.\n+ fiber = type;\n+ } else {\n+ throw new Error('Unknown component type: ' + typeof type);\n+ }\n+ return fiber;\n+};\n+\n+exports.createFiberFromCoroutine = function(coroutine : ReactCoroutine) {\n+ const fiber = createFiber(CoroutineComponent);\n+ fiber.input = coroutine;\n+ return fiber;\n+};\n+\n+exports.createFiberFromYield = function(yieldNode : ReactYield) {\n+ const fiber = createFiber(YieldComponent);\n+ return fiber;\n+};\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\nnew file mode 100644\nindex 0000000000..19026242f9\n--- \/dev\/null\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n@@ -0,0 +1,134 @@\n+\/**\n+ * Copyright 2013-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactFiberBeginWork\n+ * @flow\n+ *\/\n+\n+'use strict';\n+\n+import type { ReactCoroutine } from 'ReactCoroutine';\n+import type { Fiber } from 'ReactFiber';\n+\n+var ReactChildFiber = require('ReactChildFiber');\n+var ReactTypesOfWork = require('ReactTypesOfWork');\n+var {\n+ IndeterminateComponent,\n+ FunctionalComponent,\n+ ClassComponent,\n+ HostComponent,\n+ CoroutineComponent,\n+ YieldComponent,\n+} = ReactTypesOfWork;\n+\n+function getElement(unitOfWork) : ReactElement {\n+ var element = unitOfWork.input;\n+ if (!element) {\n+ throw new Error('Should be resolved by now');\n+ }\n+ return (element : ReactElement);\n+}\n+\n+function updateFunctionalComponent(unitOfWork) {\n+ var element = getElement(unitOfWork);\n+ var fn = element.type;\n+ var props = element.props;\n+ console.log('perform work on:', fn.name);\n+ var nextChildren = fn(props);\n+\n+ unitOfWork.child = ReactChildFiber.reconcileChildFibers(\n+ unitOfWork,\n+ unitOfWork.child,\n+ nextChildren\n+ );\n+}\n+\n+function updateHostComponent(unitOfWork) {\n+ var element = getElement(unitOfWork);\n+ console.log('host component', element.type, typeof element.props.children === 'string' ? element.props.children : '');\n+\n+ var nextChildren = element.props.children;\n+ unitOfWork.child = ReactChildFiber.reconcileChildFibers(\n+ unitOfWork,\n+ unitOfWork.child,\n+ nextChildren\n+ );\n+}\n+\n+function mountIndeterminateComponent(unitOfWork) {\n+ var element = getElement(unitOfWork);\n+ var fn = element.type;\n+ var props = element.props;\n+ var value = fn(props);\n+ if (typeof value === 'object' && value && typeof value.render === 'function') {\n+ console.log('performed work on class:', fn.name);\n+ \/\/ Proceed under the assumption that this is a class instance\n+ unitOfWork.tag = ClassComponent;\n+ } else {\n+ console.log('performed work on fn:', fn.name);\n+ \/\/ Proceed under the assumption that this is a functional component\n+ unitOfWork.tag = FunctionalComponent;\n+ }\n+ unitOfWork.child = ReactChildFiber.reconcileChildFibers(\n+ unitOfWork,\n+ unitOfWork.child,\n+ value\n+ );\n+}\n+\n+function updateCoroutineComponent(unitOfWork) {\n+ var coroutine = (unitOfWork.input : ?ReactCoroutine);\n+ if (!coroutine) {\n+ throw new Error('Should be resolved by now');\n+ }\n+ console.log('begin coroutine', coroutine.handler.name);\n+ unitOfWork.child = ReactChildFiber.reconcileChildFibers(\n+ unitOfWork,\n+ unitOfWork.child,\n+ coroutine.children\n+ );\n+}\n+\n+function beginWork(unitOfWork : Fiber) : ?Fiber {\n+ switch (unitOfWork.tag) {\n+ case IndeterminateComponent:\n+ mountIndeterminateComponent(unitOfWork);\n+ break;\n+ case FunctionalComponent:\n+ updateFunctionalComponent(unitOfWork);\n+ break;\n+ case ClassComponent:\n+ console.log('class component', unitOfWork.input.type.name);\n+ break;\n+ case HostComponent:\n+ updateHostComponent(unitOfWork);\n+ break;\n+ case CoroutineComponent:\n+ \/\/ Reset the stage to zero.\n+ unitOfWork.stage = 0;\n+ updateCoroutineComponent(unitOfWork);\n+ \/\/ This doesn't take arbitrary time so we could synchronously just begin\n+ \/\/ eagerly do the work of unitOfWork.child as an optimization.\n+ if (unitOfWork.child) {\n+ return beginWork(unitOfWork.child);\n+ }\n+ break;\n+ case YieldComponent:\n+ \/\/ A yield component is just a placeholder, we can just run through the\n+ \/\/ next one immediately.\n+ if (unitOfWork.sibling) {\n+ return beginWork(unitOfWork.sibling);\n+ }\n+ return null;\n+ default:\n+ throw new Error('Unknown unit of work tag');\n+ }\n+ return unitOfWork.child;\n+}\n+\n+exports.beginWork = beginWork;\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js\nnew file mode 100644\nindex 0000000000..827075f004\n--- \/dev\/null\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js\n@@ -0,0 +1,121 @@\n+\/**\n+ * Copyright 2013-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactFiberCompleteWork\n+ * @flow\n+ *\/\n+\n+'use strict';\n+\n+import type { ReactCoroutine } from 'ReactCoroutine';\n+import type { Fiber } from 'ReactFiber';\n+\n+import type { ReifiedYield } from 'ReactReifiedYield';\n+\n+var ReactChildFiber = require('ReactChildFiber');\n+var ReactTypesOfWork = require('ReactTypesOfWork');\n+var {\n+ IndeterminateComponent,\n+ FunctionalComponent,\n+ ClassComponent,\n+ HostComponent,\n+ CoroutineComponent,\n+ YieldComponent,\n+} = ReactTypesOfWork;\n+\n+function transferOutput(child : ?Fiber, parent : Fiber) {\n+ \/\/ If we have a single result, we just pass that through as the output to\n+ \/\/ avoid unnecessary traversal. When we have multiple output, we just pass\n+ \/\/ the linked list of fibers that has the individual output values.\n+ parent.output = (child && !child.sibling) ? child.output : child;\n+}\n+\n+function recursivelyFillYields(yields, output : ?Fiber | ?ReifiedYield) {\n+ if (!output) {\n+ \/\/ Ignore nulls etc.\n+ } else if (output.tag !== undefined) { \/\/ TODO: Fix this fragile duck test.\n+ \/\/ Detect if this is a fiber, if so it is a fragment result.\n+ \/\/ $FlowFixMe: Refinement issue.\n+ var item = (output : Fiber);\n+ do {\n+ recursivelyFillYields(yields, item.output);\n+ item = item.sibling;\n+ } while (item);\n+ } else {\n+ \/\/ $FlowFixMe: Refinement issue. If it is not a Fiber or null, it is a yield\n+ yields.push(output);\n+ }\n+}\n+\n+function handleCoroutine(unitOfWork : Fiber) {\n+ var coroutine = (unitOfWork.input : ?ReactCoroutine);\n+ if (!coroutine) {\n+ throw new Error('Should be resolved by now');\n+ }\n+\n+ if (unitOfWork.stage === 0) {\n+ \/\/ First step of the coroutine has completed. Now we need to do the second.\n+ \/\/ TODO: It would be nice to have a multi stage coroutine represented by a\n+ \/\/ single component, or at least tail call optimize nested ones.\n+ \/\/ TODO: If we end up not using multi stage coroutines, we could also reuse\n+ \/\/ the tag field to switch between the two stages.\n+ unitOfWork.stage = 1;\n+\n+ \/\/ Build up the yields.\n+ \/\/ TODO: Compare this to a generator or opaque helpers like Children.\n+ var yields : Array = [];\n+ var child = unitOfWork.child;\n+ while (child) {\n+ recursivelyFillYields(yields, child.output);\n+ child = child.sibling;\n+ }\n+ var fn = coroutine.handler;\n+ var props = coroutine.props;\n+ var nextChildren = fn(props, yields);\n+\n+ unitOfWork.stateNode = ReactChildFiber.reconcileChildFibers(\n+ unitOfWork,\n+ unitOfWork.stateNode,\n+ nextChildren\n+ );\n+ return unitOfWork.stateNode;\n+ } else {\n+ \/\/ The coroutine is now complete.\n+ transferOutput(unitOfWork.stateNode, unitOfWork);\n+ return null;\n+ }\n+}\n+\n+exports.completeWork = function(unitOfWork : Fiber) : ?Fiber {\n+ switch (unitOfWork.tag) {\n+ case FunctionalComponent:\n+ console.log('\/functional component', unitOfWork.input.type.name);\n+ transferOutput(unitOfWork.child, unitOfWork);\n+ break;\n+ case ClassComponent:\n+ console.log('\/class component', unitOfWork.input.type.name);\n+ transferOutput(unitOfWork.child, unitOfWork);\n+ break;\n+ case HostComponent:\n+ console.log('\/host component', unitOfWork.input.type);\n+ break;\n+ case CoroutineComponent:\n+ console.log('\/coroutine component', unitOfWork.input.handler.name);\n+ return handleCoroutine(unitOfWork);\n+ case YieldComponent:\n+ \/\/ Does nothing.\n+ break;\n+\n+ \/\/ Error cases\n+ case IndeterminateComponent:\n+ throw new Error('An indeterminate component should have become determinate before completing.');\n+ default:\n+ throw new Error('Unknown unit of work tag');\n+ }\n+ return null;\n+};\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberFunctionalComponent.js b\/src\/renderers\/shared\/fiber\/ReactFiberFunctionalComponent.js\ndeleted file mode 100644\nindex 8c5ac48f8c..0000000000\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberFunctionalComponent.js\n+++ \/dev\/null\n@@ -1,45 +0,0 @@\n-\/**\n- * Copyright 2013-present, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule ReactFiberFunctionalComponent\n- * @flow\n- *\/\n-\n-'use strict';\n-\n-import type { Fiber } from 'ReactFiber';\n-var createFiber = require('ReactFiber');\n-\n-var ReactTypesOfWork = require('ReactTypesOfWork');\n-var {\n- FunctionalComponent,\n-} = ReactTypesOfWork;\n-\n-exports.performWork = function(unitOfWork : Fiber) : ?Fiber {\n- var element = unitOfWork.input;\n- if (!element) {\n- throw new Error('Should be resolved by now');\n- }\n- var fn = element.type;\n- var props = element.props;\n- \/\/ console.log('perform work on:', fn.name);\n- var nextElement = fn(props);\n-\n- if (typeof nextElement.type === 'function') {\n- return exports.createFiber(nextElement);\n- }\n- return null;\n-};\n-\n-exports.createFiber = function(element : ReactElement) {\n- var fiber = createFiber(\n- FunctionalComponent\n- );\n- fiber.input = element;\n- return fiber;\n-};\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\nindex 3ef59bdb5e..4a13a6531b 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n@@ -13,14 +13,9 @@\n 'use strict';\n \n import type { Fiber } from 'ReactFiber';\n-var ReactFiberFunctionalComponent = require('ReactFiberFunctionalComponent');\n-\n-var ReactTypesOfWork = require('ReactTypesOfWork');\n-var {\n- FunctionalComponent,\n- ClassComponent,\n- HostComponent,\n-} = ReactTypesOfWork;\n+var ReactFiber = require('ReactFiber');\n+var { beginWork } = require('ReactFiberBeginWork');\n+var { completeWork } = require('ReactFiberCompleteWork');\n \n type ReactHostElement = {\n type: T,\n@@ -54,16 +49,34 @@ module.exports = function(config : HostConfig) : Reconciler {\n \n let nextUnitOfWork : ?Fiber = null;\n \n- function performUnitOfWork(unit : Fiber) : ?Fiber {\n- switch (unit.tag) {\n- case FunctionalComponent:\n- return ReactFiberFunctionalComponent.performWork(unit);\n- case ClassComponent:\n- break;\n- case HostComponent:\n- break;\n+ function completeUnitOfWork(unitOfWork : Fiber) : ?Fiber {\n+ while (true) {\n+ var next = completeWork(unitOfWork);\n+ if (next) {\n+ \/\/ If completing this work spawned new work, do that next.\n+ return next;\n+ } else if (unitOfWork.sibling) {\n+ \/\/ If there is more work to do in this parent, do that next.\n+ return unitOfWork.sibling;\n+ } else if (unitOfWork.parent) {\n+ \/\/ If there's no more work in this parent. Complete the parent.\n+ unitOfWork = unitOfWork.parent;\n+ } else {\n+ \/\/ If we're at the root, there's no more work to do.\n+ return null;\n+ }\n+ }\n+ }\n+\n+ function performUnitOfWork(unitOfWork : Fiber) : ?Fiber {\n+ var next = beginWork(unitOfWork);\n+ if (next) {\n+ \/\/ If this spawns new work, do that next.\n+ return next;\n+ } else {\n+ \/\/ Otherwise, complete the current work.\n+ return completeUnitOfWork(unitOfWork);\n }\n- return null;\n }\n \n function performLowPriWork(deadline : Deadline) {\n@@ -100,7 +113,7 @@ module.exports = function(config : HostConfig) : Reconciler {\n \n ensureLowPriIsScheduled();\n \n- nextUnitOfWork = ReactFiberFunctionalComponent.createFiber(element);\n+ nextUnitOfWork = ReactFiber.createFiberFromElement(element);\n \n return {};\n },\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactReifiedYield.js b\/src\/renderers\/shared\/fiber\/ReactReifiedYield.js\nnew file mode 100644\nindex 0000000000..a47887bc56\n--- \/dev\/null\n+++ b\/src\/renderers\/shared\/fiber\/ReactReifiedYield.js\n@@ -0,0 +1,37 @@\n+\/**\n+ * Copyright 2013-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactReifiedYield\n+ * @flow\n+ *\/\n+\n+'use strict';\n+\n+import type { ReactYield } from 'ReactCoroutine';\n+import type { Fiber } from 'ReactFiber';\n+\n+var ReactFiber = require('ReactFiber');\n+\n+export type ReifiedYield = { continuation: Fiber, props: Object };\n+\n+exports.createReifiedYield = function(yieldNode : ReactYield) : ReifiedYield {\n+ var fiber = ReactFiber.createFiberFromElementType(yieldNode.continuation);\n+ \/\/ Hacky way to store the continuation\n+ fiber.input = yieldNode.continuation;\n+ return {\n+ continuation: fiber,\n+ props: yieldNode.props,\n+ };\n+};\n+\n+exports.createUpdatedReifiedYield = function(previousYield : ReifiedYield, yieldNode : ReactYield) : ReifiedYield {\n+ return {\n+ continuation: previousYield.continuation,\n+ props: yieldNode.props,\n+ };\n+};\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactStateNode.js b\/src\/renderers\/shared\/fiber\/ReactStateNode.js\ndeleted file mode 100644\nindex c7ea45b3b4..0000000000\n--- a\/src\/renderers\/shared\/fiber\/ReactStateNode.js\n+++ \/dev\/null\n@@ -1,23 +0,0 @@\n-\/**\n- * Copyright 2013-present, Facebook, Inc.\n- * All rights reserved.\n- *\n- * This source code is licensed under the BSD-style license found in the\n- * LICENSE file in the root directory of this source tree. An additional grant\n- * of patent rights can be found in the PATENTS file in the same directory.\n- *\n- * @providesModule ReactStateNode\n- * @flow\n- *\/\n-\n-'use strict';\n-\n-type StateNode = {\n- next: ?{ [key: string]: StateNode },\n-};\n-\n-module.exports = function() : StateNode {\n- return {\n- next: null,\n- };\n-};\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactTypesOfWork.js b\/src\/renderers\/shared\/fiber\/ReactTypesOfWork.js\nindex 5dda934610..5009cfa6bc 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactTypesOfWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactTypesOfWork.js\n@@ -13,9 +13,12 @@\n 'use strict';\n \n var TypesOfWork = {\n+ IndeterminateComponent: 0, \/\/ Before we know whether it is functional or class\n FunctionalComponent: 1,\n ClassComponent: 2,\n HostComponent: 3,\n+ CoroutineComponent: 4,\n+ YieldComponent: 5,\n };\n \n module.exports = TypesOfWork;\ndiff --git a\/src\/renderers\/shared\/fiber\/isomorphic\/ReactCoroutine.js b\/src\/renderers\/shared\/fiber\/isomorphic\/ReactCoroutine.js\nnew file mode 100644\nindex 0000000000..a03934ea56\n--- \/dev\/null\n+++ b\/src\/renderers\/shared\/fiber\/isomorphic\/ReactCoroutine.js\n@@ -0,0 +1,109 @@\n+\/**\n+ * Copyright 2014-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactCoroutine\n+ * @flow\n+ *\/\n+\n+'use strict';\n+\n+import type { ReactNodeList } from 'ReactTypes';\n+\n+\/\/ The Symbol used to tag the special React types. If there is no native Symbol\n+\/\/ nor polyfill, then a plain number is used for performance.\n+var REACT_COROUTINE_TYPE =\n+ (typeof Symbol === 'function' && Symbol.for && Symbol.for('react.coroutine')) ||\n+ 0xeac8;\n+\n+var REACT_YIELD_TYPE =\n+ (typeof Symbol === 'function' && Symbol.for && Symbol.for('react.yield')) ||\n+ 0xeac9;\n+\n+type ReifiedYield = { continuation: Object, props: Object };\n+type CoroutineHandler = (props: T, yields: Array) => ReactNodeList;\n+\n+export type ReactCoroutine = {\n+ $$typeof: Symbol | number,\n+ key: ?string,\n+ children: any,\n+ \/\/ This should be a more specific CoroutineHandler\n+ handler: (props: any, yields: Array) => ReactNodeList,\n+ props: mixed,\n+};\n+export type ReactYield = {\n+ $$typeof: Symbol | number,\n+ key: ?string,\n+ props: Object,\n+ continuation: mixed\n+};\n+\n+exports.createCoroutine = function(children : mixed, handler : CoroutineHandler, props : T, key : ?string = null) : ReactCoroutine {\n+ var coroutine = {\n+ \/\/ This tag allow us to uniquely identify this as a React Coroutine\n+ $$typeof: REACT_COROUTINE_TYPE,\n+ key: key == null ? null : '' + key,\n+ children: children,\n+ handler: handler,\n+ props: props,\n+ };\n+\n+ if (__DEV__) {\n+ \/\/ TODO: Add _store property for marking this as validated.\n+ if (Object.freeze) {\n+ Object.freeze(coroutine.props);\n+ Object.freeze(coroutine);\n+ }\n+ }\n+\n+ return coroutine;\n+};\n+\n+exports.createYield = function(props : mixed, continuation : mixed, key : ?string = null) {\n+ var yieldNode = {\n+ \/\/ This tag allow us to uniquely identify this as a React Yield\n+ $$typeof: REACT_YIELD_TYPE,\n+ key: key == null ? null : '' + key,\n+ props: props,\n+ continuation: continuation,\n+ };\n+\n+ if (__DEV__) {\n+ \/\/ TODO: Add _store property for marking this as validated.\n+ if (Object.freeze) {\n+ Object.freeze(yieldNode.props);\n+ Object.freeze(yieldNode);\n+ }\n+ }\n+\n+ return yieldNode;\n+};\n+\n+\/**\n+ * Verifies the object is a coroutine object.\n+ *\/\n+exports.isCoroutine = function(object : mixed) : boolean {\n+ return (\n+ typeof object === 'object' &&\n+ object !== null &&\n+ object.$$typeof === REACT_COROUTINE_TYPE\n+ );\n+};\n+\n+\/**\n+ * Verifies the object is a yield object.\n+ *\/\n+exports.isYield = function(object : mixed) : boolean {\n+ return (\n+ typeof object === 'object' &&\n+ object !== null &&\n+ object.$$typeof === REACT_YIELD_TYPE\n+ );\n+};\n+\n+exports.REACT_YIELD_TYPE = REACT_YIELD_TYPE;\n+exports.REACT_COROUTINE_TYPE = REACT_COROUTINE_TYPE;\ndiff --git a\/src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js b\/src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js\nnew file mode 100644\nindex 0000000000..4c8c69571c\n--- \/dev\/null\n+++ b\/src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js\n@@ -0,0 +1,25 @@\n+\/**\n+ * Copyright 2014-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactTypes\n+ * @flow\n+ *\/\n+\n+'use strict';\n+\n+import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';\n+\n+export type ReactNode = ReactElement | ReactCoroutine | ReactYield | ReactText | ReactFragment;\n+\n+export type ReactFragment = ReactEmpty | Iterable;\n+\n+export type ReactNodeList = ReactEmpty | ReactNode;\n+\n+export type ReactText = string | number;\n+\n+export type ReactEmpty = null | void | boolean;\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactComponent-test.js b\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactComponent-test.js\nindex f97ae25c09..cd0c13d6e5 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactComponent-test.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactComponent-test.js\n@@ -280,14 +280,8 @@ describe('ReactComponent', function() {\n 'or a class\/function (for composite components) but got: null.'\n );\n \n- var Z = {};\n- expect(() => ReactTestUtils.renderIntoDocument()).toThrowError(\n- 'Element type is invalid: expected a string (for built-in components) ' +\n- 'or a class\/function (for composite components) but got: object.'\n- );\n-\n \/\/ One warning for each element creation\n- expect(console.error.calls.count()).toBe(3);\n+ expect(console.error.calls.count()).toBe(2);\n });\n \n });\n","commit":{"revision":"0f4a4df12e33df95601da79a422eb5e76d3b5bf8","shortRevision":"0f4a4df12e","subject":"Merge pull request #6859 from sebmarkbage\/newreconciler","authorEmail":"sebastian@calyptus.eu","authorName":"Sebastian Markbåge","authoredAt":"2016-05-26T18:21:08-07:00"}}

dillon1000/react

Files changed