Rollup error (#44)

* Fixed rollup error (Async functions producing an error "ReferenceError: regeneratorRuntime is not defined")

* fixed tests

* Replaced gulp-uglify with uglify-es

* fixed 'parse is undefined' issue

* Added empty wdl string check

gulpfile.babel.js

@@ -13,7 +13,6 @@ import istanbul from 'gulp-babel-istanbul';
 import coveralls from 'gulp-coveralls';
 import jsdoc from 'gulp-jsdoc3';
 import sourcemaps from 'gulp-sourcemaps';
-import uglify from 'gulp-uglify';
 import rename from 'gulp-rename';
 import sass from 'gulp-sass';
 import sassModuleImporter from 'sass-module-importer'; // eslint-disable-line import/no-unresolved, import/extensions
@@ -28,9 +27,14 @@ import yargs from 'yargs';
 import ftp from 'vinyl-ftp';
 import url from 'url';
 
+import uglifyes from 'uglify-es';
+import composer from 'gulp-uglify/composer';
+
 import webpackConfig from './webpack.config';
 import rollupConfig from './rollup.config';
 
+const uglify = composer(uglifyes, console);
+
 const packageJson = require('./package.json');
 
 gulp.task('default', done =>

package.json

@@ -41,9 +41,7 @@
     "graph"
   ],
   "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
+    "last 2 Chrome versions"
   ],
   "devDependencies": {
     "babel-core": "^6.23.1",
@@ -97,11 +95,12 @@
     "vinyl-ftp": "^0.6.0",
     "webpack": "^2.2.1",
     "webpack-dev-server": "^2.4.1",
-    "yargs": "^6.6.0"
+    "yargs": "^6.6.0",
+    "uglify-es": "^3.3.7"
   },
   "dependencies": {
     "jszip": "^3.1.4",
-    "lodash": "^4.17.4"
+    "lodash": "^3.10.1"
   },
   "directories": {
     "doc": "docs",

rollup.config.js

@@ -29,8 +29,14 @@ export default {
     }),
     rollupPluginBabel({
       babelrc: false,
-      runtimeHelpers: true,
-      presets: [['env', { modules: false }]],
+      runtimeHelpers: false,
+      presets: [['env', {
+        modules: false,
+        targets: {
+          browsers: ['last 2 chrome versions'],
+        },
+      }]],
+      exclude: './node_modules/**',
       plugins: ['external-helpers'],
     }),
     rollupPluginReplace({

src/app.js

@@ -37,7 +37,7 @@ async function initialize() {
   const flow3 = await example3.createFlow();
 
   // compare results
-  const equal = _.isEqualWith(flow1, flow3, ignoreFunctions);
+  const equal = _.isEqual(flow1, flow3, ignoreFunctions);
   const comparison = equal ? 'the same' : '<span style="color:red">different</span>';
   const infoDiv = document.getElementById('info');
   if (infoDiv) {

src/model/Step.js

@@ -95,13 +95,13 @@ export default class Step {
    * Create a workflow step. You should {@link Workflow#add add} it to a workflow or a compound step.
    *
    * @param {string} name - Step name. Must be unique in a parent step (e.g. {@link Workflow}).
-   * @param {Action=} action - Action to execute during the step. If no action is specified it will
+   * @param {Action=} [action={}] action - Action to execute during the step. If no action is specified it will
    * automatically be created based on the configuration. Multiple steps may share a single action.
    * @param {object} [config={}] - Action configuration containing input bindings.
    * It should include action description in case the action is missing.
    *
    */
-  constructor(name, action, config = {}) {
+  constructor(name, action = {}, config = {}) {
     if (_.isUndefined(name)) {
       throw new Error('Step must have a name');
     }

src/parser/WDL/parse.js

@@ -424,7 +424,7 @@ async function importParsingStage(ast, opts) {
   return result;
 }
 
-export default async function parse(data, opts = {}) {
+async function parse(data, opts = {}) {
   let result = {
     status: true,
     message: '',
@@ -468,3 +468,5 @@ export default async function parse(data, opts = {}) {
 
   return result.status ? Promise.resolve(result) : Promise.reject(result.message);
 }
+
+export default parse;

src/parser/parse.js

@@ -17,18 +17,25 @@ import parseWDL from './WDL/parse';
  * @memberOf module:pipeline
  * @param {string} text - Text file contents to parse.
  * @param {object} [opts={}] - Parser options.
- * @param {string} [opts.format='wdl'] - Workflow definition format ('wdl', 'cwl').
+ * @param {string} [opts.format='wdl'] - Workflow definition format ('wdl').
+ * @param {file} [opts.zipFile=null] - Zip with import WDL files
+ * @param {array} [opts.subWfDetailing=null] - Array of Sub Workflow names that should be detailed; if array includes '*' each Sub Workflow will be detailed.
+ * @param {number} [opts.recursionDepth=0] - Integer that describes Sub Workflow detailing depth
+ * @param {string} [opts.baseURI=null] - Base URI for WDL import statements
  * @returns {Promise} Parsing result object
  */
 function parse(text, opts = {}) {
+  if (!text) {
+    return Promise.reject('No data to parse');
+  }
   const format = opts.format || 'wdl';
   const subWfDetailing = (opts.subWfDetailing && _.isArray(opts.subWfDetailing)) ? opts.subWfDetailing : null;
   const recursionDepth = opts.recursionDepth || 0;
   const baseURI = opts.baseURI || null;
-
+  const zipFile = opts.zipFile || null;
   if (format === 'wdl') {
-    if (opts.zipFile) {
-      return JSZip.loadAsync(opts.zipFile).then((files) => {
+    if (zipFile) {
+      return JSZip.loadAsync(zipFile).then((files) => {
         const zipWdlFiles = [];
 
         files.forEach((relativePath, zipEntry) => {

src/visual/VisualStep.js

@@ -98,7 +98,8 @@ export default class VisualStep extends joint.shapes.devs.Model {
 
   _updatePortsState(portsOn, ports) {
     const defaultOnValue = this.attributes.portsEnabled;
-    portsOn = _.omitBy(portsOn, (val, name) => _.isUndefined(ports[name]));
+    const omitBy = _.omitBy || _.omit; // be prepared for legacy lodash 3.10.1
+    portsOn = omitBy(portsOn, (val, name) => _.isUndefined(ports[name]));
     _.forEach(ports, (port, name) => {
       if (_.isUndefined(portsOn[name])) {
         portsOn[name] = defaultOnValue;

webpack.config.js

@@ -8,7 +8,7 @@ const version = require('./version');
 module.exports = {
   devtool: 'inline-source-map',
   entry: {
-    demo: './src/app.js',
+    demo: ['./src/app.js'],
   },
   output: {
     publicPath: '/',
@@ -22,7 +22,16 @@ module.exports = {
       use: [{
         loader: 'babel-loader',
         options: {
-          presets: [['env', { modules: false }]],
+          presets: [['env',
+            {
+              targets: {
+                browsers: [
+                  'last 2 chrome versions',
+                ],
+              },
+              modules: false,
+            },
+          ]],
         },
       }],
     },