Fix bugs.

Fix example descriptions.
Reorganize tests.

Author: cyrilschumacher

CHANGELOG.md

@@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Fix CLI version.
 - Fix CLI.
+- Fix Regular expression on including and excluding filters.
 
 ## [1.2.0] - 2016-06-20
 ### Added

example/array/index.js

@@ -1,5 +1,5 @@
 /**
- * Example that excludes given JSON keys.
+ * Example with array type.
  */
 
 const fs = require("fs");

example/complex/index.js

@@ -1,5 +1,5 @@
 /**
- * Example that excludes given JSON keys.
+ * Example that include and excludes given JSON keys.
  */
 
 const fs = require("fs");
@@ -8,7 +8,7 @@ const lib = require("../../lib/jsonPropertyFilter");
 const buffer = fs.readFileSync("source.json");
 const source = JSON.parse(buffer.toString());
 
-const filter = new lib.JsonPropertyFilter(["**", "-type", "-properties.id.type"]);
+const filter = new lib.JsonPropertyFilter(["**", "-$schema", "-type", "-properties.id.type"]);
 const filtered = filter.apply(source);
 
 console.log(filtered); // { title: 'Product', description: 'A product from Acme\'s catalog', properties: { id: { description: 'The unique identifier for a product' } }, required: [ 'id' ] }

example/complex/source.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "test",
     "title": "Product",
     "description": "A product from Acme's catalog",
     "type": "object",

example/exclude/index.js

@@ -8,7 +8,7 @@ const lib = require("../../lib/jsonPropertyFilter");
 const buffer = fs.readFileSync("source.json");
 const source = JSON.parse(buffer.toString());
 
-const filter = new lib.JsonPropertyFilter(["-key2.key3", "-key2.key5.key6"]);
+const filter = new lib.JsonPropertyFilter(["-$schema", "-key2.key3", "-key2.key5.key6"]);
 const filtered = filter.apply(source);
 
 console.log(filtered); // { key1: 'value1', key2: { key4: 'value3' } }

src/filter/jsonExcludePropertyFilter.ts

@@ -73,7 +73,7 @@ export class JsonExcludePropertyFilter {
 
     private _excludeProperty(rule: string, source: string[], path: string) {
         const pathWithoutArrayIndexStart = this._removeArrayIndexStart(path);
-        const regexp = `^${rule}`;
+        const regexp = `^${rule.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&")}`;
 
         if (pathWithoutArrayIndexStart.match(regexp)) {
             delete source[path];
@@ -101,7 +101,7 @@ export class JsonExcludePropertyFilter {
                 delete source[path];
             }
         } else {
-            const regexp = `^${rule}`;
+            const regexp = `^${rule.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&")}`;
 
             if (pathWithoutIndex.match(regexp)) {
                 const pathItems = pathWithoutIndex.split(JsonExcludePropertyFilter.PATH_SEPARATOR);
@@ -125,7 +125,7 @@ export class JsonExcludePropertyFilter {
     }
 
     private _excludeSpecificPath(rule: string, source: string[]) {
-        const regexp = `^${rule}`;
+        const regexp = `^${rule.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&")}`;
         for (const path in source) {
             if (path) {
                 const pathWithoutArrayIndexStart = this._removeArrayIndexStart(path);

src/filter/jsonIncludePropertyFilter.ts

@@ -75,7 +75,7 @@ export class JsonIncludePropertyFilter {
 
     private _includeProperty(rule: string, path: string, value: string, destination: string[]) {
         const cleanPath = this._removeArrayIndexStart(path);
-        const regexp = `^${rule}`;
+        const regexp = `^${rule.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&")}`;
 
         if (cleanPath.match(regexp)) {
             destination[path] = value;
@@ -103,7 +103,7 @@ export class JsonIncludePropertyFilter {
                 destination[path] = value;
             }
         } else {
-            const regexp = `^${rule}`;
+            const regexp = `^${rule.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&")}`;
 
             if (pathWithoutArrayIndexStart.match(regexp)) {
                 const pathItems = pathWithoutArrayIndexStart.split(JsonIncludePropertyFilter.PATH_SEPARATOR);