Share a module between node & browser for perspective library

finos · texodus · Nov 7, 2018 · Oct 26, 2018 · Oct 29, 2018 · Nov 2, 2018
commit 4b425383603e919474fb1d27e196e0e58aef292c
diff --git a/docs/usage.md b/docs/usage.md
@@ -135,7 +135,7 @@ Hence, there is no `worker()` method, and the module object itself directly
 exports the full `perspective` API.
 
 ```javascript
-const perspective = require("@jpmorganchase/perspective/build/perspective.node.js");
+const perspective = require("@jpmorganchase/perspective");
 ```
 
 ### Loading data with `table()`

diff --git a/examples/git_history/server.js b/examples/git_history/server.js
@@ -7,7 +7,7 @@
  *
  */
 
-const {WebSocketHost} = require("@jpmorganchase/perspective/build/perspective.node.js");
+const {WebSocketHost} = require("@jpmorganchase/perspective");
 const exec = require("child_process").exec;
 
 function execute(command, callback) {

diff --git a/examples/simple/server.js b/examples/simple/server.js
@@ -7,5 +7,5 @@
  *
  */
 
-const {WebSocketHost} = require("@jpmorganchase/perspective/build/perspective.node.js");
+const {WebSocketHost} = require("@jpmorganchase/perspective");
 new WebSocketHost({assets: [__dirname]});
diff --git a/packages/perspective-viewer/src/js/view.js b/packages/perspective-viewer/src/js/view.js
@@ -13,7 +13,7 @@ import "@webcomponents/shadycss/custom-style-interface.min.js";
 import _ from "underscore";
 import {polyfill} from "mobile-drag-drop";
 
-import perspective from "@jpmorganchase/perspective/src/js/perspective.parallel.js";
+import perspective from "@jpmorganchase/perspective";
 import {bindTemplate, json_attribute, array_attribute, copy_to_clipboard} from "./utils.js";
 import {undrag, column_undrag, column_dragleave, column_dragover, column_drop, drop, drag_enter, allow_drop, disallow_drop} from "./dragdrop.js";
 

diff --git a/packages/perspective/package.json b/packages/perspective/package.json
@@ -2,7 +2,8 @@
     "name": "@jpmorganchase/perspective",
     "version": "0.2.3",
     "description": "Perspective.js",
-    "main": "build/perspective.cjs.js",
+    "main": "build/perspective.node.js",
+    "browser": "build/perspective.cjs.js",
     "publishConfig": {
         "access": "public"
     },

diff --git a/packages/perspective/src/config/perspective.cjs.config.js b/packages/perspective/src/config/perspective.cjs.config.js
@@ -3,7 +3,7 @@ const common = require("./common.config.js");
 
 module.exports = Object.assign({}, common(), {
     entry: "./src/js/perspective.parallel.js",
-    externals: [/^[a-z0-9\@].*$/],
+    externals: [/node_modules\/\@(?!apache-arrow)/, /perspective.node.js/],
     output: {
         filename: "perspective.cjs.js",
         library: "perspective",

diff --git a/packages/perspective/src/js/perspective.parallel.js b/packages/perspective/src/js/perspective.parallel.js
@@ -9,7 +9,7 @@
 
 import {ScriptPath} from "./utils.js";
 
-import {TYPE_AGGREGATES, AGGREGATE_DEFAULTS, TYPE_FILTERS, FILTER_DEFAULTS, SORT_ORDERS} from "./defaults.js";
+import * as defaults from "./defaults.js";
 
 import {worker} from "./api.js";
 
@@ -175,22 +175,14 @@ class WebSocketWorker extends worker {
     }
 }
 
-export default {
-    worker: function(url) {
-        if (url) {
-            return new WebSocketWorker(url);
-        } else {
-            return new WebWorker();
-        }
-    },
-
-    TYPE_AGGREGATES: TYPE_AGGREGATES,
-
-    TYPE_FILTERS: TYPE_FILTERS,
-
-    AGGREGATE_DEFAULTS: AGGREGATE_DEFAULTS,
-
-    FILTER_DEFAULTS: FILTER_DEFAULTS,
-
-    SORT_ORDERS: SORT_ORDERS
+exports.worker = function(url) {
+    if (url) {
+        return new WebSocketWorker(url);
+    } else {
+        return new WebWorker();
+    }
 };
+
+for (let prop of Object.keys(defaults)) {
+    exports[prop] = defaults[prop];
+}
diff --git a/packages/perspective/src/js/utils.js b/packages/perspective/src/js/utils.js
@@ -23,6 +23,67 @@ export function bindall(self) {
     }
 }
 
+/**
+ * Detect Node.js.
+ *
+ * Returns
+ * -------
+ * True if the current script is running in Node.js.
+ */
+export function detectNode() {
+    return typeof window === "undefined";
+}
+
+/**
+ * Detect Internet Explorer.
+ *
+ * Returns
+ * -------
+ * True if the current script is running in Internet Explorer.
+ */
+export function detectIE() {
+    if (typeof window === "undefined") return false;
+    var ua = window.navigator.userAgent;
+    var msie = ua.indexOf("MSIE ");
+    if (msie > 0) {
+        return parseInt(ua.substring(msie + 5, ua.indexOf(".", msie)), 10);
+    }
+    var trident = ua.indexOf("Trident/");
+    if (trident > 0) {
+        var rv = ua.indexOf("rv:");
+        return parseInt(ua.substring(rv + 3, ua.indexOf(".", rv)), 10);
+    }
+    var edge = ua.indexOf("Edge/");
+    if (edge > 0) {
+        return parseInt(ua.substring(edge + 5, ua.indexOf(".", edge)), 10);
+    }
+    return false;
+}
+
+/**
+ * Detect Chrome.
+ *
+ * Returns
+ * -------
+ * Detect if the current script is running in Chrome.
+ */
+export function detectChrome() {
+    var isChromium = window.chrome,
+        winNav = window.navigator,
+        vendorName = winNav.vendor,
+        isOpera = winNav.userAgent.indexOf("OPR") > -1,
+        isIEedge = winNav.userAgent.indexOf("Edge") > -1,
+        isIOSChrome = winNav.userAgent.match("CriOS");
+
+    if (isIOSChrome) {
+        return true;
+    } else if (isChromium !== null && typeof isChromium !== "undefined" && vendorName === "Google Inc." && isOpera === false && isIEedge === false) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
 /**
  * An Object for capturing details of the invoking script's origin.
  *