Corrected README and json files errors

Author: andreas-aeschlimann

CHANGELOG.md

@@ -1,4 +1,4 @@
-# v1.0.0 (2017-07-18)
+# v1.0.x (2017-07-31)
 
 ## Bug Fixes
 
@@ -14,10 +14,8 @@
 
 ## Breaking Changes
 
-* Use an instance of `JsonConvert` its class methods instead of the static methods
-
+* Use an instance of `JsonConvert` and its class methods instead of the static methods
 * The static class properties `valueCheckingMode` and `debugMode` are not static anymore. `debugMode` has been renamed to `operationMode`. Their values should be assigned through the given enums with the same name
-
 * Removed the string method `deserializeString()` due to the fact that it is the same as `jsonConvert.deserialize()` combined with `JSON.stringify()`
 
 # 0.9.6  (2017-01-18) 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json2typescript",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Provides TypeScript methods to map a JSON object to a JavaScript object on runtime",
   "keywords": [
     "convert",
@@ -41,11 +41,11 @@
     "phantomjs-prebuilt": "2.1.14",
     "typescript": "2.3.4"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "index.js",
   "files": [
-    "dist",
-    "src"
+    "src/json2typescript",
+    "index.ts",
+    "index.js"
   ],
   "repository": {
     "type": "git",

test/json2typescript.integration.ts

@@ -16,7 +16,7 @@ describe('Integration tests', () => {
         // JSON DATA
         let human1JsonObject = {
             firstname: "Andreas",
-            lastname: "Aeschlimann"
+            lastname: "Muster"
         }
         let cat1JsonObject = {
             name: "Meowy",
@@ -87,7 +87,7 @@ describe('Integration tests', () => {
         // TYPESCRIPT INSTANCES
         let human1 = new Human();
         human1.firstname = "Andreas";
-        human1.lastname = "Aeschlimann";
+        human1.lastname = "Muster";
         let cat1 = new Cat();
         cat1.name = "Meowy";
         cat1.district = 100;

test/json2typescript.unit.ts

@@ -17,7 +17,7 @@ describe('Unit tests', () => {
         // JSON DATA
         let human1JsonObject = {
             firstname: "Andreas",
-            lastname: "Aeschlimann"
+            lastname: "Muster"
         }
         let cat1JsonObject = {
             name: "Meowy",
@@ -93,7 +93,7 @@ describe('Unit tests', () => {
         // TYPESCRIPT INSTANCES
         let human1 = new Human();
         human1.firstname = "Andreas";
-        human1.lastname = "Aeschlimann";
+        human1.lastname = "Muster";
         let cat1 = new Cat();
         cat1.name = "Meowy";
         cat1.district = 100;
@@ -146,7 +146,7 @@ describe('Unit tests', () => {
                 (<any>jsonConvert).deserializeObject_loopProperty(t_cat, "owner", {
                     "owner": {
                         firstname: "Andreas",
-                        lastname: "Aeschlimann"
+                        lastname: "Muster"
                     }
                 });
                 expect(t_cat.owner.firstname).toEqual("Andreas");

tsconfig.json

@@ -23,8 +23,8 @@
     "index.ts",
     "src/json2typescript/json-convert",
     "src/json2typescript/json-convert-decorators.ts",
-    "src/json2typescript/json-convert-enums.ts"
+    "src/json2typescript/json-convert-enums.ts",
     "src/json2typescript/json-convert-options.ts",
-    "src/json2typescript/json-custom-convert.ts",
+    "src/json2typescript/json-custom-convert.ts"
   ]
 }