Skip to content

Commit a724446

Browse files
chore: update character-parser (#3354)
The updated dependency is written in TypeScript, which will help prepare us for converting pug-lexer to TypeScript
1 parent 6cca8f7 commit a724446

File tree

3 files changed

+9
-30
lines changed

3 files changed

+9
-30
lines changed

packages/pug-lexer/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Lexer.prototype = {
100100
assertNestingCorrect: function(exp) {
101101
//this verifies that code is properly nested, but allows
102102
//invalid JavaScript such as the contents of `attributes`
103-
var res = characterParser(exp);
103+
var res = characterParser.default(exp);
104104
if (res.isNesting()) {
105105
this.error(
106106
'INCORRECT_NESTING',
@@ -249,7 +249,7 @@ Lexer.prototype = {
249249
start === '(' || start === '{' || start === '[',
250250
'The start character should be "(", "{" or "["'
251251
);
252-
var end = characterParser.BRACKETS[start];
252+
var end = {'(': ')', '{': '}', '[': ']'}[start];
253253
var range;
254254
try {
255255
range = characterParser.parseUntil(this.input, end, {start: skip + 1});
@@ -873,15 +873,15 @@ Lexer.prototype = {
873873
when: function() {
874874
var tok = this.scanEndOfLine(/^when +([^:\n]+)/, 'when');
875875
if (tok) {
876-
var parser = characterParser(tok.val);
876+
var parser = characterParser.default(tok.val);
877877
while (parser.isNesting() || parser.isString()) {
878878
var rest = /:([^:\n]+)/.exec(this.input);
879879
if (!rest) break;
880880

881881
tok.val += rest[0];
882882
this.consume(rest[0].length);
883883
this.incrementColumn(rest[0].length);
884-
parser = characterParser(tok.val);
884+
parser = characterParser.default(tok.val);
885885
}
886886

887887
this.incrementColumn(-tok.val.length);

packages/pug-lexer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"pug"
77
],
88
"dependencies": {
9-
"character-parser": "^2.2.0",
9+
"character-parser": "^4.0.0",
1010
"is-expression": "^4.0.0",
1111
"pug-error": "^1.3.3"
1212
},

yarn.lock

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -998,12 +998,10 @@ char-regex@^1.0.2:
998998
resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
999999
integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
10001000

1001-
character-parser@^2.2.0:
1002-
version "2.2.0"
1003-
resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
1004-
integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A=
1005-
dependencies:
1006-
is-regex "^1.0.3"
1001+
character-parser@^4.0.0:
1002+
version "4.0.0"
1003+
resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-4.0.0.tgz#fb6899d41279880c20f1bfa31c9c7c51662744cd"
1004+
integrity sha512-jWburCrDpd+aPopB7esjh/gLyZoHZS4C2xwwJlkTPyhhJdXG+FCG0P4qCOInvOd9yhiuAEJYlZsUMQ0JSK4ykw==
10071005

10081006
ci-info@^2.0.0:
10091007
version "2.0.0"
@@ -1611,11 +1609,6 @@ fsevents@^2.1.2:
16111609
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
16121610
integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
16131611

1614-
function-bind@^1.1.1:
1615-
version "1.1.1"
1616-
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
1617-
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
1618-
16191612
gensync@^1.0.0-beta.1:
16201613
version "1.0.0-beta.1"
16211614
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -1756,13 +1749,6 @@ has-values@^1.0.0:
17561749
is-number "^3.0.0"
17571750
kind-of "^4.0.0"
17581751

1759-
has@^1.0.3:
1760-
version "1.0.3"
1761-
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
1762-
integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
1763-
dependencies:
1764-
function-bind "^1.1.1"
1765-
17661752
hawk@~3.1.3:
17671753
version "3.1.3"
17681754
resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -2005,13 +1991,6 @@ is-promise@^2.0.0:
20051991
resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
20061992
integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
20071993

2008-
is-regex@^1.0.3:
2009-
version "1.0.5"
2010-
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
2011-
integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
2012-
dependencies:
2013-
has "^1.0.3"
2014-
20151994
is-stream@^1.1.0:
20161995
version "1.1.0"
20171996
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"

0 commit comments

Comments
 (0)