Fixed bug with class inheritance

Author: andreas-aeschlimann

CHANGELOG.md

@@ -1,4 +1,14 @@
-# v1.0.x (2017-07-31)
+# v1.0.3 (2017-09-10)
+
+## Bug Fixes
+
+* Fixed issue with class properties when extending another class, closes [#22](https://github.com/dhlab-basel/json2typescript/issues/22)
+
+## Features
+
+* Allow `json2typescript` to work with `noImplicitAny`, closes [#23](https://github.com/dhlab-basel/json2typescript/issues/23)
+
+# v1.0.2 (2017-07-31)
 
 ## Bug Fixes
 

README.md

@@ -519,9 +519,15 @@ export class User {
 
 ---
 
-# Authors
+# Contributors
 
-This NPM package was originally created by the **Digital Humanities Lab** of **University of Basel** in 2016.
-We make use of it in our new website of http://www.salsah.org.
+This NPM package was originally created by **Andreas Aeschlimann**, scientific researcher of the **Digital Humanities Lab** (DHlab) of **University of Basel** in 2016. 
 
-More information on http://dhlab.unibas.ch
+The Digital Humanities Lab makes use of `json2typescript` in several Angular web applications, for example in the new website of http://www.salsah.org. You may find more information about us on http://dhlab.unibas.ch
+
+## Special thanks
+
+Thanks for the input and pull requests by:
+- @gempain for fixing several issues and adding karma tests.
+- @mrwogu for fixing the `noImplicitAny` issue.
+- @bblommers for the support of multiple decorators.

index.js

@@ -1,6 +1,6 @@
 {
   "name": "json2typescript",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Provides TypeScript methods to map a JSON object to a JavaScript object on runtime",
   "keywords": [
     "convert",
@@ -28,8 +28,7 @@
   "typescript": {
     "definition": "dist/index.d.ts"
   },
-  "dependencies": {
-  },
+  "dependencies": {},
   "devDependencies": {
     "@types/jasmine": "^2.5.52",
     "jasmine": "2.6.0",

package.json

@@ -44,6 +44,8 @@ export function JsonProperty(jsonPropertyName?: string, conversionOption?: any,
             target[Settings.MAPPING_PROPERTY] = [];
         }
 
+        const className = target.constructor.name;
+
         if (typeof(jsonPropertyName) === "undefined") {
             jsonPropertyName = classPropertyName;
         }
@@ -52,12 +54,6 @@ export function JsonProperty(jsonPropertyName?: string, conversionOption?: any,
             isOptional = false;
         }
 
-        if (classPropertyName === "version") {
-            //console.error(target.hasOwnProperty(classPropertyName));
-            //target[classPropertyName] = "null";
-            //console.error(target[classPropertyName]);
-        }
-
         let jsonPropertyMappingOptions = new MappingOptions();
         jsonPropertyMappingOptions.classPropertyName = classPropertyName;
         jsonPropertyMappingOptions.jsonPropertyName = jsonPropertyName;
@@ -71,7 +67,7 @@ export function JsonProperty(jsonPropertyName?: string, conversionOption?: any,
         }
 
         // Save the mapping info
-        target[Settings.MAPPING_PROPERTY][classPropertyName] = jsonPropertyMappingOptions;
+        target[Settings.MAPPING_PROPERTY][className + "." + classPropertyName] = jsonPropertyMappingOptions;
 
     }
 

src/json2typescript/json-convert-decorators.js

@@ -1,5 +1,5 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Enum for the operation mode of a JsonConvert instance.
  *

src/json2typescript/json-convert-decorators.js.map

@@ -1,5 +1,5 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Internal constants.
  */