merge

Author: shyosef

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

gulpfile.js

@@ -7,6 +7,7 @@ var del = require('del'),
     typedoc = require("gulp-typedoc"),
     uglify = require('gulp-uglify'),
     karma = require('karma'),
+    watch = require('gulp-watch'),
     webpack = require('webpack'),
     webpackStream = require('webpack-stream'),
     webpackConfig = require('./webpack.config'),
@@ -18,8 +19,10 @@ var del = require('del'),
 help(gulp, undefined);
 
 var package = require('./package.json');
-var webpackBanner = package.name + " v" + package.version + " | (c) 2016 Microsoft Corporation " + package.license;
-var gulpBanner = "/*! " + webpackBanner + " */\n";
+var webpackBanner = "// " + package.name + " v" + package.version + "\n"
+    + "// Copyright (c) Microsoft Corporation.\n"
+    + "// Licensed under the MIT License.";
+var banner = webpackBanner + "\n";
 
 gulp.task('build', 'Build for release', function (done) {
     return runSequence(
@@ -63,7 +66,10 @@ gulp.task("docs", 'Compile documentation from src code', function () {
 
 gulp.task('compile:ts', 'Compile source files', function () {
     webpackConfig.plugins = [
-        new webpack.BannerPlugin(webpackBanner)
+        new webpack.BannerPlugin({
+            banner: webpackBanner,
+            raw: true
+        })
     ];
 
     return gulp.src(['./src/**/*.ts'])
@@ -73,15 +79,14 @@ gulp.task('compile:ts', 'Compile source files', function () {
 
 gulp.task('header', 'Add header to distributed files', function () {
     return gulp.src(['./dist/*.d.ts'])
-        .pipe(header(gulpBanner))
+        .pipe(header(banner))
         .pipe(gulp.dest('./dist'));
 });
 
 gulp.task('min', 'Minify build files', function () {
     return gulp.src(['!./dist/*.min.js', './dist/models.js'])
-        .pipe(uglify({
-            preserveComments: 'license'
-        }))
+        .pipe(uglify())
+        .pipe(header(banner))
         .pipe(rename({
             suffix: '.min'
         }))
@@ -117,7 +122,26 @@ gulp.task('test:js', 'Run spec tests', function (done) {
         configFile: __dirname + '/karma.conf.js',
         singleRun: argv.debug ? false : true,
         captureTimeout: argv.timeout || 60000
-    }, done).start();
+    }, function () {
+        done();
+    })
+    .on('browser_register', (browser) => {
+        if (argv.chrome) {
+            browser.socket.on('disconnect', function (reason) {
+                if (reason === "transport close" || reason === "transport error") {
+                    done(0);
+                    process.exit(0);
+                }
+            });
+       }
+    })
+    .start();
+
+    if (argv.chrome) {
+        return watch(["src/**/*.ts", "test/**/*.ts"], function () {
+            runSequence( 'tslint:test', 'clean:tmp', 'compile:spec');
+        });
+    }
 });
 
 gulp.task('tslint:build', 'Run TSLint on src', function () {

karma.conf.js

@@ -1,29 +1,45 @@
 var argv = require('yargs').argv;
-
+const flags = [
+    '--disable-extensions',
+    '--no-proxy-server',
+    '--js-flags="--max_old_space_size=6500"',
+    '--high-dpi-support=1'
+];
 module.exports = function (config) {
     config.set({
         frameworks: ['jasmine'],
         files: [
             './tmp/**/*.js'
         ],
         exclude: [],
-        reporters: argv.debug ? ['spec'] : ['spec', 'coverage'],
+        reporters: argv.debug ? ['spec', 'kjhtml'] : ['spec', 'coverage', 'kjhtml'],
         autoWatch: true,
-        browsers: [argv.chrome ? 'Chrome' : 'PhantomJS'],
+        browsers: [argv.chrome ? 'Chrome_headless' : 'PhantomJS'],
         plugins: [
             'karma-chrome-launcher',
             'karma-jasmine',
             'karma-spec-reporter',
             'karma-phantomjs-launcher',
-            'karma-coverage'
+            'karma-coverage',
+            'karma-jasmine-html-reporter'
         ],
+        customLaunchers: {
+            'Chrome_headless': {
+                base: 'Chrome',
+                flags: flags.concat("--no-sandbox", "--window-size=800,800"),
+            },
+        },
         preprocessors: { './tmp/**/*.js': ['coverage'] },
         coverageReporter: {
             reporters: [
                 { type: 'html' },
                 { type: 'text-summary' }
             ]
         },
-        logLevel: argv.debug ? config.LOG_DEBUG : config.LOG_INFO
+        retryLimit: 0,
+        logLevel: argv.debug ? config.LOG_DEBUG : config.LOG_INFO,
+        client: {
+            clearContext: false, // leave Jasmine Spec Runner output visible in browser
+        }
     });
 };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "powerbi-models",
-    "version": "1.8.0",
+    "version": "1.9.1",
     "description": "Contains JavaScript & TypeScript object models for Microsoft Power BI JavaScript SDK. For each model there is a TypeScript interface, and a validation function to ensure and object is valid.",
     "main": "dist/models.js",
     "typings": "dist/models.d.ts",
@@ -10,7 +10,8 @@
     "scripts": {
         "build": "gulp build",
         "test": "gulp test",
-        "gulp": "gulp"
+        "gulp": "gulp",
+        "tests": "npm test -- --chrome --watch --debug"
     },
     "files": [
         "dist"
@@ -39,13 +40,15 @@
         "gulp-tslint": "^7.1.0",
         "gulp-typedoc": "^2.0.0",
         "gulp-uglify": "^1.5.4",
+        "gulp-watch": "^5.0.1",
         "gulp4-run-sequence": "^1.0.0",
         "jasmine-core": "^2.4.1",
         "json-loader": "^0.5.4",
         "karma": "^4.4.1",
         "karma-chrome-launcher": "^3.1.0",
         "karma-coverage": "^2.0.1",
         "karma-jasmine": "^2.0.1",
+        "karma-jasmine-html-reporter": "^1.5.4",
         "karma-phantomjs-launcher": "^1.0.4",
         "karma-spec-reporter": "0.0.32",
         "phantomjs-prebuilt": "^2.1.7",