Merge branch 'master' of https://github.com/laconalabs/elliptical

doc/basics/es2015andjsx.md

@@ -24,7 +24,7 @@ code will throw lots of `React is not defined` errors.
 
 You can specify this pragma it in each of your
 files with a `@jsx` pragma comment. You will need to put this comment
-at the top of every file that imports `element`.
+at the top of every file that imports `createElement`.
 
 ```js
 /** @jsx createElement */

package.json

@@ -12,7 +12,7 @@
     "build:browser": "mkdir -p build; cross-env BABEL_ENV=browser babel src --out-dir lib-browser",
     "build:node": "mkdir -p build; cross-env BABEL_ENV=node babel src --out-dir lib-node",
     "clean": "rimraf lib-browser lib-node lib-es",
-    "prepublish": "npm run clean && npm run build"
+    "prepare": "npm run clean && npm run build"
   },
   "repository": {
     "type": "git",
@@ -44,16 +44,15 @@
     "babel-plugin-transform-react-jsx": "^6.6.5",
     "babel-plugin-transform-runtime": "^6.9.0",
     "babel-preset-es2015": "^6.6.0",
-    "babel-preset-es2015-native-modules": "^6.6.0",
     "babel-preset-es2015-node": "^4.0.0",
     "babel-register": "^6.6.5",
     "chai": "^3.5.0",
-    "cross-env": "^1.0.7",
-    "mocha": "^2.4.5",
+    "cross-env": "^3.1.4",
+    "mocha": "^3.2.0",
     "rimraf": "^2.5.2",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",
-    "standard": "^7.1.2"
+    "standard": "^8.6.0"
   },
   "dependencies": {
     "babel-runtime": "^6.9.2",
@@ -84,7 +83,12 @@
       },
       "es": {
         "presets": [
-          "es2015-native-modules"
+          [
+            "es2015",
+            {
+              "modules": false
+            }
+          ]
         ],
         "plugins": [
           "transform-react-jsx",

src/phrases/sequence.js

@@ -4,9 +4,10 @@ import {limitIterator} from '../utils'
 function * visit (option, {props: {unique = false}, children}, traverse) {
   const mods = {result: {}, score: 1}
   const trueOption = _.assign({}, option, mods)
-  const iterator = parseChildControl(0, trueOption, unique, children, traverse)
-
-  yield * iterator
+  if (children.length) {
+    const iterator = parseChildControl(0, trueOption, unique, children, traverse)
+    yield * iterator
+  }
 }
 
 function shouldDoEllipsis (index, option, children) {

test/sequence.jsx

@@ -1105,4 +1105,11 @@ describe('sequence', () => {
     options = compileAndTraverse(grammar, 'testatest')
     expect(options).to.eql([])
   })
+
+  it('does not emit if empty', () => {
+    const grammar = <sequence></sequence>
+
+    const options = compileAndTraverse(grammar, '')
+    expect(options).to.eql([])
+  })
 })