with-style 5.0.213 → 5.0.215

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -22,13 +22,13 @@ function contentFromQueryNodeAndTokens(query, node, tokens) {
22
22
  return content;
23
23
  }
24
24
  function contentFromNodeAndTokens(node, tokens) {
25
- var firstSignificantToken = node.getFirstSignificantToken(), lastSignificantToken = node.getLastSignificantToken(), firstToken = firstSignificantToken, lastToken = lastSignificantToken, firstTokenIndex = tokens.indexOf(firstToken), lastTokenIndex = tokens.indexOf(lastToken);
25
+ var firstSignificantTokenIndex = node.getFirstSignificantTokenIndex(tokens), lastSignificantTokenIndex = node.getLastSignificantTokenIndex(tokens);
26
26
  var content = _constants.EMPTY_STRING;
27
- for(var index = firstTokenIndex; index <= lastTokenIndex; index++){
27
+ for(var index = firstSignificantTokenIndex; index <= lastSignificantTokenIndex; index++){
28
28
  var token = tokens[index], tokenContent = token.getContent();
29
29
  content += tokenContent;
30
30
  }
31
31
  return content;
32
32
  }
33
33
 
34
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY29udGVudC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IEVNUFRZX1NUUklORyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcblxuY29uc3QgeyBmaXJzdCB9ID0gYXJyYXlVdGlsaXRpZXM7XG5cbmV4cG9ydCBmdW5jdGlvbiBjb250ZW50RnJvbVF1ZXJ5Tm9kZUFuZFRva2VucyhxdWVyeSwgbm9kZSwgdG9rZW5zKSB7XG4gIGxldCBjb250ZW50ID0gbnVsbDtcblxuICBjb25zdCBub2RlcyA9IHF1ZXJ5LmV4ZWN1dGUobm9kZSksXG4gICAgICAgIG5vZGVzTGVuZ3RoID0gbm9kZXMubGVuZ3RoO1xuXG4gIGlmIChub2Rlc0xlbmd0aCA+IDApIHtcbiAgICBjb25zdCBmaXJzdE5vZGUgPSBmaXJzdChub2Rlcyk7XG5cbiAgICBub2RlID0gZmlyc3ROb2RlOyAvLy9cblxuICAgIGNvbnRlbnQgPSBjb250ZW50RnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKTtcbiAgfVxuXG4gIHJldHVybiBjb250ZW50O1xufVxuXG5mdW5jdGlvbiBjb250ZW50RnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gIGNvbnN0IGZpcnN0U2lnbmlmaWNhbnRUb2tlbiA9IG5vZGUuZ2V0Rmlyc3RTaWduaWZpY2FudFRva2VuKCksXG4gICAgICAgIGxhc3RTaWduaWZpY2FudFRva2VuID0gbm9kZS5nZXRMYXN0U2lnbmlmaWNhbnRUb2tlbigpLFxuICAgICAgICBmaXJzdFRva2VuID0gZmlyc3RTaWduaWZpY2FudFRva2VuLCAvLy9cbiAgICAgICAgbGFzdFRva2VuID0gbGFzdFNpZ25pZmljYW50VG9rZW4sIC8vL1xuICAgICAgICBmaXJzdFRva2VuSW5kZXggPSB0b2tlbnMuaW5kZXhPZihmaXJzdFRva2VuKSxcbiAgICAgICAgbGFzdFRva2VuSW5kZXggPSB0b2tlbnMuaW5kZXhPZihsYXN0VG9rZW4pO1xuXG4gIGxldCBjb250ZW50ID0gRU1QVFlfU1RSSU5HO1xuXG4gIGZvciAobGV0IGluZGV4ID0gZmlyc3RUb2tlbkluZGV4OyBpbmRleCA8PSBsYXN0VG9rZW5JbmRleDsgaW5kZXgrKykge1xuICAgIGNvbnN0IHRva2VuID0gdG9rZW5zW2luZGV4XSxcbiAgICAgICAgICB0b2tlbkNvbnRlbnQgPSB0b2tlbi5nZXRDb250ZW50KCk7XG5cbiAgICBjb250ZW50ICs9IHRva2VuQ29udGVudDtcbiAgfVxuXG4gIHJldHVybiBjb250ZW50O1xufVxuIl0sIm5hbWVzIjpbImNvbnRlbnRGcm9tUXVlcnlOb2RlQW5kVG9rZW5zIiwiZmlyc3QiLCJhcnJheVV0aWxpdGllcyIsInF1ZXJ5Iiwibm9kZSIsInRva2VucyIsImNvbnRlbnQiLCJub2RlcyIsImV4ZWN1dGUiLCJub2Rlc0xlbmd0aCIsImxlbmd0aCIsImZpcnN0Tm9kZSIsImNvbnRlbnRGcm9tTm9kZUFuZFRva2VucyIsImZpcnN0U2lnbmlmaWNhbnRUb2tlbiIsImdldEZpcnN0U2lnbmlmaWNhbnRUb2tlbiIsImxhc3RTaWduaWZpY2FudFRva2VuIiwiZ2V0TGFzdFNpZ25pZmljYW50VG9rZW4iLCJmaXJzdFRva2VuIiwibGFzdFRva2VuIiwiZmlyc3RUb2tlbkluZGV4IiwiaW5kZXhPZiIsImxhc3RUb2tlbkluZGV4IiwiRU1QVFlfU1RSSU5HIiwiaW5kZXgiLCJ0b2tlbiIsInRva2VuQ29udGVudCIsImdldENvbnRlbnQiXSwicmFuZ2VNYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsiLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBUWdCQTs7O2VBQUFBOzs7eUJBTmU7eUJBRUY7QUFFN0IsSUFBTSxBQUFFQyxRQUFVQyx5QkFBYyxDQUF4QkQ7QUFFRCxTQUFTRCw4QkFBOEJHLEtBQUssRUFBRUMsSUFBSSxFQUFFQyxNQUFNO0lBQy9ELElBQUlDLFVBQVU7SUFFZCxJQUFNQyxRQUFRSixNQUFNSyxPQUFPLENBQUNKLE9BQ3RCSyxjQUFjRixNQUFNRyxNQUFNO0lBRWhDLElBQUlELGNBQWMsR0FBRztRQUNuQixJQUFNRSxZQUFZVixNQUFNTTtRQUV4QkgsT0FBT08sV0FBVyxHQUFHO1FBRXJCTCxVQUFVTSx5QkFBeUJSLE1BQU1DO0lBQzNDO0lBRUEsT0FBT0M7QUFDVDtBQUVBLFNBQVNNLHlCQUF5QlIsSUFBSSxFQUFFQyxNQUFNO0lBQzVDLElBQU1RLHdCQUF3QlQsS0FBS1Usd0JBQXdCLElBQ3JEQyx1QkFBdUJYLEtBQUtZLHVCQUF1QixJQUNuREMsYUFBYUosdUJBQ2JLLFlBQVlILHNCQUNaSSxrQkFBa0JkLE9BQU9lLE9BQU8sQ0FBQ0gsYUFDakNJLGlCQUFpQmhCLE9BQU9lLE9BQU8sQ0FBQ0Y7SUFFdEMsSUFBSVosVUFBVWdCLHVCQUFZO0lBRTFCLElBQUssSUFBSUMsUUFBUUosaUJBQWlCSSxTQUFTRixnQkFBZ0JFLFFBQVM7UUFDbEUsSUFBTUMsUUFBUW5CLE1BQU0sQ0FBQ2tCLE1BQU0sRUFDckJFLGVBQWVELE1BQU1FLFVBQVU7UUFFckNwQixXQUFXbUI7SUFDYjtJQUVBLE9BQU9uQjtBQUNUIn0=
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY29udGVudC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IEVNUFRZX1NUUklORyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcblxuY29uc3QgeyBmaXJzdCB9ID0gYXJyYXlVdGlsaXRpZXM7XG5cbmV4cG9ydCBmdW5jdGlvbiBjb250ZW50RnJvbVF1ZXJ5Tm9kZUFuZFRva2VucyhxdWVyeSwgbm9kZSwgdG9rZW5zKSB7XG4gIGxldCBjb250ZW50ID0gbnVsbDtcblxuICBjb25zdCBub2RlcyA9IHF1ZXJ5LmV4ZWN1dGUobm9kZSksXG4gICAgICAgIG5vZGVzTGVuZ3RoID0gbm9kZXMubGVuZ3RoO1xuXG4gIGlmIChub2Rlc0xlbmd0aCA+IDApIHtcbiAgICBjb25zdCBmaXJzdE5vZGUgPSBmaXJzdChub2Rlcyk7XG5cbiAgICBub2RlID0gZmlyc3ROb2RlOyAvLy9cblxuICAgIGNvbnRlbnQgPSBjb250ZW50RnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKTtcbiAgfVxuXG4gIHJldHVybiBjb250ZW50O1xufVxuXG5mdW5jdGlvbiBjb250ZW50RnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gIGNvbnN0IGZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4ID0gbm9kZS5nZXRGaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCh0b2tlbnMpLFxuICAgICAgICBsYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4ID0gbm9kZS5nZXRMYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4KHRva2Vucyk7XG5cbiAgbGV0IGNvbnRlbnQgPSBFTVBUWV9TVFJJTkc7XG5cbiAgZm9yIChsZXQgaW5kZXggPSBmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleDsgaW5kZXggPD0gbGFzdFNpZ25pZmljYW50VG9rZW5JbmRleDsgaW5kZXgrKykge1xuICAgIGNvbnN0IHRva2VuID0gdG9rZW5zW2luZGV4XSxcbiAgICAgICAgICB0b2tlbkNvbnRlbnQgPSB0b2tlbi5nZXRDb250ZW50KCk7XG5cbiAgICBjb250ZW50ICs9IHRva2VuQ29udGVudDtcbiAgfVxuXG4gIHJldHVybiBjb250ZW50O1xufVxuIl0sIm5hbWVzIjpbImNvbnRlbnRGcm9tUXVlcnlOb2RlQW5kVG9rZW5zIiwiZmlyc3QiLCJhcnJheVV0aWxpdGllcyIsInF1ZXJ5Iiwibm9kZSIsInRva2VucyIsImNvbnRlbnQiLCJub2RlcyIsImV4ZWN1dGUiLCJub2Rlc0xlbmd0aCIsImxlbmd0aCIsImZpcnN0Tm9kZSIsImNvbnRlbnRGcm9tTm9kZUFuZFRva2VucyIsImZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4IiwiZ2V0Rmlyc3RTaWduaWZpY2FudFRva2VuSW5kZXgiLCJsYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4IiwiZ2V0TGFzdFNpZ25pZmljYW50VG9rZW5JbmRleCIsIkVNUFRZX1NUUklORyIsImluZGV4IiwidG9rZW4iLCJ0b2tlbkNvbnRlbnQiLCJnZXRDb250ZW50Il0sInJhbmdlTWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7IiwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFnQkE7OztlQUFBQTs7O3lCQU5lO3lCQUVGO0FBRTdCLElBQU0sQUFBRUMsUUFBVUMseUJBQWMsQ0FBeEJEO0FBRUQsU0FBU0QsOEJBQThCRyxLQUFLLEVBQUVDLElBQUksRUFBRUMsTUFBTTtJQUMvRCxJQUFJQyxVQUFVO0lBRWQsSUFBTUMsUUFBUUosTUFBTUssT0FBTyxDQUFDSixPQUN0QkssY0FBY0YsTUFBTUcsTUFBTTtJQUVoQyxJQUFJRCxjQUFjLEdBQUc7UUFDbkIsSUFBTUUsWUFBWVYsTUFBTU07UUFFeEJILE9BQU9PLFdBQVcsR0FBRztRQUVyQkwsVUFBVU0seUJBQXlCUixNQUFNQztJQUMzQztJQUVBLE9BQU9DO0FBQ1Q7QUFFQSxTQUFTTSx5QkFBeUJSLElBQUksRUFBRUMsTUFBTTtJQUM1QyxJQUFNUSw2QkFBNkJULEtBQUtVLDZCQUE2QixDQUFDVCxTQUNoRVUsNEJBQTRCWCxLQUFLWSw0QkFBNEIsQ0FBQ1g7SUFFcEUsSUFBSUMsVUFBVVcsdUJBQVk7SUFFMUIsSUFBSyxJQUFJQyxRQUFRTCw0QkFBNEJLLFNBQVNILDJCQUEyQkcsUUFBUztRQUN4RixJQUFNQyxRQUFRZCxNQUFNLENBQUNhLE1BQU0sRUFDckJFLGVBQWVELE1BQU1FLFVBQVU7UUFFckNmLFdBQVdjO0lBQ2I7SUFFQSxPQUFPZDtBQUNUIn0=
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "with-style",
3
3
  "author": "James Smith",
4
- "version": "5.0.213",
4
+ "version": "5.0.215",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/with-style",
7
7
  "description": "Programmatic styles.",
@@ -12,7 +12,7 @@
12
12
  "dependencies": {
13
13
  "necessary": "^14.0.1",
14
14
  "occam-lexers": "^22.0.27",
15
- "occam-parsers": "^22.0.49",
15
+ "occam-parsers": "^22.0.63",
16
16
  "occam-query": "^3.1.133",
17
17
  "parsers": "^0.1.1"
18
18
  },
@@ -24,16 +24,12 @@ export function contentFromQueryNodeAndTokens(query, node, tokens) {
24
24
  }
25
25
 
26
26
  function contentFromNodeAndTokens(node, tokens) {
27
- const firstSignificantToken = node.getFirstSignificantToken(),
28
- lastSignificantToken = node.getLastSignificantToken(),
29
- firstToken = firstSignificantToken, ///
30
- lastToken = lastSignificantToken, ///
31
- firstTokenIndex = tokens.indexOf(firstToken),
32
- lastTokenIndex = tokens.indexOf(lastToken);
27
+ const firstSignificantTokenIndex = node.getFirstSignificantTokenIndex(tokens),
28
+ lastSignificantTokenIndex = node.getLastSignificantTokenIndex(tokens);
33
29
 
34
30
  let content = EMPTY_STRING;
35
31
 
36
- for (let index = firstTokenIndex; index <= lastTokenIndex; index++) {
32
+ for (let index = firstSignificantTokenIndex; index <= lastSignificantTokenIndex; index++) {
37
33
  const token = tokens[index],
38
34
  tokenContent = token.getContent();
39
35