Update dependencies, update tests, remove explicit engines requirement, other changes

Author: michaelkourlas

.travis.yml

@@ -4,7 +4,6 @@ node_js:
   - 6
   - 5
   - 4
-  - 4.0.0
 install:
   - npm install -g gulp
   - npm install

CHANGES.md

@@ -1,6 +1,8 @@
-## 2.1.0 ##
+## 3.0.0 ##
 
+* Bug fixes
 * Add null and undefined in type declarations
+* Remove explicit engines requirement
 
 ## 2.0.2 ##
 

NOTICE.md

@@ -1,9 +1,9 @@
 js2xmlparser  
-Copyright (C) 2016 Michael Kourlas
+Copyright (C) 2016-2017 Michael Kourlas
 
 ## Apache License, version 2.0 ##
 
 The following components are provided under the [Apache License, version 2.0](https://www.apache.org/licenses/LICENSE-2.0):
 
 xmlcreate  
-Copyright (C) 2016 Michael Kourlas  
+Copyright (C) 2016-2017 Michael Kourlas  

README.md

@@ -66,7 +66,7 @@ includes source maps.
 
 ## Usage ##
 
-The documentation for the current version is available [here](http://www.kourlas.com/node-js2xmlparser/docs/2.0.2/).
+The documentation for the current version is available [here](http://www.kourlas.com/node-js2xmlparser/docs/3.0.0/).
 
 You can also build the documentation using gulp:
 

gulpfile.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Michael Kourlas
+ * Copyright (C) 2016-2017 Michael Kourlas
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,47 +16,77 @@
 
 "use strict";
 
-var doc = require("gulp-typedoc");
+var del = require("del");
+var typedoc = require("gulp-typedoc");
 var gulp = require("gulp");
 var merge2 = require("merge2");
 var mocha = require("gulp-mocha");
 var sourcemaps = require('gulp-sourcemaps');
-var ts = require("gulp-typescript");
+var typescript = require("gulp-typescript");
 var tslint = require("gulp-tslint");
 
 gulp.task("default", ["prod", "test-prod", "docs"]);
 
-var tsProject = ts.createProject("tsconfig.json");
-gulp.task("prod", function() {
+gulp.task("clean", function() {
+    return del("lib");
+});
+
+gulp.task("clean-docs", function() {
+    return del("docs");
+});
+
+var tsProject = typescript.createProject("tsconfig.json");
+gulp.task("prod", ["clean"], function() {
     var tsResult = tsProject.src()
                             .pipe(tslint())
                             .pipe(tslint.report())
-                            .pipe(tsProject(ts.reporter.longReporter()));
+                            .pipe(tsProject())
+                            .on("error", function() {
+                                this.on("finish", function() {
+                                    // Commented out pending resolution
+                                    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14324
+                                    // process.exit(1);
+                                });
+                            });
     return merge2([tsResult.js
                            .pipe(gulp.dest("lib")),
                    tsResult.dts
                            .pipe(gulp.dest("lib"))]);
 });
-gulp.task("dev", function() {
+gulp.task("dev", ["clean"], function() {
     var tsResult = tsProject.src()
                             .pipe(tslint())
                             .pipe(tslint.report())
                             .pipe(sourcemaps.init())
-                            .pipe(tsProject(ts.reporter.longReporter()));
+                            .pipe(tsProject())
+                            .on("error", function() {
+                                this.on("finish", function() {
+                                    // Commented out pending resolution
+                                    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14324
+                                    // process.exit(1);
+                                });
+                            });
     return merge2([tsResult.js
                            .pipe(sourcemaps.write())
                            .pipe(gulp.dest("lib")),
                    tsResult.dts
                            .pipe(gulp.dest("lib"))]);
 });
 
-var testTsProject = ts.createProject("test/tsconfig.json");
+var testTsProject = typescript.createProject("test/tsconfig.json");
 var test = function() {
     return testTsProject.src()
                         .pipe(tslint())
                         .pipe(tslint.report())
                         .pipe(sourcemaps.init())
-                        .pipe(testTsProject(ts.reporter.longReporter()))
+                        .pipe(testTsProject())
+                        .on("error", function() {
+                            this.on("finish", function() {
+                                // Commented out pending resolution
+                                // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14324
+                                // process.exit(1);
+                            });
+                        })
                         .pipe(sourcemaps.write())
                         .pipe(gulp.dest("test/lib"))
                         .pipe(mocha());
@@ -69,11 +99,9 @@ var docOptions = {
     mode: "file",
     module: "commonjs",
     out: "docs",
-    target: "es5",
-    // TODO: Remove this option once TypeDoc supports TypeScript 2.0
-    ignoreCompilerErrors: true
+    target: "es5"
 };
-gulp.task("docs", function() {
+gulp.task("docs", ["prod", "clean-docs"], function() {
     return gulp.src("src")
-               .pipe(doc(docOptions));
+               .pipe(typedoc(docOptions));
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js2xmlparser",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "description": "Parses JavaScript objects into XML",
   "keywords": [
     "convert",
@@ -35,25 +35,23 @@
     "url": "git://github.com/michaelkourlas/node-js2xmlparser.git"
   },
   "dependencies": {
-    "xmlcreate": "^0.1.1"
+    "xmlcreate": "^1.0.1"
   },
   "devDependencies": {
-    "@types/chai": "^3.4.34",
-    "@types/mocha": "^2.2.32",
+    "@types/chai": "^3.4.35",
+    "@types/mocha": "^2.2.39",
     "chai": "^3.5.0",
+    "del": "^2.2.2",
     "gulp": "^3.9.1",
-    "gulp-mocha": "^3.0.1",
-    "gulp-sourcemaps": "^1.6.0",
-    "gulp-tslint": "^6.1.2",
-    "gulp-typedoc": "^2.0.0",
-    "gulp-typescript": "^3.0.1",
-    "merge2": "^1.0.2",
-    "mocha": "^3.1.0",
-    "tslint": "^3.15.1",
-    "typedoc": "^0.4.5",
-    "typescript": "^2.0.3"
-  },
-  "engines": {
-    "node": ">=4.0.0"
+    "gulp-mocha": "^4.0.1",
+    "gulp-sourcemaps": "^2.4.1",
+    "gulp-tslint": "^7.1.0",
+    "gulp-typedoc": "^2.0.2",
+    "gulp-typescript": "^3.1.5",
+    "merge2": "^1.0.3",
+    "mocha": "^3.2.0",
+    "tslint": "^4.4.2",
+    "typedoc": "^0.5.7",
+    "typescript": "^2.1.6"
   }
 }

src/main.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Michael Kourlas
+ * Copyright (C) 2016-2017 Michael Kourlas
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import {XmlAttribute, XmlDocument, XmlElement} from "xmlcreate";
 import {IOptions, Options} from "./options";
 import {
     isArray,
@@ -26,7 +26,6 @@ import {
     isUndefined,
     stringify
 } from "./utils";
-import {XmlAttribute, XmlDocument, XmlElement} from "xmlcreate";
 
 /**
  * Parses a string into XML.
@@ -48,17 +47,21 @@ function parseString(str: string, parentElement: XmlAttribute | XmlElement,
                || options.cdataKeys.indexOf("*") !== -1;
     };
 
-    if (parentElement instanceof XmlElement && requiresCdata(str)) {
-        const cdataStrs = str.split("]]>");
-        for (let i = 0; i < cdataStrs.length; i++) {
-            if (requiresCdata(cdataStrs[i])) {
-                parentElement.cdata(cdataStrs[i]);
-            } else {
-                parentElement.text(cdataStrs[i]);
-            }
-            if (i < cdataStrs.length - 1) {
-                parentElement.text("]]>");
+    if (parentElement instanceof XmlElement) {
+        if (requiresCdata(str)) {
+            const cdataStrs = str.split("]]>");
+            for (let i = 0; i < cdataStrs.length; i++) {
+                if (requiresCdata(cdataStrs[i])) {
+                    parentElement.cdata(cdataStrs[i]);
+                } else {
+                    parentElement.charData(cdataStrs[i]);
+                }
+                if (i < cdataStrs.length - 1) {
+                    parentElement.charData("]]>");
+                }
             }
+        } else {
+            parentElement.charData(str);
         }
     } else {
         parentElement.text(str);
@@ -274,7 +277,7 @@ function parseToDocument(root: string, value: any,
     if (options.dtd.include) {
         document.dtd(options.dtd.name!, options.dtd.sysId, options.dtd.pubId);
     }
-    parseValue(root, value, <XmlElement> document.root(), options);
+    parseValue(root, value, document.root() as XmlElement, options);
     return document;
 }