noflo 1.4.3 → 1.5.1

package/package.json

@@ -8,7 +8,7 @@
     "noflo"
   ],
   "author": "Henri Bergius <henri.bergius@iki.fi>",
-  "version": "1.4.3",
+  "version": "1.5.1",
   "license": "MIT",
   "engines": {
     "node": ">= 6"
@@ -17,7 +17,7 @@
     "debug": "^4.0.1",
     "fbp": "^1.5.0",
     "fbp-graph": "^0.7.0",
-    "fbp-manifest": "^0.2.7",
+    "fbp-manifest": "^0.3.1",
     "get-function-params": "^2.0.6"
   },
   "devDependencies": {
@@ -25,29 +25,34 @@
     "@types/node": "^14.14.2",
     "chai": "^4.0.0",
     "coffeescript": "^2.2.1",
-    "coveralls": "^3.0.0",
-    "eslint": "^7.7.0",
-    "eslint-config-airbnb-base": "^14.2.0",
+    "coveralls": "^2.7.1",
+    "eslint": "^8.2.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.22.0",
     "events": "^3.2.0",
     "flowtrace": "^0.1.8",
-    "karma": "^5.1.1",
+    "karma": "^6.0.0",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
     "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
     "mocha": "^8.1.3",
     "noflo-component-loader": "^0.4.0",
-    "nyc": "^15.1.0",
+    "nyc": "^14.1.1",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
-    "replace": "^1.2.0",
+    "replace": "^0.2.2",
     "typescript": "^4.0.2",
     "util": "^0.12.3",
     "webpack": "^5.0.0",
     "webpack-cli": "^4.0.0"
   },
-  "main": "./lib/NoFlo",
+  "main": "./src/lib/NoFlo",
+  "module": "./src/lib/NoFlo.js",
+  "exports": {
+    "import": "./src/lib/NoFlo.js",
+    "require": "./lib/NoFlo.js"
+  },
   "types": "./lib/NoFlo.d.ts",
   "bin": {
     "noflo": "./bin/noflo",
@@ -60,14 +65,18 @@
   },
   "scripts": {
     "lint": "eslint .",
+    "prebuild:node": "replace 'import.meta.dirname' '__dirname' src/lib/loader/NodeJs.js && replace 'import getParams from' 'import * as getParams from' src/lib/AsComponent.js",
     "build:node": "tsc",
-    "build:browser": "webpack",
+    "postbuild:node": "replace '__dirname' 'import.meta.dirname' src/lib/loader/NodeJs.js && replace 'import \\* as getParams from' 'import getParams from' src/lib/AsComponent.js",
+    "build:browser": "webpack --config webpack.config.cjs",
     "build": "npm run build:node && npm run build:browser",
     "postbuild": "replace 'node/events' 'events' lib -r",
     "pretest": "npm run lint && npm run build",
-    "test:node": "nyc mocha --require spec/utils/inject.js spec",
-    "test:browser": "karma start karma.config.js",
-    "test": "npm run test:node && npm run test:browser"
+    "test:esmodules": "node --test spec/*.mjs",
+    "test:commonjs": "node --test spec/*.cjs",
+    "test:node": "nyc mocha --require spec/utils/inject.js spec/*.js",
+    "test:browser": "karma start karma.config.cjs",
+    "test": "npm run test:esmodules && npm run test:commonjs && npm run test:node && npm run test:browser"
   },
   "docco_husky": {
     "output_dir": "docs",
@@ -75,9 +84,9 @@
   },
   "nyc": {
     "include": [
-      "components/*.js",
-      "lib/*.js",
-      "lib/**/*.js"
+      "src/components/*.js",
+      "src/lib/*.js",
+      "src/lib/**/*.js"
     ]
   }
 }

package/spec/.eslintrc

@@ -7,6 +7,7 @@
         "global-require": 0,
         "import/no-extraneous-dependencies": 0,
         "import/no-unresolved": 0,
+        "import/extensions": 0,
         "no-console": 0,
         "no-param-reassign": 0,
         "no-plusplus": 0,
@@ -15,6 +16,8 @@
         "no-shadow": 0,
         "no-undef": 0,
         "no-unused-expressions": 0,
