brace-expansion 1.0.0 → 1.1.2

package/.npmignore

@@ -1,2 +1,3 @@
-node_modules
-*.sw*
+test
+.gitignore
+.travis.yml

package/README.md

@@ -3,7 +3,8 @@
 [Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html), 
 as known from sh/bash, in JavaScript.
 
-[![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.png)](http://travis-ci.org/juliangruber/brace-expansion)
+[![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.svg)](http://travis-ci.org/juliangruber/brace-expansion)
+[![downloads](https://img.shields.io/npm/dm/brace-expansion.svg)](https://www.npmjs.org/package/brace-expansion)
 
 [![testling badge](https://ci.testling.com/juliangruber/brace-expansion.png)](https://ci.testling.com/juliangruber/brace-expansion)
 
@@ -91,6 +92,11 @@ With [npm](https://npmjs.org) do:
 npm install brace-expansion
 ```
 
+## Contributors
+
+- [Julian Gruber](https://github.com/juliangruber)
+- [Isaac Z. Schlueter](https://github.com/isaacs)
+
 ## License
 
 (MIT)

package/index.js

@@ -66,8 +66,7 @@ function expandTop(str) {
   if (!str)
     return [];
 
-  var expansions = expand(escapeBraces(str));
-  return expansions.filter(identity).map(unescapeBraces);
+  return expand(escapeBraces(str), true).map(unescapeBraces);
 }
 
 function identity(e) {
@@ -88,7 +87,7 @@ function gte(i, y) {
   return i >= y;
 }
 
-function expand(str) {
+function expand(str, isTop) {
   var expansions = [];
 
   var m = balanced('{', '}', str);
@@ -114,10 +113,10 @@ function expand(str) {
     n = parseCommaParts(m.body);
     if (n.length === 1) {
       // x{{a,b}}y ==> x{a}y x{b}y
-      n = expand(n[0]).map(embrace);
+      n = expand(n[0], false).map(embrace);
       if (n.length === 1) {
         var post = m.post.length
-          ? expand(m.post)
+          ? expand(m.post, false)
           : [''];
         return post.map(function(p) {
           return m.pre + n[0] + p;
@@ -132,7 +131,7 @@ function expand(str) {
   // no need to expand pre, since it is guaranteed to be free of brace-sets
   var pre = m.pre;
   var post = m.post.length
-    ? expand(m.post)
+    ? expand(m.post, false)
     : [''];
 
   var N;
@@ -176,12 +175,14 @@ function expand(str) {
       N.push(c);
     }
   } else {
-    N = concatMap(n, function(el) { return expand(el) });
+    N = concatMap(n, function(el) { return expand(el, false) });
   }
 
   for (var j = 0; j < N.length; j++) {
     for (var k = 0; k < post.length; k++) {
-      expansions.push([pre, N[j], post[k]].join(''))
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "brace-expansion",
   "description": "Brace expansion as known from sh/bash",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "repository": {
     "type": "git",
     "url": "git://github.com/juliangruber/brace-expansion.git"
@@ -13,11 +13,11 @@
     "gentest": "bash test/generate.sh"
   },
   "dependencies": {
-    "balanced-match": "^0.2.0",
-    "concat-map": "0.0.0"
+    "balanced-match": "^0.3.0",
+    "concat-map": "0.0.1"
   },
   "devDependencies": {
-    "tape": "~1.1.1"
+    "tape": "4.2.2"
   },
   "keywords": [],
   "author": {

package/.travis.yml

@@ -1,4 +0,0 @@
-language: node_js
-node_js:
-  - "0.8"
-  - "0.10"

package/test/bash-comparison.js

@@ -1,29 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-var fs = require('fs');
-var resfile = __dirname + '/bash-results.txt';
-var cases = fs.readFileSync(resfile, 'utf8').split('><><><><');
-
-// throw away the EOF marker
-cases.pop()
-
-test('matches bash expansions', function(t) {
-  cases.forEach(function(testcase) {
-    var set = testcase.split('\n');
-    var pattern = set.shift();
-    var actual = expand(pattern);
-
-    // If it expands to the empty string, then it's actually
-    // just nothing, but Bash is a singly typed language, so
-    // "nothing" is the same as "".  Bash doesn't include them
-    // $ for i in {a,,,b}; do echo $i; done
-    // a
-    // b
-    set = set.filter(function(s) {
-      return s;
-    });
-
-    t.same(actual, set, pattern);
-  });
-  t.end();
-})

package/test/bash-results.txt

@@ -1,705 +0,0 @@
-A{b,{d,e},{f,g}}Z
-AbZ
-AdZ
-AeZ
-AfZ
-AgZ><><><><PRE-{a,b}{{a,b},a,b}-POST
-PRE-aa-POST
-PRE-ab-POST
-PRE-aa-POST
-PRE-ab-POST
-PRE-ba-POST
-PRE-bb-POST
-PRE-ba-POST
-PRE-bb-POST><><><><{a,b}{{a,b},a,b}
-aa
-ab
-aa
-ab
-ba
-bb
-ba
-bb><><><><{{a,b}
-{a
-{b><><><><{a,b}}
-a}
-b}><><><><{,}
-><><><><a{,}
-a
-a><><><><{,}b
-b
-b><><><><a{,}b
-ab
-ab><><><><a{b}c
-a{b}c><><><><a{1..5}b
-a1b
-a2b
-a3b
-a4b
-a5b><><><><a{01..5}b
-a01b
-a02b
-a03b
-a04b
-a05b><><><><a{-01..5}b
-a-01b
-a000b
-a001b
-a002b
-a003b
-a004b
-a005b><><><><a{-01..5..3}b
-a-01b
-a002b
-a005b><><><><a{001..9}b
-a001b
-a002b
-a003b
-a004b
-a005b
-a006b
-a007b
-a008b
-a009b><><><><a{b,c{d,e},{f,g}h}x{y,z
-abx{y,z
-acdx{y,z
-acex{y,z
-afhx{y,z
-aghx{y,z><><><><a{b,c{d,e},{f,g}h}x{y,z}
-abxy
-abxz
-acdxy
-acdxz
-acexy
-acexz
-afhxy
-afhxz
-aghxy
-aghxz><><><><a{b,c{d,e},{f,g}h}x{y,z}
-abxy
-abxz
-acdxy
-acdxz
-acexy
-acexz
-afhxy
-afhxz
-aghxy
-aghxz><><><><a{b{c{d,e}f{x,y{{g}h
-a{b{cdf{x,y{{g}h
-a{b{cef{x,y{{g}h><><><><a{b{c{d,e}f{x,y{}g}h
-a{b{cdfxh
-a{b{cdfy{}gh
-a{b{cefxh
-a{b{cefy{}gh><><><><a{b{c{d,e}f{x,y}}g}h
-a{b{cdfx}g}h
-a{b{cdfy}g}h
-a{b{cefx}g}h
-a{b{cefy}g}h><><><><a{b{c{d,e}f}g}h
-a{b{cdf}g}h
-a{b{cef}g}h><><><><a{{x,y},z}b
-axb
-ayb
-azb><><><><f{x,y{g,z}}h
-fxh
-fygh
-fyzh><><><><f{x,y{{g,z}}h
-f{x,y{g}h
-f{x,y{z}h><><><><f{x,y{{g,z}}h}
-fx
-fy{g}h
-fy{z}h><><><><f{x,y{{g}h
-f{x,y{{g}h><><><><f{x,y{{g}}h
-f{x,y{{g}}h><><><><f{x,y{}g}h
-fxh
-fy{}gh><><><><z{a,b{,c}d
-z{a,bd
-z{a,bcd><><><><z{a,b},c}d
-za,c}d
-zb,c}d><><><><{-01..5}
--01
-000
-001
-002
-003
-004
-005><><><><{-05..100..5}
--05
-000
-005
-010
-015
-020
-025
-030
-035
-040
-045
-050
-055
-060
-065
-070
-075
-080
-085
-090
-095
-100><><><><{-05..100}
--05
--04
--03
--02
--01
-000
-001
-002
-003
-004
-005
-006
-007
-008
-009
-010
-011
-012
-013
-014
-015
-016
-017
-018
-019
-020
-021
-022
-023
-024
-025
-026
-027
-028
-029
-030
-031
-032
-033
-034
-035
-036
-037
-038
-039
-040
-041
-042
-043
-044
-045
-046
-047
-048
-049
-050
-051
-052
-053
-054
-055
-056
-057
-058
-059
-060
-061
-062
-063
-064
-065
-066
-067
-068
-069
-070
-071
-072
-073
-074
-075
-076
-077
-078
-079
-080
-081
-082
-083
-084
-085
-086
-087
-088
-089
-090
-091
-092
-093
-094
-095
-096
-097
-098
-099
-100><><><><{0..5..2}
-0
-2
-4><><><><{0001..05..2}
-0001
-0003
-0005><><><><{0001..-5..2}
-0001
--001
--003
--005><><><><{0001..-5..-2}
-0001
--001
--003
--005><><><><{0001..5..-2}
-0001
-0003
-0005><><><><{01..5}
-01
-02
-03
-04
-05><><><><{1..05}
-01
-02
-03
-04
-05><><><><{1..05..3}
-01
-04><><><><{05..100}
-005
-006
-007
-008
-009
-010
-011
-012
-013
-014
-015
-016
-017
-018
-019
-020
-021
-022
-023
-024
-025
-026
-027
-028
-029
-030
-031
-032
-033
-034
-035
-036
-037
-038
-039
-040
-041
-042
-043
-044
-045
-046
-047
-048
-049
-050
-051
-052
-053
-054
-055
-056
-057
-058
-059
-060
-061
-062
-063
-064
-065
-066
-067
-068
-069
-070
-071
-072
-073
-074
-075
-076
-077
-078
-079
-080
-081
-082
-083
-084
-085
-086
-087
-088
-089
-090
-091
-092
-093
-094
-095
-096
-097
-098
-099
-100><><><><{0a..0z}
-{0a..0z}><><><><{a,b}c,d}
-ac,d}
-bc,d}><><><><{a,b{c,d}
-{a,bc
-{a,bd><><><><{a,b}c,d}
-ac,d}
-bc,d}><><><><{a..F}
-a
-`
-_
-^
-]
-
-[
-Z
-Y
-X
-W
-V
-U
-T
-S
-R
-Q
-P
-O
-N
-M
-L
-K
-J
-I
-H
-G
-F><><><><{A..f}
-A
-B
-C
-D
-E
-F
-G
-H
-I
-J
-K
-L
-M
-N
-O
-P
-Q
-R
-S
-T
-U
-V
-W
-X
-Y
-Z
-[
-
-]
-^
-_
-`
-a
-b
-c
-d
-e
-f><><><><{a..Z}
-a
-`
-_
-^
-]
-
-[
-Z><><><><{A..z}
-A
-B
-C
-D
-E
-F
-G
-H
-I
-J
-K
-L
-M
-N
-O
-P
-Q
-R
-S
-T
-U
-V
-W
-X
-Y
-Z
-[
-
-]
-^
-_
-`
-a
-b
-c
-d
-e
-f
-g
-h
-i
-j
-k
-l
-m
-n
-o
-p
-q
-r
-s
-t
-u
-v
-w
-x
-y
-z><><><><{z..A}
-z
-y
-x
-w
-v
-u
-t
-s
-r
-q
-p
-o
-n
-m
-l
-k
-j
-i
-h
-g
-f
-e
-d
-c
-b
-a
-`
-_
-^
-]
-
-[
-Z
-Y
-X
-W
-V
-U
-T
-S
-R
-Q
-P
-O
-N
-M
-L
-K
-J
-I
-H
-G
-F
-E
-D
-C
-B
-A><><><><{Z..a}
-Z
-[
-
-]
-^
-_
-`
-a><><><><{a..F..2}
-a
-_
-]
-[
-Y
-W
-U
-S
-Q
-O
-M
-K
-I
-G><><><><{A..f..02}
-A
-C
-E
-G
-I
-K
-M
-O
-Q
-S
-U
-W
-Y
-[
-]
-_
-a
-c
-e><><><><{a..Z..5}
-a><><><><d{a..Z..5}b
-dab
-db><><><><{A..z..10}
-A
-K
-U
-_
-i
-s><><><><{z..A..-2}
-z
-x
-v
-t
-r
-p
-n
-l
-j
-h
-f
-d
-b
-`
-^
-
-Z
-X
-V
-T
-R
-P
-N
-L
-J
-H
-F
-D
-B><><><><{Z..a..20}
-Z><><><><{a{,b}
-{a
-{ab><><><><{a},b}
-a}
-b><><><><{x,y{,}g}
-x
-yg
-yg><><><><{x,y{}g}
-x
-y{}g><><><><{{a,b}
-{a
-{b><><><><{{a,b},c}
-a
-b
-c><><><><{{a,b}c}
-{ac}
-{bc}><><><><{{a,b},}
-a
-b><><><><X{{a,b},}X
-XaX
-XbX
-XX><><><><{{a,b},}c
-ac
-bc
-c><><><><{{a,b}.}
-{a.}
-{b.}><><><><{{a,b}}
-{a}
-{b}><><><><X{a..#}X
-X{a..#}X><><><><
-><><><><{-10..00}
--10
--09
--08
--07
--06
--05
--04
--03
--02
--01
-000><><><><{a,\\{a,b}c}
-a
-\ac
-\bc><><><><{a,\{a,b}c}
-ac}
-{ac}
-bc}><><><><a,\{b,c}
-a,{b,c}><><><><{-10.\.00}
-{-10..00}><><><><

package/test/cases.txt

@@ -1,86 +0,0 @@
-# skip quotes for now
-# "{x,x}"
-# {"x,x"}
-# {x","x}
-# '{a,b}{{a,b},a,b}'
-A{b,{d,e},{f,g}}Z
-PRE-{a,b}{{a,b},a,b}-POST
-\{a,b}{{a,b},a,b}
-{{a,b}
-{a,b}}
-{,}
-a{,}
-{,}b
-a{,}b
-a{b}c
-a{1..5}b
-a{01..5}b
-a{-01..5}b
-a{-01..5..3}b
-a{001..9}b
-a{b,c{d,e},{f,g}h}x{y,z
-a{b,c{d,e},{f,g}h}x{y,z\}
-a{b,c{d,e},{f,g}h}x{y,z}
-a{b{c{d,e}f{x,y{{g}h
-a{b{c{d,e}f{x,y{}g}h
-a{b{c{d,e}f{x,y}}g}h
-a{b{c{d,e}f}g}h
-a{{x,y},z}b
-f{x,y{g,z}}h
-f{x,y{{g,z}}h
-f{x,y{{g,z}}h}
-f{x,y{{g}h
-f{x,y{{g}}h
-f{x,y{}g}h
-z{a,b{,c}d
-z{a,b},c}d
-{-01..5}
-{-05..100..5}
-{-05..100}
-{0..5..2}
-{0001..05..2}
-{0001..-5..2}
-{0001..-5..-2}
-{0001..5..-2}
-{01..5}
-{1..05}
-{1..05..3}
-{05..100}
-{0a..0z}
-{a,b\}c,d}
-{a,b{c,d}
-{a,b}c,d}
-{a..F}
-{A..f}
-{a..Z}
-{A..z}
-{z..A}
-{Z..a}
-{a..F..2}
-{A..f..02}
-{a..Z..5}
-d{a..Z..5}b
-{A..z..10}
-{z..A..-2}
-{Z..a..20}
-{a{,b}
-{a},b}
-{x,y{,}g}
-{x,y{}g}
-{{a,b}
-{{a,b},c}
-{{a,b}c}
-{{a,b},}
-X{{a,b},}X
-{{a,b},}c
-{{a,b}.}
-{{a,b}}
-X{a..#}X
-# this next one is an empty string
-
-{-10..00}
-# Need to escape slashes in here for reasons i guess.
-{a,\\\\{a,b}c}
-{a,\\{a,b}c}
-a,\\{b,c}
-{-10.\\.00}

package/test/dollar.js

@@ -1,9 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('ignores ${', function(t) {
-  t.deepEqual(expand('${1..3}'), ['${1..3}']);
-  t.deepEqual(expand('${a,b}${c,d}'), ['${a,b}${c,d}']);
-  t.deepEqual(expand('x${a,b}x${c,d}x'), ['x${a,b}x${c,d}x']);
-  t.end();
-});

package/test/empty-option.js

@@ -1,10 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('empty option', function(t) {
-  t.deepEqual(expand('-v{,,,,}'), [
-    '-v', '-v', '-v', '-v', '-v'
-  ]);
-  t.end();
-});
-

package/test/generate.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Bash 4.3 because of arbitrary need to pick a single standard.
-
-if [ "${BASH_VERSINFO[0]}" != "4" ] || [ "${BASH_VERSINFO[1]}" != "3" ]; then
-  echo "this script requires bash 4.3" >&2
-  exit 1
-fi
-
-CDPATH= cd "$(dirname "$0")"
-
-js='require("./")(process.argv[1]).join(" ")'
-
-cat cases.txt | \
-  while read case; do
-    if [ "${case:0:1}" = "#" ]; then
-      continue;
-    fi;
-    b=$($BASH -c 'for c in '"$case"'; do echo "$c"; done')
-    echo "$case"
-    echo -n "$b><><><><";
-  done > bash-results.txt

package/test/negative-increment.js

@@ -1,15 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('negative increment', function(t) {
-  t.deepEqual(expand('{3..1}'), ['3', '2', '1']);
-  t.deepEqual(expand('{10..8}'), ['10', '9', '8']);
-  t.deepEqual(expand('{10..08}'), ['10', '09', '08']);
-  t.deepEqual(expand('{c..a}'), ['c', 'b', 'a']);
-
-  t.deepEqual(expand('{4..0..2}'), ['4', '2', '0']);
-  t.deepEqual(expand('{4..0..-2}'), ['4', '2', '0']);
-  t.deepEqual(expand('{e..a..2}'), ['e', 'c', 'a']);
-
-  t.end();
-});

package/test/nested.js

@@ -1,16 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('nested', function(t) {
-  t.deepEqual(expand('{a,b{1..3},c}'), [
-    'a', 'b1', 'b2', 'b3', 'c'
-  ]);
-  t.deepEqual(expand('{{A..Z},{a..z}}'),
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
-  );
-  t.deepEqual(expand('ppp{,config,oe{,conf}}'), [
-    'ppp', 'pppconfig', 'pppoe', 'pppoeconf'
-  ]);
-  t.end();
-});
-

package/test/order.js

@@ -1,10 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('order', function(t) {
-  t.deepEqual(expand('a{d,c,b}e'), [
-    'ade', 'ace', 'abe'
-  ]);
-  t.end();
-});
-

package/test/pad.js

@@ -1,13 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('pad', function(t) {
-  t.deepEqual(expand('{9..11}'), [
-    '9', '10', '11'
-  ]);
-  t.deepEqual(expand('{09..11}'), [
-    '09', '10', '11'
-  ]);
-  t.end();
-});
-

package/test/same-type.js

@@ -1,7 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('x and y of same type', function(t) {
-  t.deepEqual(expand('{a..9}'), ['{a..9}']);
-  t.end();
-});

package/test/sequence.js

@@ -1,50 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('numeric sequences', function(t) {
-  t.deepEqual(expand('a{1..2}b{2..3}c'), [
-    'a1b2c', 'a1b3c', 'a2b2c', 'a2b3c'
-  ]);
-  t.deepEqual(expand('{1..2}{2..3}'), [
-    '12', '13', '22', '23'
-  ]);
-  t.end();
-});
-
-test('numeric sequences with step count', function(t) {
-  t.deepEqual(expand('{0..8..2}'), [
-    '0', '2', '4', '6', '8'
-  ]);
-  t.deepEqual(expand('{1..8..2}'), [
-    '1', '3', '5', '7'
-  ]);
-  t.end();
-});
-
-test('numeric sequence with negative x / y', function(t) {
-  t.deepEqual(expand('{3..-2}'), [
-    '3', '2', '1', '0', '-1', '-2'
-  ]);
-  t.end();
-});
-
-test('alphabetic sequences', function(t) {
-  t.deepEqual(expand('1{a..b}2{b..c}3'), [
-    '1a2b3', '1a2c3', '1b2b3', '1b2c3'
-  ]);
-  t.deepEqual(expand('{a..b}{b..c}'), [
-    'ab', 'ac', 'bb', 'bc'
-  ]);
-  t.end();
-});
-
-test('alphabetic sequences with step count', function(t) {
-  t.deepEqual(expand('{a..k..2}'), [
-    'a', 'c', 'e', 'g', 'i', 'k'
-  ]);
-  t.deepEqual(expand('{b..k..2}'), [
-    'b', 'd', 'f', 'h', 'j'
-  ]);
-  t.end();
-});
-