Add unit tests for arrays support.

Simplify unit tests for "JsonPropertyFilter".
Update package version.
Update CHANGELOG.

Author: cyrilschumacher

CHANGELOG.md

@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [1.1.0]
 ### Added
 - Add arrays support.
 
@@ -30,7 +30,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Update the filter `**`: it can also be applied to a specific property.
 
-[Unreleased]: https://github.com/cyrilschumacher/json-property-filter/compare/1.0.2...HEAD
+[1.1.0]: https://github.com/cyrilschumacher/json-property-filter/compare/1.0.2...1.1.0
 [1.0.2]: https://github.com/cyrilschumacher/json-property-filter/compare/1.0.1...1.0.2
 [1.0.1]: https://github.com/cyrilschumacher/json-property-filter/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/cyrilschumacher/json-property-filter/compare/0.0.8...1.0.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-property-filter",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "keywords": [
     "json-property-filter",
     "filter",

src/jsonExcludePropertyFilter.ts

@@ -29,6 +29,7 @@ export default class JsonExcludePropertyFilter {
     private static ALL_PROPERTIES_REGEX = /\*\*$/g;
     private static ALL_ELEMENT_PROPERTIES_REGEX = /\*$/g;
     private static ARRAY_INDEX = /\[[0-9]+\]/g;
+    private static ARRAY_INDEX_START = /^\[([0-9]+)\]./;
     private static PATH_SEPARATOR = ".";
     private static STRING_EMPTY = "";
 
@@ -60,6 +61,10 @@ export default class JsonExcludePropertyFilter {
         return source;
     }
 
+    private _cleanupPath(path: string) {
+        return path.replace(JsonExcludePropertyFilter.ARRAY_INDEX_START, "");
+    }
+
     private _exclude(rule: string, source: Array<string>) {
         if (rule.match(JsonExcludePropertyFilter.ALL_PROPERTIES_REGEX)) {
             this._excludeProperties(rule, source);
@@ -71,9 +76,10 @@ export default class JsonExcludePropertyFilter {
     }
 
     private _excludeProperty(rule: string, source: Array<string>, path: string) {
+        const cleanPath = this._cleanupPath(path);
         const regexp = `^${rule}`;
 
-        if (path.match(regexp)) {
+        if (cleanPath.match(regexp)) {
             delete source[path];
         }
     }
@@ -92,7 +98,10 @@ export default class JsonExcludePropertyFilter {
         const pathWithoutIndex = path.replace(JsonExcludePropertyFilter.ARRAY_INDEX, JsonExcludePropertyFilter.STRING_EMPTY);
 
         if (rule === JsonExcludePropertyFilter.STRING_EMPTY) {
-            if (path.split(JsonExcludePropertyFilter.PATH_SEPARATOR).length === 1) {
+            const cleanPath = this._cleanupPath(path);
+            const splittedPath = cleanPath.split(JsonExcludePropertyFilter.PATH_SEPARATOR);
+
+            if (splittedPath.length === 1) {
                 delete source[path];
             }
         } else {
@@ -123,7 +132,8 @@ export default class JsonExcludePropertyFilter {
         const regexp = `^${rule}`;
         for (const path in source) {
             if (path) {
-                const pathWithoutIndex = path.replace(JsonExcludePropertyFilter.ARRAY_INDEX, JsonExcludePropertyFilter.STRING_EMPTY);
+                const cleanPath = this._cleanupPath(path);
+                const pathWithoutIndex = cleanPath.replace(JsonExcludePropertyFilter.ARRAY_INDEX, JsonExcludePropertyFilter.STRING_EMPTY);
 
                 if (pathWithoutIndex.match(regexp)) {
                     const pathWithoutIndexItems = pathWithoutIndex.split(".");

src/jsonIncludePropertyFilter.ts

@@ -29,6 +29,7 @@ export default class JsonIncludePropertyFilter {
     private static ALL_PROPERTIES_REGEX = /\*\*$/g;
     private static ALL_ELEMENT_PROPERTIES_REGEX = /\*$/g;
     private static ARRAY_INDEX = /\[[0-9]+\]/g;
+    private static ARRAY_INDEX_START = /^\[([0-9]+)\]./;
     private static PATH_SEPARATOR = ".";
     private static STRING_EMPTY = "";
 
@@ -62,6 +63,10 @@ export default class JsonIncludePropertyFilter {
         }
     }
 
+    private _cleanupPath(path: string) {
+        return path.replace(JsonIncludePropertyFilter.ARRAY_INDEX_START, "");
+    }
+
     private _include(rule: string, source: Array<string>, destination: Array<string>) {
         if (rule.match(JsonIncludePropertyFilter.ALL_PROPERTIES_REGEX)) {
             this._includeProperties(rule, source, destination);
@@ -72,11 +77,12 @@ export default class JsonIncludePropertyFilter {
         }
     }
 
-    private _includeProperty(rule: string, source: string, value: string, destination: Array<string>) {
+    private _includeProperty(rule: string, path: string, value: string, destination: Array<string>) {
+        const cleanPath = this._cleanupPath(path);
         const regexp = `^${rule}`;
 
-        if (source.match(regexp)) {
-            destination[source] = value;
+        if (cleanPath.match(regexp)) {
+            destination[path] = value;
         }
     }
 
@@ -95,7 +101,10 @@ export default class JsonIncludePropertyFilter {
         const pathWithoutIndex = path.replace(JsonIncludePropertyFilter.ARRAY_INDEX, JsonIncludePropertyFilter.STRING_EMPTY);
 
         if (rule === JsonIncludePropertyFilter.STRING_EMPTY) {
-            if (path.split(JsonIncludePropertyFilter.PATH_SEPARATOR).length === 1) {
+            const cleanPath = this._cleanupPath(path);
+            const splittedPath = cleanPath.split(JsonIncludePropertyFilter.PATH_SEPARATOR);
+
+            if (splittedPath.length === 1) {
                 destination[path] = value;
             }
         } else {
@@ -126,7 +135,8 @@ export default class JsonIncludePropertyFilter {
     private _includeSpecificPath(rule: string, source: Array<string>, destination: Array<string>) {
         for (const path in source) {
             if (path) {
-                const pathWithoutIndex = path.replace(JsonIncludePropertyFilter.ARRAY_INDEX, JsonIncludePropertyFilter.STRING_EMPTY);
+                const cleanPath = this._cleanupPath(path);
+                const pathWithoutIndex = cleanPath.replace(JsonIncludePropertyFilter.ARRAY_INDEX, JsonIncludePropertyFilter.STRING_EMPTY);
                 const regexp = `^${rule}`;
 
                 if (pathWithoutIndex.match(regexp)) {

src/serializer/serializeToObject.ts

@@ -26,8 +26,8 @@ function _isArray(arr) {
     const firstKey = keys[0];
 
     if (firstKey) {
-        const isArray = /^\[([0-9]+)\]/;
-        return isArray.test(firstKey);
+        const isArrayRegexp = /^\[([0-9]+)\]/;
+        return isArrayRegexp.test(firstKey);
     }
 
     return false;