pathington - npm Package Compare versions

Comparing version 1.1.3 to 1.1.4

CHANGELOG.md

 # pathington CHANGELOG
 
+## 1.1.4
+
+* Improve regexp coverage for dotty syntax
+* Simplify `isNumericKey` regexp
+
 ## 1.1.3
@@ -4,0 +9,0 @@

dist/pathington.js

@@ -82,12 +82,10 @@ (function webpackUniversalModuleDefinition(root, factory) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CACHE; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return DOTTY_SYNTAX_KEY; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return DOTTY_WITH_BRACKETS_SYNTAX; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return INVALID_CHARACTERS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return INVALID_FIRST_CHARACTER; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return MAX_CACHE_SIZE; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return MULTI_DIGIT_NUMBER; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return QUOTED_KEY; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return SINGLE_DIGIT_NUMBER; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "j", function() { return VALID_QUOTES; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return WHITE_SPACE; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return DOTTY_WITH_BRACKETS_SYNTAX; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return INVALID_CHARACTERS; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return INVALID_FIRST_CHARACTER; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return MAX_CACHE_SIZE; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return NUMBER; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return QUOTED_KEY; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return VALID_QUOTES; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return WHITE_SPACE; });
 /**
@@ -111,10 +109,5 @@ * @constant {Object} CACHE
 /**
- * @constant {RegExp} DOTTY_SYNTAX_KEY
- */
-var DOTTY_SYNTAX_KEY = /[.|\[]/;
-
-/**
  * @constant {RegExp} DOTTY_WITH_BRACKETS_SYNTAX
  */
-var DOTTY_WITH_BRACKETS_SYNTAX = /[a-zA-Z0-9_$]+|"[^"]+"|`[^`]+`|'[^']+'/g;
+var DOTTY_WITH_BRACKETS_SYNTAX = /"[^"]+"|`[^`]+`|'[^']+'|[^.[\]]+/g;
 
@@ -124,3 +117,3 @@ /**
  */
-var INVALID_CHARACTERS = /[^A-Za-z0-9_$]/;
+var INVALID_CHARACTERS = /[^\w$]/;
 
@@ -138,5 +131,5 @@ /**
 /**
- * @constant {RegExp} MULTI_DIGIT_NUMBER
+ * @constant {RegExp} NUMBER
  */
-var MULTI_DIGIT_NUMBER = /^\s*[+-]?\s*(?:(?:\d+(?:\.\d+)?(?:e[+-]?\d+)?)|(?:0x[a-f\d]+))\s*$/i;
+var NUMBER = /^\d+$/i;
 
@@ -146,13 +139,8 @@ /**
  */
-var QUOTED_KEY = /^((".+")|('.+')|(`.+`))$/;
+var QUOTED_KEY = /^"[^"]+"|`[^`]+`|'[^']+'$/;
 
 /**
- * @constant {RegExp} SINGLE_DIGIT_NUMBER
- */
-var SINGLE_DIGIT_NUMBER = /\d/;
-
-/**
  * @constant {Array<string>} VALID_QUOTES
  */
