Merge branch 'master' into release

.gitignore

@@ -6,5 +6,5 @@ lib/*
 src/Grammar/dist/*
 src/**/*.js
 test/spec/*.spec.js
-test/spec/Core/*.js
+test/spec/core/*.js
 test/support/**/*.js

build/grammarGenerator.js

@@ -4,10 +4,10 @@ const fs = require("fs"),
     pegjs = require("pegjs"),
     tspegjs = require("ts-pegjs");
 
-const thisFolder = "./src/Grammar",
-    inputFile = thisFolder + "/src/Grammar.pegjs",
+const thisFolder = "./src/grammar",
+    inputFile = thisFolder + "/src/grammar.pegjs",
     outputFolder = thisFolder + "/dist",
-    outputFile = outputFolder + "/Grammar.ts";
+    outputFile = outputFolder + "/grammar.ts";
 
 const grammarContents = fs.readFileSync(inputFile, "utf8");
 
@@ -49,11 +49,11 @@ const parser = pegjs.generate(grammarContents, {
     "Referred_By"
   ],
   output: "source",
-  // optimize: "size",
+  optimize: "size",
   plugins: [tspegjs],
   "tspegjs": {
     "tslintIgnores": "interface-name, trailing-comma, object-literal-sort-keys, max-line-length, only-arrow-functions, one-variable-per-declaration, no-consecutive-blank-lines, align, radix, quotemark, semicolon, object-literal-shorthand, variable-name, no-var-keyword, whitespace, curly, prefer-const, object-literal-key-quotes, no-string-literal, one-line, no-unused-expression, space-before-function-paren, arrow-return-shorthand",
-    "customHeader": "import { NameAddrHeader } from \"../../NameAddrHeader\";\nimport { URI } from \"../../URI\";"
+    "customHeader": "import { NameAddrHeader } from \"../../core/messages/name-addr-header\";\nimport { URI } from \"../../core/messages/uri\";"
   },
   "returnTypes": {
     Contact: "URI | NameAddrHeader",

karma.conf.js

@@ -24,8 +24,7 @@ module.exports = function(config) {
       'test/spec/Web/SessionDescriptionHandler.spec.js': 'webpack',
       'test/spec/Web/Modifiers.spec.js': 'webpack',
       'test/spec/*.spec.js': ['webpack', 'sourcemap'],
-      'test/spec/Contexts/*.js': ['webpack', 'sourcemap'],
-      'test/spec/Core/*.js': ['webpack', 'sourcemap']
+      'test/spec/core/*.js': ['webpack', 'sourcemap']
     },
 
     webpack: {