Skip to content

Commit 5cfa78a

Browse files
zahnsterzahnster
authored
Merge pull request #28 from salesforce-ux/dependency-updates
bump package versions and save package-lock.json
2 parents af49eb3 + 378f213 commit 5cfa78a

12 files changed

+7000
-154
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
dist
2-
package-lock.json
32
node_modules
43
*.log

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "6"
3+
- "10"
44
script:
55
- npm run lint
66
- npm test

‎lib/__tests__/index.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ it('parse', () => {
1010
})
1111

1212
it('parse', () => {
13-
const scss = `.a { background: red; }`
13+
const scss = '.a { background: red; }'
1414
expect(stringify(parse(scss))).toEqual(scss)
1515
})

‎lib/__tests__/input-stream.spec.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,43 @@
66
const createInputStream = require('../input-stream')
77

88
it('returns an new InputStream', () => {
9-
let i = createInputStream()
9+
const i = createInputStream()
1010
expect(i).toMatchSnapshot()
1111
})
1212

1313
describe('#position', () => {
1414
it('defaults the position to 0', () => {
15-
let p = createInputStream().position()
15+
const p = createInputStream().position()
1616
expect(Object.isFrozen(p)).toBe(true)
1717
expect(p).toMatchSnapshot()
1818
})
1919
})
2020

2121
describe('#peek', () => {
2222
it('returns the current character', () => {
23-
let i = createInputStream('hello')
23+
const i = createInputStream('hello')
2424
expect(i.peek()).toEqual('h')
2525
})
2626
it('returns the current character with an offset', () => {
27-
let i = createInputStream('hello')
27+
const i = createInputStream('hello')
2828
expect(i.peek(1)).toEqual('e')
2929
})
3030
})
3131