-var VALID_QUOTES = ['"', "'", '`'];
+var VALID_QUOTES = /^["'`]{1}$/;
 
@@ -197,4 +185,4 @@ /**
 
-  if (!~__WEBPACK_IMPORTED_MODULE_0__constants__["j" /* VALID_QUOTES */].indexOf(quote)) {
-    throw new SyntaxError('quote passed is invalid, must be ", `, or \'.');
+  if (!__WEBPACK_IMPORTED_MODULE_0__constants__["h" /* VALID_QUOTES */].test(quote)) {
+    throw new SyntaxError('quote ' + quote + ' passed is invalid, must be ", `, or \'.');
   }
@@ -254,3 +242,3 @@
 var isNumericKey = function isNumericKey(key) {
-  return !key.length ? false : key.length === 1 ? __WEBPACK_IMPORTED_MODULE_0__constants__["i" /* SINGLE_DIGIT_NUMBER */].test(key) : __WEBPACK_IMPORTED_MODULE_0__constants__["g" /* MULTI_DIGIT_NUMBER */].test(key);
+  return !!key.length && __WEBPACK_IMPORTED_MODULE_0__constants__["f" /* NUMBER */].test(key);
 };
@@ -268,3 +256,3 @@
 var isQuotedKey = function isQuotedKey(key) {
-  return __WEBPACK_IMPORTED_MODULE_0__constants__["h" /* QUOTED_KEY */].test(key);
+  return __WEBPACK_IMPORTED_MODULE_0__constants__["g" /* QUOTED_KEY */].test(key);
 };
@@ -295,3 +283,3 @@
 var shouldBeInQuotes = function shouldBeInQuotes(key) {
-  return __WEBPACK_IMPORTED_MODULE_0__constants__["d" /* INVALID_CHARACTERS */].test(key) || __WEBPACK_IMPORTED_MODULE_0__constants__["k" /* WHITE_SPACE */].test(key) || !!key[0] && __WEBPACK_IMPORTED_MODULE_0__constants__["e" /* INVALID_FIRST_CHARACTER */].test(key[0]);
+  return __WEBPACK_IMPORTED_MODULE_0__constants__["c" /* INVALID_CHARACTERS */].test(key) || __WEBPACK_IMPORTED_MODULE_0__constants__["i" /* WHITE_SPACE */].test(key) || !!key[0] && __WEBPACK_IMPORTED_MODULE_0__constants__["d" /* INVALID_FIRST_CHARACTER */].test(key[0]);
 };
@@ -345,7 +333,7 @@
 
-  if (__WEBPACK_IMPORTED_MODULE_0__constants__["a" /* CACHE */].size > __WEBPACK_IMPORTED_MODULE_0__constants__["f" /* MAX_CACHE_SIZE */]) {
+  if (__WEBPACK_IMPORTED_MODULE_0__constants__["a" /* CACHE */].size > __WEBPACK_IMPORTED_MODULE_0__constants__["e" /* MAX_CACHE_SIZE */]) {
     __WEBPACK_IMPORTED_MODULE_0__constants__["a" /* CACHE */].clear();
   }
 
-  __WEBPACK_IMPORTED_MODULE_0__constants__["a" /* CACHE */].results[path] = __WEBPACK_IMPORTED_MODULE_0__constants__["b" /* DOTTY_SYNTAX_KEY */].test(path) ? path.match(__WEBPACK_IMPORTED_MODULE_0__constants__["c" /* DOTTY_WITH_BRACKETS_SYNTAX */]).map(getNormalizedParseKey) : [path];
+  __WEBPACK_IMPORTED_MODULE_0__constants__["a" /* CACHE */].results[path] = path ? path.match(__WEBPACK_IMPORTED_MODULE_0__constants__["b" /* DOTTY_WITH_BRACKETS_SYNTAX */]).map(getNormalizedParseKey) : [path];
   __WEBPACK_IMPORTED_MODULE_0__constants__["a" /* CACHE */].size++;
@@ -352,0 +340,0 @@

dist/pathington.min.js

@@ -1,1 +0,1 @@
-!(function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("pathington",[],t):"object"==typeof exports?exports.pathington=t():e.pathington=t()})("undefined"!=typeof self?self:this,(function(){return (function(e){function t(n){if(r[n])return r[n].exports;var u=r[n]={i:n,l:!1,exports:{}};return e[n].call(u.exports,u,u.exports,t),u.l=!0,u.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)})([(function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={clear:function(){n.results={},n.size=0},results:{},size:0},u=/[.|\[]/,o=/[a-zA-Z0-9_$]+|"[^"]+"|`[^`]+`|'[^']+'/g,s=/[^A-Za-z0-9_$]/,i=/[^A-Za-z_$]/,f=/^\s*[+-]?\s*(?:(?:\d+(?:\.\d+)?(?:e[+-]?\d+)?)|(?:0x[a-f\d]+))\s*$/i,a=/^((".+")|('.+')|(`.+`))$/,c=/\d/,p=['"',"'","`"],l=/\s/,d=function(e){return!!e.length&&(1===e.length?c.test(e):f.test(e))},y=function(e){return a.test(e)},b=function(e){return"number"==typeof e||d(e)||y(e)},h=function(e){return s.test(e)||l.test(e)||!!e[0]&&i.test(e[0])},g=function(e){return function(t,r){var n=h(r)?""+e+r+e:r;return b(n)?t+"["+n+"]":t+"."+n}},m=function(e){var t=y(e)?e.substring(1,e.length-1):e;return d(t)?+t:t},v=function(e){return n.results[e]?n.results[e]:(n.size>500&&n.clear(),n.results[e]=u.test(e)?e.match(o).map(m):[e],n.size++,n.results[e])};r.d(t,"create",(function(){return x})),r.d(t,"parse",(function(){return z}));var x=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:'"';if(!Array.isArray(e))throw new ReferenceError("path passed must be an array");if(!~p.indexOf(t))throw new SyntaxError("quote passed is invalid, must be \", `, or '.");var r=e.reduce(g(t),"");return"."===r[0]?r.slice(1):r},z=function(e){return"string"==typeof e?v(e):Array.isArray(e)?e.map(m):["number"==typeof e?e:""+e]}})])}));
+!(function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("pathington",[],t):"object"==typeof exports?exports.pathington=t():e.pathington=t()})("undefined"!=typeof self?self:this,(function(){return (function(e){function t(n){if(r[n])return r[n].exports;var u=r[n]={i:n,l:!1,exports:{}};return e[n].call(u.exports,u,u.exports,t),u.l=!0,u.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)})([(function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={clear:function(){n.results={},n.size=0},results:{},size:0},u=/"[^"]+"|`[^`]+`|'[^']+'|[^.[\]]+/g,o=/[^\w$]/,s=/[^A-Za-z_$]/,i=/^\d+$/i,f=/^"[^"]+"|`[^`]+`|'[^']+'$/,c=/^["'`]{1}$/,a=/\s/,p=function(e){return!!e.length&&i.test(e)},l=function(e){return f.test(e)},d=function(e){return"number"==typeof e||p(e)||l(e)},y=function(e){return o.test(e)||a.test(e)||!!e[0]&&s.test(e[0])},b=function(e){return function(t,r){var n=y(r)?""+e+r+e:r;return d(n)?t+"["+n+"]":t+"."+n}},h=function(e){var t=l(e)?e.substring(1,e.length-1):e;return p(t)?+t:t},m=function(e){return n.results[e]?n.results[e]:(n.size>500&&n.clear(),n.results[e]=e?e.match(u).map(h):[e],n.size++,n.results[e])};r.d(t,"create",(function(){return v})),r.d(t,"parse",(function(){return g}));var v=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:'"';if(!Array.isArray(e))throw new ReferenceError("path passed must be an array");if(!c.test(t))throw new SyntaxError("quote "+t+" passed is invalid, must be \", `, or '.");var r=e.reduce(b(t),"");return"."===r[0]?r.slice(1):r},g=function(e){return"string"==typeof e?m(e):Array.isArray(e)?e.map(h):["number"==typeof e?e:""+e]}})])}));

es/constants.js

@@ -19,10 +19,5 @@ /**
 /**
- * @constant {RegExp} DOTTY_SYNTAX_KEY
- */
-export var DOTTY_SYNTAX_KEY = /[.|\[]/;
-
-/**
  * @constant {RegExp} DOTTY_WITH_BRACKETS_SYNTAX
  */
-export var DOTTY_WITH_BRACKETS_SYNTAX = /[a-zA-Z0-9_$]+|"[^"]+"|`[^`]+`|'[^']+'/g;
+export var DOTTY_WITH_BRACKETS_SYNTAX = /"[^"]+"|`[^`]+`|'[^']+'|[^.[\]]+/g;
 
@@ -32,3 +27,3 @@ /**
  */
-export var INVALID_CHARACTERS = /[^A-Za-z0-9_$]/;
+export var INVALID_CHARACTERS = /[^\w$]/;
 
@@ -46,5 +41,5 @@ /**
 /**
- * @constant {RegExp} MULTI_DIGIT_NUMBER
+ * @constant {RegExp} NUMBER
  */
-export var MULTI_DIGIT_NUMBER = /^\s*[+-]?\s*(?:(?:\d+(?:\.\d+)?(?:e[+-]?\d+)?)|(?:0x[a-f\d]+))\s*$/i;
+export var NUMBER = /^\d+$/i;
 
@@ -54,13 +49,8 @@ /**
  */
-export var QUOTED_KEY = /^((".+")|('.+')|(`.+`))$/;
+export var QUOTED_KEY = /^"[^"]+"|`[^`]+`|'[^']+'$/;
 
 /**
- * @constant {RegExp} SINGLE_DIGIT_NUMBER
- */
-export var SINGLE_DIGIT_NUMBER = /\d/;
-
-/**
  * @constant {Array<string>} VALID_QUOTES
  */