-        "prefer-destructuring": 0
+        "prefer-destructuring": 0,
+        "function-paren-newline": 0,
+        "function-call-argument-newline": 0
     }
-}
+}

package/spec/AsCallback.js

@@ -70,20 +70,16 @@ describe('asCallback interface', () => {
     return c;
   };
 
-  before((done) => {
+  before(() => {
     loader = new noflo.ComponentLoader(baseDir);
-    loader.listComponents((err) => {
-      if (err) {
-        done(err);
-        return;
-      }
-      loader.registerComponent('process', 'Async', processAsync);
-      loader.registerComponent('process', 'Error', processError);
-      loader.registerComponent('process', 'Values', processValues);
-      loader.registerComponent('process', 'NeverSend', neverSend);
-      loader.registerComponent('process', 'Streamify', streamify);
-      done();
-    });
+    return loader.listComponents()
+      .then(() => {
+        loader.registerComponent('process', 'Async', processAsync);
+        loader.registerComponent('process', 'Error', processError);
+        loader.registerComponent('process', 'Values', processValues);
+        loader.registerComponent('process', 'NeverSend', neverSend);
+        loader.registerComponent('process', 'Streamify', streamify);
+      });
   });
   describe('with a non-existing component', () => {
     let wrapped = null;

package/spec/AsComponent.js

@@ -202,8 +202,11 @@ describe('asComponent interface', () => {
       before(function () {
         if (isBrowser && (typeof window.Promise === 'undefined')) { return this.skip(); }
       });
-      const func = (hello) => new Promise((resolve) => setTimeout(() => resolve(`Hello ${hello}`),
-        5));
+      const func = (hello) => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(`Hello ${hello}`);
+        }, 5);
+      });
       it('should be possible to componentize', (done) => {
         const component = () => noflo.asComponent(func);
         loader.registerComponent('ascomponent', 'promise-one', component, done);
@@ -227,8 +230,11 @@ describe('asComponent interface', () => {
           this.skip();
         }
       });
-      const func = (hello) => new Promise((resolve, reject) => setTimeout(() => reject(new Error(`Hello ${hello}`)),
-        5));
+      const func = (hello) => new Promise((resolve, reject) => {
+        setTimeout(() => {
+          reject(new Error(`Hello ${hello}`));
+        }, 5);
+      });
       it('should be possible to componentize', (done) => {
         const component = () => noflo.asComponent(func);
         loader.registerComponent('ascomponent', 'sync-throw', component, done);

package/spec/AsPromise.js

@@ -317,6 +317,44 @@ describe('asPromise interface', () => {
 INPORT=Async.IN:IN
 OUTPORT=Stream.OUT:OUT
 Async(process/Async) OUT -> IN Stream(process/Streamify)\
+`, (err, g) => {
+        if (err) {
+          done(err);
+          return;
+        }
+        graph = g;
+        wrapped = noflo.asPromise(graph, {
+          loader,
+          asyncDelivery: true,
+        });
+        done();
+      });
+    });
+    it('should execute network with input map and provide output map with streams as arrays', () => wrapped({
+      in: 'hello world',
+    })
+      .then((out) => {
+        chai.expect(out.out).to.eql([
+          ['h', 'e', 'l', 'l', 'o'],
+          ['w', 'o', 'r', 'l', 'd'],
+        ]);
+      }));
+    it('should execute network with simple input and and provide simple output with streams as arrays', () => wrapped('hello there')
+      .then((out) => {
+        chai.expect(out).to.eql([
+          ['h', 'e', 'l', 'l', 'o'],
+          ['t', 'h', 'e', 'r', 'e'],
+        ]);
+      }));
+  });
+  describe('with a graph instead of component name (synchronous)', () => {
+    let graph = null;
+    let wrapped = null;
+    before((done) => {
+      noflo.graph.loadFBP(`\
+INPORT=Async.IN:IN
+OUTPORT=Stream.OUT:OUT
+Async(process/Async) OUT -> IN Stream(process/Streamify)\
 `, (err, g) => {
         if (err) {
           done(err);

package/spec/CommonJS.cjs

@@ -0,0 +1,10 @@
+const { describe, it } = require('node:test');
+const assert = require('node:assert/strict');
+const noflo = require('../lib/NoFlo.js');
+
+describe('NoFlo loaded as CommonJS module', () => {
+  it('should be runnable', () => {
+    assert.equal(typeof noflo, 'object');
+    assert.equal(typeof noflo.Component, 'function');
+  });
+});

package/spec/ComponentLoader.js

@@ -286,7 +286,7 @@ describe('ComponentLoader with no external packages installed', () => {
       if (noflo.isBrowser()) {
         str = 'Dynamic loading of';
       } else {
-        str = 'Cannot find module';
+        str = 'Cannot find package';
       }
       loader.load('InvalidComponent', (err) => {
         chai.expect(err).to.be.an('error');
@@ -378,8 +378,14 @@ describe('ComponentLoader with no external packages installed', () => {
         }
         chai.expect(component).to.be.an('object');
         chai.expect(component.code).to.be.a('string');
-        chai.expect(component.code.indexOf('noflo.Component')).to.not.equal(-1);
-        chai.expect(component.code.indexOf('exports.getComponent')).to.not.equal(-1);
+        chai.expect(component.code.indexOf('Component')).to.not.equal(-1);
+
+        if (!noflo.isBrowser()) {
+          chai.expect(component.code.indexOf('export function getComponent')).to.not.equal(-1);
+        } else {
+          chai.expect(component.code.indexOf('exports.getComponent')).to.not.equal(-1);
+        }
+
         chai.expect(component.name).to.equal('Graph');
         chai.expect(component.library).to.equal('');
         chai.expect(component.language).to.equal(shippingLanguage);
@@ -444,8 +450,12 @@ describe('ComponentLoader with no external packages installed', () => {
         }
         chai.expect(component).to.be.an('object');
         chai.expect(component.code).to.be.a('string');
-        chai.expect(component.code.indexOf('noflo.Component')).to.not.equal(-1);
-        chai.expect(component.code.indexOf('exports.getComponent')).to.not.equal(-1);
+        chai.expect(component.code.indexOf('Component')).to.not.equal(-1);
+        if (!noflo.isBrowser()) {
+          chai.expect(component.code.indexOf('export function getComponent')).to.not.equal(-1);
+        } else {
+          chai.expect(component.code.indexOf('exports.getComponent')).to.not.equal(-1);
+        }
         chai.expect(component.name).to.equal('Graph');
         chai.expect(component.library).to.equal('');
         chai.expect(component.language).to.equal(shippingLanguage);
@@ -975,9 +985,11 @@ describe('ComponentLoader with a fixture project and caching', () => {
   it('should be possible to pre-heat the cache file', function (done) {
     this.timeout(8000);
     const { exec } = require('child_process');
-    exec(`node ${path.resolve(__dirname, '../bin/noflo-cache-preheat')}`,
+    exec(
+      `node ${path.resolve(__dirname, '../bin/noflo-cache-preheat')}`,
       { cwd: fixtureRoot },
-      done);
+      done,
+    );
   });
   it('should have populated a fbp-manifest file', (done) => {
     const manifestPath = path.resolve(fixtureRoot, 'fbp.json');

package/spec/ESModule.mjs

@@ -0,0 +1,11 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import * as noflo from '../src/lib/NoFlo.js';
+
+describe('NoFlo loaded as ES module', () => {
+  it('should be runnable', () => {
+    assert.equal(typeof noflo, 'object');
+    assert.equal(typeof noflo.Component, 'function');
+  });
+});
+

package/spec/Network.js

@@ -41,17 +41,18 @@ describe('NoFlo Network', () => {
   describe('with an empty graph', () => {
     let g = null;
     let n = null;
-    before((done) => {
+    before(() => {
       g = new noflo.Graph();
-      noflo.createNetwork(g, {
+      return noflo.createNetwork(g, {
         subscribeGraph: false,
+        asyncDelivery: true,
         delay: true,
         baseDir,
       })
         .then((network) => {
           n = network;
-          n.connect(done);
-        }, done);
+          return n.connect();
+        });
     });
     it('should initially be marked as stopped', () => {
       chai.expect(n.isStarted()).to.equal(false);
@@ -91,16 +92,14 @@ describe('NoFlo Network', () => {
       chai.expect(n.uptime()).to.be.at.least(0);
     });
     describe('with new node', () => {
-      it('should contain the node', (done) => {
-        n.addNode({
+      it('should contain the node', () => n
+        .addNode({
           id: 'Graph',
           component: 'Graph',
           metadata: {
             foo: 'Bar',
           },
-        },
-        done);
-      });
+        }));
       it('should have registered the node with the graph', () => {
         const node = g.getNode('Graph');
         chai.expect(node).to.be.an('object');
@@ -223,6 +222,7 @@ describe('NoFlo Network', () => {
       g.addInitial('Foo', 'Merge', 'in');
       return noflo.createNetwork(g, {
         subscribeGraph: false,
+        asyncDelivery: true,
         delay: true,
         baseDir,
       })
@@ -377,6 +377,7 @@ describe('NoFlo Network', () => {
             );
             return noflo.createNetwork(graph, {
               subscribeGraph: false,
+              asyncDelivery: true,
               delay: false,
               componentLoader: n.loader,
             });
@@ -428,6 +429,7 @@ describe('NoFlo Network', () => {
       };
       noflo.createNetwork(g, {
         subscribeGraph: false,
+        asyncDelivery: true,
         delay: true,
         baseDir,
       })
@@ -450,6 +452,7 @@ describe('NoFlo Network', () => {
       g.addInitial('from-edge', 'Merge', 'in');
       noflo.createNetwork(g, {
         subscribeGraph: false,
+        asyncDelivery: true,
         delay: true,
         baseDir,
       })
@@ -471,6 +474,7 @@ describe('NoFlo Network', () => {
       g.addInitial('from-IIP', 'Def', 'in');
       noflo.createNetwork(g, {
         subscribeGraph: false,
+        asyncDelivery: true,
         delay: true,
         baseDir,
       })
@@ -505,6 +509,7 @@ describe('NoFlo Network', () => {
         noflo.createNetwork(g, {
           delay: true,
           subscribeGraph: false,
+          asyncDelivery: true,
           baseDir,
         })
           .then((nw) => {
@@ -583,6 +588,11 @@ describe('NoFlo Network', () => {
   });
   describe('with a very large network', () => {
     it('should be able to connect without errors', function (done) {
+      if (noflo.isBrowser()) {
+        // Async mode is too much for Puppeteer here
+        this.skip();
+        return;
+      }
       let n;
       this.timeout(100000);
       const g = new noflo.Graph();
@@ -596,8 +606,7 @@ describe('NoFlo Network', () => {
       }
       g.addInitial(() => {
         called++;
-      },
-      'Callback', 'callback');
+      }, 'Callback', 'callback');
       for (n = 0; n <= 10000; n++) {
         g.addInitial(n, `Repeat${n}`, 'in');
       }
@@ -605,6 +614,7 @@ describe('NoFlo Network', () => {
       noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         baseDir,
       })
         .then((nw) => {
@@ -637,6 +647,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         componentLoader: loader,
       })
         .then((nw) => nw.connect()
@@ -656,6 +667,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         componentLoader: loader,
       })
         .then((nw) => nw.connect()
@@ -675,6 +687,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         componentLoader: loader,
       })
         .then((nw) => nw.connect()
@@ -695,6 +708,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         componentLoader: loader,
       })
         .then((nw) => nw.connect()
@@ -715,6 +729,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         componentLoader: loader,
       })
         .then((nw) => nw.connect()
@@ -732,6 +747,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         componentLoader: loader,
       })
         .then((nw) => nw.connect())
@@ -759,6 +775,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         componentLoader: loader,
       })
         .then((nw) => nw.connect())
@@ -788,6 +805,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
       })
         .then((nw) => {
           chai.expect(nw.baseDir).to.equal(baseDir);
@@ -802,6 +820,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
       })
         .then((nw) => {
           chai.expect(nw.baseDir).to.equal(process.cwd());
@@ -812,6 +831,7 @@ describe('NoFlo Network', () => {
       return noflo.createNetwork(g, {
         delay: true,
         subscribeGraph: false,
+        asyncDelivery: true,
         baseDir,
       })
         .then((nw) => {
@@ -827,6 +847,7 @@ describe('NoFlo Network', () => {
       g = new noflo.Graph();
       return noflo.createNetwork(g, {
         subscribeGraph: false,
+        asyncDelivery: true,
         delay: true,
         baseDir,
       })