Update and modernize

Update dependencies, modernize code. Also include small fixes from few PRs.

Author: StorytellerCZ

.gitignore

@@ -0,0 +1,2 @@
+
+.npm/.package-garbage-*/

.npm/package/npm-shrinkwrap.json

@@ -29,7 +29,7 @@ Picker.route('/post/:_id', function(params, req, res, next) {
 
 ## Filtering and Sub Routes
 
-This is an unique functionality of this router. See following example:
+This is a unique functionality of this router. See following example:
 
 Let's say we need to handle only `POST` requests. This is how you can do it with `Picker`.
 
@@ -53,9 +53,7 @@ You can create any amount of sub routes with this `filter` API. Same time, you c
 You can use existing `connect` and `express` middlewares without any issues.
 
 ~~~js
-// You can use the meteorhacks:npm package to load in the body-parser package
-// via NPM.
-var bodyParser = Meteor.npmRequire( 'body-parser');
+import bodyParser from 'body-parser';
 
 // Add two middleware calls. The first attempting to parse the request body as
 // JSON data and the second as URL encoded data.

README.md

@@ -1,8 +1,19 @@
-var pathToRegexp = Npm.require('path-to-regexp');
-var Fiber = Npm.require('fibers');
-var urlParse = Npm.require('url').parse;
+import { pathToRegexp } from 'path-to-regexp';
+// TODO replace fibers
+import Fiber from 'fibers';
 
-PickerImp = function(filterFunction) {
+function parseQuery(queryString) {
+  if (!queryString) return {}
+  let query = {};
+  const pairs = queryString.replace(/^\?/, '').split('&');
+  for (let i = 0; i < pairs.length; i++) {
+    const pair = pairs[i].split('=');
+    query[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || '');
+  }
+  return query;
+}
+
+export const PickerImp = function(filterFunction) {
   this.filterFunction = filterFunction;
   this.routes = [];
   this.subRouters = [];
@@ -14,50 +25,51 @@ PickerImp.prototype.middleware = function(callback) {
 };
 
 PickerImp.prototype.route = function(path, callback) {
-  var regExp = pathToRegexp(path);
+  const keys = [];
+  const regExp = pathToRegexp(path, keys);
   regExp.callback = callback;
+  regExp.keys = keys;
   this.routes.push(regExp);
   return this;
 };
 
 PickerImp.prototype.filter = function(callback) {
-  var subRouter = new PickerImp(callback);
+  const subRouter = new PickerImp(callback);
   this.subRouters.push(subRouter);
   return subRouter;
 };
 
 PickerImp.prototype._dispatch = function(req, res, bypass) {
-  var self = this;
-  var currentRoute = 0;
-  var currentSubRouter = 0;
-  var currentMiddleware = 0;
+  let currentRoute = 0;
+  let currentSubRouter = 0;
+  let currentMiddleware = 0;
 
   if(this.filterFunction) {
-    var result = this.filterFunction(req, res);
+    const result = this.filterFunction(req, res);
     if(!result) {
       return bypass();
     }
   }
 
-  processNextMiddleware();
-  function processNextMiddleware () {
-    var middleware = self.middlewares[currentMiddleware++];
+  const processNextMiddleware = () => {
+    const middleware = this.middlewares[currentMiddleware++];
     if(middleware) {
-      self._processMiddleware(middleware, req, res, processNextMiddleware);
+      this._processMiddleware(middleware, req, res, processNextMiddleware);
     } else {
       processNextRoute();
     }
   }
 
-  function processNextRoute () {
-    var route = self.routes[currentRoute++];
+  const processNextRoute = () => {
+    const route = this.routes[currentRoute++];
     if(route) {
-      var uri = req.url.replace(/\?.*/, '');
-      var m = uri.match(route);
+      const uri = req.url.replace(/\?.*/, '');
+      const m = uri.match(route);
       if(m) {
-        var params = self._buildParams(route.keys, m);
-        params.query = urlParse(req.url, true).query;
-        self._processRoute(route.callback, params, req, res, bypass);
+        const params = this._buildParams(route.keys, m);
+        params.query = parseQuery(req._parsedUrl?.query);
+        // See https://github.com/meteorhacks/picker/pull/39 for processNextRoute reason in the following method.
+        this._processRoute(route.callback, params, req, res, processNextRoute);
       } else {
         processNextRoute();
       }
@@ -66,22 +78,22 @@ PickerImp.prototype._dispatch = function(req, res, bypass) {
     } 
   }
 
-  function processNextSubRouter () {
-    var subRouter = self.subRouters[currentSubRouter++];
+  const processNextSubRouter = () => {
+    const subRouter = this.subRouters[currentSubRouter++];
     if(subRouter) {
       subRouter._dispatch(req, res, processNextSubRouter);
     } else {
       bypass();
     }
   }
+  processNextMiddleware();
 };
 
 PickerImp.prototype._buildParams = function(keys, m) {
-  var params = {};
-  for(var lc=1; lc<m.length; lc++) {
-    var key = keys[lc-1].name;
-    var value = m[lc];
-    params[key] = value;
+  const params = {};
+  for(let lc = 1; lc < m.length; lc++) {
+    const key = keys[lc-1]?.name;
+    params[key] = decodeURIComponent(m[lc]);
   }
 
   return params;

lib/implementation.js

@@ -1,4 +1,7 @@
-Picker = new PickerImp();
+import { WebApp } from 'meteor/webapp';
+import { PickerImp } from './implementation';
+
+export const Picker = new PickerImp();
 WebApp.rawConnectHandlers.use(function(req, res, next) {
   Picker._dispatch(req, res, next);
 });

lib/instance.js

@@ -1,35 +1,28 @@
 Package.describe({
-  name: 'meteorhacks:picker',
+  name: 'storyteller:picker',
   summary: 'Server Side Router for Meteor',
-  version: '1.0.4',
-  git: 'https://github.com/meteorhacks/picker.git'
+  version: '1.1.0',
+  git: 'https://github.com/storytellercz/picker.git',
+  documentation: 'README.md'
 });
 
 Npm.depends({
-  'path-to-regexp': '1.2.1'
+  'path-to-regexp': '6.1.0'
 });
 
 Package.onUse(function(api) {
   configurePackage(api);
-  api.export(['Picker']);
+  api.mainModule('lib/instance.js', 'server');
 });
 
 Package.onTest(function(api) {
   configurePackage(api);
-  api.use(['tinytest', 'http', 'random'], ['server']);
-  api.addFiles([
-    'test/instance.js'
-  ], ['server']);
+  api.use('storyteller:picker', 'server');
+  api.use(['tinytest', 'http', 'random'], 'server');
+  api.mainModule('test/instance.js', 'server');
 });
 
 function configurePackage(api) {
-  if(api.versionsFrom) {
-    api.versionsFrom('[email protected]');
-  }
-
-  api.use(['webapp', 'underscore'], ['server']);
-  api.addFiles([
-    'lib/implementation.js',
-    'lib/instance.js',
-  ], ['server']);
+  api.versionsFrom('1.3');
+  api.use(['webapp', 'ecmascript', 'url'], 'server');
 }

package.js

@@ -1,53 +1,63 @@
+import { Picker } from 'meteor/storyteller:picker';
+// TODO replace HTTP with fetch
+import { HTTP } from 'meteor/http';
+import { Random } from 'meteor/random';
+import { Meteor } from 'meteor/meteor';
+
+function getPath(path) {
+  return Meteor.absoluteUrl(path);
+}
+
 Tinytest.add('normal route', function(test) {
-  var path = "/" + Random.id();
-  Picker.route(path, function(params, req, res) {
+  const id = Random.id();
+  Picker.route(`/${id}`, function(params, req, res) {
     res.end("done");
   });
 
-  var res = HTTP.get(getPath(path));
+  const res = HTTP.get(getPath(id));
   test.equal(res.content, 'done');
 });
 
 Tinytest.add('with params', function(test) {
-  var id = Random.id();
-  var path = "/post/:id";
+  const id = Random.id();
+  const path = "/post/:id";
   Picker.route(path, function(params, req, res) {
     res.end(params.id);
   });
 
-  var res = HTTP.get(getPath("/post/" + id));
+  const res = HTTP.get(getPath(`post/${id}`));
   test.equal(res.content, id);
 });
 
 Tinytest.add('filter only POST', function(test) {
-  var path = "/" + Random.id();
-  var postRoutes = Picker.filter(function(req, res) {
-    return req.method == "POST";
+  const id = Random.id();
+  const postRoutes = Picker.filter(function(req, res) {
+    return req.method === "POST";
   });
 
-  postRoutes.route(path, function(params, req, res) {
+  postRoutes.route(`/${id}`, function(params, req, res) {
     res.end("done");
   });
 
-  var res = HTTP.get(getPath(path));
-  test.isFalse(res.content == "done");
+  const res1 = HTTP.get(getPath(`/${id}`));
+  test.isFalse(res1.content === "done");
 
-  var res = HTTP.post(getPath(path));
-  test.isTrue(res.content == "done");
+  const res2 = HTTP.post(getPath(`/${id}`));
+  test.isTrue(res2.content === "done");
 });
 
 Tinytest.add('query strings', function(test) {
-  var path = "/" + Random.id();
-  Picker.route(path, function(params, req, res) {
+  const id = Random.id();
+  Picker.route(`/${id}`, function(params, req, res) {
     res.end("" + params.query.aa);
   });
 
-  var res = HTTP.get(getPath(path + "?aa=10"));
+  const res = HTTP.get(getPath(`/${id}?aa=10&bb=10`));
   test.equal(res.content, "10");
 });
 
 Tinytest.add('middlewares', function(test) {
-  var path = "/" + Random.id();
+  const id = Random.id();
 
   Picker.middleware(function(req, res, next) {
     setTimeout(function() {
@@ -56,19 +66,19 @@ Tinytest.add('middlewares', function(test) {
     }, 100);
   });
 
-  Picker.route(path, function(params, req, res) {
+  Picker.route(`/${id}`, function(params, req, res) {
     res.end(req.middlewarePass);
   });
 
-  var res = HTTP.get(getPath(path + "?aa=10"));
+  const res = HTTP.get(getPath(`/${id}?aa=10`));
   test.equal(res.content, "ok");
 });
 
 Tinytest.add('middlewares - with filtered routes', function(test) {
-  var path = "/" + Random.id() + "/coola";
+  const path = `${Random.id()}/coola`;
 
-  var routes = Picker.filter(function(req, res) {
-    var matched = /coola/.test(req.url);
+  const routes = Picker.filter(function(req, res) {
+    const matched = /coola/.test(req.url);
     return matched;
   });
 
@@ -79,15 +89,45 @@ Tinytest.add('middlewares - with filtered routes', function(test) {
     }, 100);
   });
 
-  routes.route(path, function(params, req, res) {
+  routes.route(`/${path}`, function(params, req, res) {
     res.end(req.middlewarePass);
   });
 
-  var res = HTTP.get(getPath(path));
+  const res = HTTP.get(getPath(path));
   test.equal(res.content, "ok");
 });
 
-var urlResolve = Npm.require('url').resolve;
-function getPath(path) {
-  return urlResolve(process.env.ROOT_URL, path);
-}
+/*
+Tinytest.add('middlewares - with several filtered routes', function(test) {
+  const path1 = `${Random.id()}/coola`;
+  const path2 = `${Random.id()}/coola`;
+
+  const routes1 = Picker.filter();
+  const routes2 = Picker.filter();
+
+  const increaseResultBy = (i) => (req, res, next) => {
+    setTimeout(function() {
+      req.result = req.result || 0;
+      req.result += i;
+      next();
+    }, 100);
+  };
+
+  routes1.middleware(increaseResultBy(1));
+  routes2.middleware(increaseResultBy(2));
+
+  Picker.middleware(increaseResultBy(10));
+
+  routes1.route(`/${path1}`, function(params, req, res) {
+    res.end(req.result+'');
+  });
+  routes2.route(`/${path2}`, function(params, req, res) {
+    res.end(req.result+'');
+  });
+
+  const res1 = HTTP.get(getPath(path1));
+  test.equal(res1.content, "11");
+
+  const res2 = HTTP.get(getPath(path2));
+  test.equal(res2.content, "12");
+});*/