-export var VALID_QUOTES = ['"', "'", '`'];
+export var VALID_QUOTES = /^["'`]{1}$/;
 
@@ -67,0 +57,0 @@ /**

es/index.js

@@ -24,4 +24,4 @@ // constants
 
-  if (!~VALID_QUOTES.indexOf(quote)) {
-    throw new SyntaxError('quote passed is invalid, must be ", `, or \'.');
+  if (!VALID_QUOTES.test(quote)) {
+    throw new SyntaxError('quote ' + quote + ' passed is invalid, must be ", `, or \'.');
   }
@@ -28,0 +28,0 @@

es/utils.js

 // constants
-import { CACHE, DOTTY_SYNTAX_KEY, DOTTY_WITH_BRACKETS_SYNTAX, INVALID_CHARACTERS, INVALID_FIRST_CHARACTER, MAX_CACHE_SIZE, MULTI_DIGIT_NUMBER, QUOTED_KEY, SINGLE_DIGIT_NUMBER, WHITE_SPACE } from './constants';
+import { CACHE, DOTTY_WITH_BRACKETS_SYNTAX, INVALID_CHARACTERS, INVALID_FIRST_CHARACTER, MAX_CACHE_SIZE, NUMBER, QUOTED_KEY, WHITE_SPACE } from './constants';
 
@@ -14,3 +14,3 @@ /**
 export var isNumericKey = function isNumericKey(key) {
-  return !key.length ? false : key.length === 1 ? SINGLE_DIGIT_NUMBER.test(key) : MULTI_DIGIT_NUMBER.test(key);
+  return !!key.length && NUMBER.test(key);
 };
@@ -107,3 +107,3 @@
 
-  CACHE.results[path] = DOTTY_SYNTAX_KEY.test(path) ? path.match(DOTTY_WITH_BRACKETS_SYNTAX).map(getNormalizedParseKey) : [path];
+  CACHE.results[path] = path ? path.match(DOTTY_WITH_BRACKETS_SYNTAX).map(getNormalizedParseKey) : [path];
   CACHE.size++;
@@ -110,0 +110,0 @@

lib/constants.js

@@ -1,2 +0,2 @@
-'use strict';
+"use strict";
 
@@ -22,10 +22,5 @@ exports.__esModule = true;
 /**
- * @constant {RegExp} DOTTY_SYNTAX_KEY
- */
-var DOTTY_SYNTAX_KEY = exports.DOTTY_SYNTAX_KEY = /[.|\[]/;
-
-/**
  * @constant {RegExp} DOTTY_WITH_BRACKETS_SYNTAX
  */
-var DOTTY_WITH_BRACKETS_SYNTAX = exports.DOTTY_WITH_BRACKETS_SYNTAX = /[a-zA-Z0-9_$]+|"[^"]+"|`[^`]+`|'[^']+'/g;
+var DOTTY_WITH_BRACKETS_SYNTAX = exports.DOTTY_WITH_BRACKETS_SYNTAX = /"[^"]+"|`[^`]+`|'[^']+'|[^.[\]]+/g;
 