3232
describe('#next', () => {
3333
it('consumes and returns the next character', () => {
34-
let i = createInputStream('hello')
34+
const i = createInputStream('hello')
3535
expect(i.next()).toEqual('h')
3636
})
3737
it('advances the cursor', () => {
38-
let i = createInputStream('hello')
38+
const i = createInputStream('hello')
3939
expect(i.next()).toEqual('h')
4040
expect(i.position().cursor).toEqual(1)
4141
expect(i.position().line).toEqual(1)
4242
expect(i.position().column).toEqual(1)
4343
})
4444
it('advances the line', () => {
45-
let i = createInputStream('h\ni')
45+
const i = createInputStream('h\ni')
4646
expect(i.next()).toEqual('h')
4747
expect(i.next()).toEqual('\n')
4848
expect(i.next()).toEqual('i')
@@ -54,11 +54,11 @@ describe('#next', () => {
5454

5555
describe('#eof', () => {
5656
it('returns false if there are more characters', () => {
57-
let i = createInputStream('hello')
57+
const i = createInputStream('hello')
5858
expect(i.eof()).toEqual(false)
5959
})
6060
it('returns true if there are no more characters', () => {
61-
let i = createInputStream('hi')
61+
const i = createInputStream('hi')
6262
expect(i.eof()).toEqual(false)
6363
i.next()
6464
i.next()
@@ -68,7 +68,7 @@ describe('#eof', () => {
6868

6969
describe('#err', () => {
7070
it('throws an error', () => {
71-
let i = createInputStream('hello')
71+
const i = createInputStream('hello')
7272
i.next()
7373
i.next()
7474
expect(() => {

‎lib/__tests__/token-stream.spec.js

+38-38
Original file line numberDiff line numberDiff line change
@@ -13,175 +13,175 @@ it('requires an InputStream', () => {
1313
})
1414

1515
it('returns an TokenStream', () => {
16-
let t = createTokenStream(createInputStream())
16+
const t = createTokenStream(createInputStream())
1717
expect(t).toMatchSnapshot()
1818
})
1919

2020
describe('#all', () => {
2121
it('tokenizes all characters in the InputStream', () => {
22-
let t = createTokenStream(createInputStream('hello'))
22+
const t = createTokenStream(createInputStream('hello'))
2323
expect(t.all().length).toEqual(1)
2424
expect(t.eof()).toEqual(true)
2525
})
2626
})
2727

2828
describe('#peek', () => {
2929
it('returns the current token', () => {
30-
let t = createTokenStream(createInputStream('hello'))
30+
const t = createTokenStream(createInputStream('hello'))
3131
expect(t.peek()).toMatchSnapshot()
3232
})
3333
it('returns the current token with an offset', () => {
34-
let t = createTokenStream(createInputStream('hello world'))
34+
const t = createTokenStream(createInputStream('hello world'))
3535
expect(t.peek(1)).toMatchSnapshot()
3636
})
3737
})
3838

3939
describe('#next', () => {
4040
it('consumes returns and the next token', () => {
41-
let t = createTokenStream(createInputStream('hello world'))
41+
const t = createTokenStream(createInputStream('hello world'))
4242
expect(t.next()).toMatchSnapshot()
4343
expect(t.peek()).toMatchSnapshot()
4444
})
4545
describe('tokens', () => {
4646
describe('space', () => {
4747
it('single space', () => {
48-
let t = createTokenStream(createInputStream(' '))
48+
const t = createTokenStream(createInputStream(' '))
4949
expect(t.next()).toMatchSnapshot()
5050
})
5151
it('multiple spaces', () => {
52-
let t = createTokenStream(createInputStream(' hello'))
52+
const t = createTokenStream(createInputStream(' hello'))
5353
expect(t.next()).toMatchSnapshot()
5454
})
5555
it('whitespace characters', () => {
56-
let t = createTokenStream(createInputStream('\n\n\t hello'))
56+
const t = createTokenStream(createInputStream('\n\n\t hello'))
5757
expect(t.next()).toMatchSnapshot()
5858
})
5959
it('carriage return character', () => {
60-
let t = createTokenStream(createInputStream('\r\n hello'))
60+
const t = createTokenStream(createInputStream('\r\n hello'))
6161
expect(t.next()).toMatchSnapshot()
6262
})
6363
})
6464
describe('comment', () => {
6565
it('single comment', () => {
66-
let t = createTokenStream(createInputStream('// Hello\nWorld'))
66+
const t = createTokenStream(createInputStream('// Hello\nWorld'))
6767
expect(t.next()).toMatchSnapshot()
6868
})
6969
it('single comment', () => {
70-
let t = createTokenStream(createInputStream('/** Hello World */'))
70+
const t = createTokenStream(createInputStream('/** Hello World */'))
7171
expect(t.next()).toMatchSnapshot()
7272
})
7373
})
7474
describe('number', () => {
7575
it('integer', () => {
76-
let t = createTokenStream(createInputStream('3'))
76+
const t = createTokenStream(createInputStream('3'))
7777
expect(t.next()).toMatchSnapshot()
7878
})
7979
it('float', () => {
80-
let t = createTokenStream(createInputStream('3.0'))
80+
const t = createTokenStream(createInputStream('3.0'))
8181
expect(t.next()).toMatchSnapshot()
8282
})
8383
it('float (leading decimal)', () => {
84-
let t = createTokenStream(createInputStream('.3'))
84+
const t = createTokenStream(createInputStream('.3'))
8585
expect(t.next()).toMatchSnapshot()
8686
})
8787
})
8888
describe('hex', () => {
8989
it('6 digit lowercase', () => {
90-
let t = createTokenStream(createInputStream('#ff0099'))
90+
const t = createTokenStream(createInputStream('#ff0099'))
9191
expect(t.next()).toMatchSnapshot()
9292
})
9393
it('6 digit uppercase', () => {
94-
let t = createTokenStream(createInputStream('#FF0099'))
94+
const t = createTokenStream(createInputStream('#FF0099'))
9595
expect(t.next()).toMatchSnapshot()
9696
})
9797
it('3 digit lowercase', () => {
98-
let t = createTokenStream(createInputStream('#ff0'))
98+
const t = createTokenStream(createInputStream('#ff0'))
9999
expect(t.next()).toMatchSnapshot()
100100
})
101101
it('3 digit uppercase', () => {
102-
let t = createTokenStream(createInputStream('#FF0'))
102+
const t = createTokenStream(createInputStream('#FF0'))
103103
expect(t.next()).toMatchSnapshot()
104104
})
105105
it('3 digit (trailing invalid)', () => {
106-
let t = createTokenStream(createInputStream('#FF0;'))
106+
const t = createTokenStream(createInputStream('#FF0;'))
107107
expect(t.next()).toMatchSnapshot()
108108
})
109109
it('6 digit numbers', () => {
110-
let t = createTokenStream(createInputStream('#000000'))
110+
const t = createTokenStream(createInputStream('#000000'))
111111
expect(t.next()).toMatchSnapshot()
112112
})
113113
})
114114
describe('atkeyword', () => {
115115
it('works', () => {
116-
let t = createTokenStream(createInputStream('@mixin'))
116+
const t = createTokenStream(createInputStream('@mixin'))
117117
expect(t.next()).toMatchSnapshot()
118118
})
119119
})
120120
describe('puctuation', () => {
121121
it('{', () => {
122-
let t = createTokenStream(createInputStream('{'))
122+
const t = createTokenStream(createInputStream('{'))
123123
expect(t.next()).toMatchSnapshot()
124124
})
125125
})
126126
describe('operator', () => {
127127
it('+', () => {
128-
let t = createTokenStream(createInputStream('+'))
128+
const t = createTokenStream(createInputStream('+'))
129129
expect(t.next()).toMatchSnapshot()
130130
})
131131
it('repeatable', () => {
132-
let t = createTokenStream(createInputStream('&&'))
132+
const t = createTokenStream(createInputStream('&&'))
133133
expect(t.next()).toMatchSnapshot()
134134
})
135135
it('non-repeatable', () => {
136-
let t = createTokenStream(createInputStream('++'))
136+
const t = createTokenStream(createInputStream('++'))
137137
expect(t.next()).toMatchSnapshot()
138138
})
139139
it('repeatable followed by non-repeatable', () => {
140-
let t = createTokenStream(createInputStream('&++'))
140+
const t = createTokenStream(createInputStream('&++'))
141141
expect(t.next()).toMatchSnapshot()
142142
})
143143
})
144144
describe('identifier', () => {
145145
it('checks for valid starting characters', () => {
146-
let t = createTokenStream(createInputStream('_hello world'))
146+
const t = createTokenStream(createInputStream('_hello world'))
147147
expect(t.next()).toMatchSnapshot()
148148
})
149149
it('ignores invalid starting characters', () => {
150-
let t = createTokenStream(createInputStream('0hello world'))
150+
const t = createTokenStream(createInputStream('0hello world'))
151151
expect(t.next()).toMatchSnapshot()
152152
})
153153
})
154154
describe('string', () => {
155155
it('single quotes', () => {
156-
let t = createTokenStream(createInputStream('\'hello\''))
156+
const t = createTokenStream(createInputStream('\'hello\''))
157157
expect(t.next()).toMatchSnapshot()
158158
})
159159
it('double quotes', () => {
160-
let t = createTokenStream(createInputStream('"hello"'))
160+
const t = createTokenStream(createInputStream('"hello"'))
161161
expect(t.next()).toMatchSnapshot()
162162
})
163163
it('escaped characters', () => {
164-
let t = createTokenStream(createInputStream('"hello \\"world\\""'))
164+
const t = createTokenStream(createInputStream('"hello \\"world\\""'))
165165
expect(t.next()).toMatchSnapshot()
166166
})
167167
it('preserves escape characters', () => {
168-
let t = createTokenStream(createInputStream('token(\'\'+myVar+\'font(\\\'world\\\')\')'))
168+
const t = createTokenStream(createInputStream('token(\'\'+myVar+\'font(\\\'world\\\')\')'))
169169
expect(t.all()).toMatchSnapshot()
170170
})
171171
})
172172
describe('variable', () => {
173173
it('works', () => {
174-
let t = createTokenStream(createInputStream('$size'))
174+
const t = createTokenStream(createInputStream('$size'))
175175
expect(t.next()).toMatchSnapshot()
176176
})
177177
})
178178
describe('sink', () => {
179179
it('1', () => {
180-
let t = createTokenStream(createInputStream('($var)'))
180+
const t = createTokenStream(createInputStream('($var)'))
181181
expect(t.all()).toMatchSnapshot()
182182
})
183183
it('2', () => {
184-
let t = createTokenStream(createInputStream('// ($var)\n@mixin myMixin'))
184+
const t = createTokenStream(createInputStream('// ($var)\n@mixin myMixin'))
185185
expect(t.all()).toMatchSnapshot()
186186
})
187187
})
@@ -190,11 +190,11 @@ describe('#next', () => {
190190

191191
describe('#eof', () => {
192192
it('returns false if there are more tokens', () => {
193-
let t = createTokenStream(createInputStream('hello'))
193+
const t = createTokenStream(createInputStream('hello'))
194194
expect(t.eof()).toEqual(false)
195195
})
196196
it('returns true if there are no more tokens', () => {
197-
let t = createTokenStream(createInputStream('hello world'))
197+
const t = createTokenStream(createInputStream('hello world'))
198198
expect(t.eof()).toEqual(false)
199199
t.next()
200200
t.next()
@@ -205,7 +205,7 @@ describe('#eof', () => {
205205

206206
describe('#err', () => {
207207
it('throws an error', () => {
208-
let t = createTokenStream(createInputStream('hello world'))
208+
const t = createTokenStream(createInputStream('hello world'))
209209
t.next()
210210
t.next()
211211
expect(() => {

‎lib/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@ const _stringify = require('./stringify')
2121
* @param {string} css
2222
* @returns {Node}
2323
*/
24-
let parse = (css) =>
25-
_parse(createTokenStream(createInputStream(css)))
24+
const parse = css => _parse(createTokenStream(createInputStream(css)))
2625

2726
/**
2827
* Convert a @{link Node} back into a stirng
2928
*
3029
* @param {Node} node
3130
* @returns {string}
3231
*/
33-
let stringify = (node) => _stringify(node)
32+
const stringify = node => _stringify(node)
3433

3534
module.exports = {
3635
parse,

0 commit comments

Comments
 (0)