@ridi/parser-core - npm Package Compare versions

Comparing version 0.6.13 to 0.6.14

lib/AesCryptor.js

@@ -33,3 +33,3 @@ 'use strict';
 
-var _stringContains = require('./stringContains');
+var _stringUtil = require('./stringUtil');
 
@@ -94,3 +94,3 @@ var _validateOptions = require('./validateOptions');
       throw (0, _errors.createError)(_errors2.default.EREQPRM, 'mode');
-    } else if (!(0, _typecheck.isObject)(mode) || !(0, _stringContains.stringContains)((0, _keys2.default)(Mode), mode.name)) {
+    } else if (!(0, _typecheck.isObject)(mode) || !(0, _stringUtil.stringContains)((0, _keys2.default)(Mode), mode.name)) {
       throw (0, _errors.createError)(_errors2.default.EINVAL, 'mode', 'mode', 'use Modes');
@@ -97,0 +97,0 @@ }

lib/index.js

@@ -6,3 +6,3 @@ 'use strict';
 });
-exports.Version = exports.openZip = exports.validateOptions = exports.isUrl = exports.isString = exports.isObject = exports.isFunc = exports.isExists = exports.isBool = exports.isArray = exports.getType = exports.stringContains = exports.MatchOption = exports.conditionally = exports.readEntries = exports.getPathes = exports.safePathJoin = exports.safePath = exports.safeDirname = exports.Parser = exports.parseBool = exports.mergeObjects = exports.LogLevel = exports.Logger = exports.Hash = exports.mustOverride = exports.createError = exports.Errors = exports.CryptoProvider = exports.AesCryptor = exports.writeCacheFile = exports.readCacheFile = exports.removeAllCacheFiles = exports.removeCacheFile = exports.getCachePath = exports.trimEnd = exports.trimStart = exports.trim = undefined;
+exports.Version = exports.openZip = exports.validateOptions = exports.isUrl = exports.isString = exports.isObject = exports.isFunc = exports.isExists = exports.isBool = exports.isArray = exports.getType = exports.safeDecodeURI = exports.stringContains = exports.MatchOption = exports.conditionally = exports.readEntries = exports.getPathes = exports.safePathJoin = exports.safePath = exports.safeDirname = exports.Parser = exports.parseBool = exports.mergeObjects = exports.LogLevel = exports.Logger = exports.Hash = exports.mustOverride = exports.createError = exports.Errors = exports.CryptoProvider = exports.AesCryptor = exports.writeCacheFile = exports.readCacheFile = exports.removeAllCacheFiles = exports.removeCacheFile = exports.getCachePath = exports.trimEnd = exports.trimStart = exports.trim = undefined;
 
@@ -55,3 +55,3 @@ var _bufferUtil = require('./bufferUtil');
 
-var _stringContains = require('./stringContains');
+var _stringUtil = require('./stringUtil');
 
@@ -95,4 +95,5 @@ var _typecheck = require('./typecheck');
 exports.conditionally = _streamUtil.conditionally;
-exports.MatchOption = _stringContains.MatchOption;
-exports.stringContains = _stringContains.stringContains;
+exports.MatchOption = _stringUtil.MatchOption;
+exports.stringContains = _stringUtil.stringContains;
+exports.safeDecodeURI = _stringUtil.safeDecodeURI;
 exports.getType = _typecheck.getType;
@@ -99,0 +100,0 @@ exports.isArray = _typecheck.isArray;

lib/Logger.js

@@ -38,3 +38,3 @@ 'use strict';
 
-var _stringContains = require('./stringContains');
+var _stringUtil = require('./stringUtil');
 
@@ -81,3 +81,3 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
     set: function set(level) {
-      this._logLevel = (0, _stringContains.stringContains)((0, _values2.default)(LogLevel), level) ? level : this.logLevel;
+      this._logLevel = (0, _stringUtil.stringContains)((0, _values2.default)(LogLevel), level) ? level : this.logLevel;
     }
@@ -91,3 +91,3 @@ }]);
     this.namespace = namespace || Logger.name;
-    this._logLevel = (0, _stringContains.stringContains)((0, _values2.default)(LogLevel), logLevel) ? logLevel : LogLevel.WARN;
+    this._logLevel = (0, _stringUtil.stringContains)((0, _values2.default)(LogLevel), logLevel) ? logLevel : LogLevel.WARN;
     this._firstTime = null;
@@ -94,0 +94,0 @@ }

lib/parseBool.js

@@ -10,3 +10,3 @@ 'use strict';
 
-var _stringContains = require('./stringContains');
+var _stringUtil = require('./stringUtil');
 
@@ -17,4 +17,4 @@ function parseBool(any) {
   }
-  return (0, _typecheck.isString)(any) ? (0, _stringContains.stringContains)(['true', 't', '1', 'yes', 'y'], any) : false;
+  return (0, _typecheck.isString)(any) ? (0, _stringUtil.stringContains)(['true', 't', '1', 'yes', 'y'], any) : false;
 }
 module.exports = exports.default;

lib/readEntries.js

@@ -63,2 +63,4 @@ 'use strict';
 
+var _stringUtil = require('./stringUtil');
+
 var _typecheck = require('./typecheck');
@@ -72,3 +74,2 @@
 
-/* eslint-disable max-len */
 function getReadStreamOptions(cryptoProvider) {
@@ -80,4 +81,5 @@ var options = {};
   return options;
-}
+} /* eslint-disable max-len */
 
+
 function create(source, entries) {
@@ -92,4 +94,7 @@ return {
     find: function find(entryPath) {
+      var strict = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       return entries.find(function (entry) {
-        return entryPath === entry.entryPath;
+        var lhs = strict ? entryPath : (0, _stringUtil.safeDecodeURI)(entryPath);
+        var rhs = strict ? entry.entryPath : (0, _stringUtil.safeDecodeURI)(entry.entryPath);
+        return lhs === rhs;
       });
@@ -314,3 +319,3 @@ },
 
-  function readEntries(_x3, _x4, _x5) {
+  function readEntries(_x4, _x5, _x6) {
     return _ref3.apply(this, arguments);
@@ -317,0 +322,0 @@ }

package.json

 {
   "name": "@ridi/parser-core",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "description": "Utilities for parsers",
@@ -29,4 +29,3 @@ "author": {
     "unzipper": "^0.10.1"
-  },
-  "gitHead": "39d49884ed79b8b1e1ea7380b0ab4182d70d63d5"
+  }
 }

No alert changes

Improved metrics

Total package byte prevSize

91399

increased by0.54%

Lines of code

2256

increased by0.67%

No dependency changes