@@ -35,3 +30,3 @@ /**
  */
-var INVALID_CHARACTERS = exports.INVALID_CHARACTERS = /[^A-Za-z0-9_$]/;
+var INVALID_CHARACTERS = exports.INVALID_CHARACTERS = /[^\w$]/;
 
@@ -49,5 +44,5 @@ /**
 /**
- * @constant {RegExp} MULTI_DIGIT_NUMBER
+ * @constant {RegExp} NUMBER
  */
-var MULTI_DIGIT_NUMBER = exports.MULTI_DIGIT_NUMBER = /^\s*[+-]?\s*(?:(?:\d+(?:\.\d+)?(?:e[+-]?\d+)?)|(?:0x[a-f\d]+))\s*$/i;
+var NUMBER = exports.NUMBER = /^\d+$/i;
 
@@ -57,13 +52,8 @@ /**
  */
-var QUOTED_KEY = exports.QUOTED_KEY = /^((".+")|('.+')|(`.+`))$/;
+var QUOTED_KEY = exports.QUOTED_KEY = /^"[^"]+"|`[^`]+`|'[^']+'$/;
 
 /**
- * @constant {RegExp} SINGLE_DIGIT_NUMBER
- */
-var SINGLE_DIGIT_NUMBER = exports.SINGLE_DIGIT_NUMBER = /\d/;
-
-/**
  * @constant {Array<string>} VALID_QUOTES
  */
-var VALID_QUOTES = exports.VALID_QUOTES = ['"', "'", '`'];
+var VALID_QUOTES = exports.VALID_QUOTES = /^["'`]{1}$/;
 
@@ -70,0 +60,0 @@ /**

lib/index.js

@@ -28,4 +28,4 @@ 'use strict';
 
-  if (!~_constants.VALID_QUOTES.indexOf(quote)) {
-    throw new SyntaxError('quote passed is invalid, must be ", `, or \'.');
+  if (!_constants.VALID_QUOTES.test(quote)) {
+    throw new SyntaxError('quote ' + quote + ' passed is invalid, must be ", `, or \'.');
   }
@@ -32,0 +32,0 @@

lib/utils.js

@@ -18,3 +18,3 @@ 'use strict';
 var isNumericKey = exports.isNumericKey = function isNumericKey(key) {
-  return !key.length ? false : key.length === 1 ? _constants.SINGLE_DIGIT_NUMBER.test(key) : _constants.MULTI_DIGIT_NUMBER.test(key);
+  return !!key.length && _constants.NUMBER.test(key);
 };
@@ -112,3 +112,3 @@
 
-  _constants.CACHE.results[path] = _constants.DOTTY_SYNTAX_KEY.test(path) ? path.match(_constants.DOTTY_WITH_BRACKETS_SYNTAX).map(getNormalizedParseKey) : [path];
+  _constants.CACHE.results[path] = path ? path.match(_constants.DOTTY_WITH_BRACKETS_SYNTAX).map(getNormalizedParseKey) : [path];
   _constants.CACHE.size++;
@@ -115,0 +115,0 @@

package.json

@@ -90,3 +90,3 @@ {
   },
-  "version": "1.1.3"
+  "version": "1.1.4"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

256565

decreased by-0.9%

Lines of code

675

decreased by-3.85%

No dependency changes