fix(modules): add js extension to imports

jaimedp · Dec 31, 2017 · 0dac676 · 0dac676
1 parent f2d53b5
commit 0dac676
Show file tree

Hide file tree

Showing 30 changed files with 185 additions and 107 deletions.
diff --git a/src/.jshintrc b/src/.jshintrc
@@ -1,6 +1,7 @@
 {
   "esversion": 6,
   "globals": {
+    "d3": true,
     "VERSION": true
   }
 }
diff --git a/src/scripts/core/axis/axis-scale-factory.js b/src/scripts/core/axis/axis-scale-factory.js
@@ -1,11 +1,11 @@
-import * as nwt from '../../utils/contour-utils';
-import YAxis from  './y-axis';
-import CenteredYAxis from './centered-y-axis';
-import LinearScale from './linear-scale-axis';
-import LogYAxis from './log-y-axis';
-import OrdinalScale from './ordinal-scale-axis';
-import SmartYAxis from './smart-y-axis';
-import TimeScale from './time-scale-axis';
+import * as nwt from '../../utils/contour-utils.js';
+import YAxis from  './y-axis.js';
+import CenteredYAxis from './centered-y-axis.js';
+import LinearScale from './linear-scale-axis.js';
+import LogYAxis from './log-y-axis.js';
+import OrdinalScale from './ordinal-scale-axis.js';
+import SmartYAxis from './smart-y-axis.js';
+import TimeScale from './time-scale-axis.js';
 
 
 export const axes = {

diff --git a/src/scripts/core/axis/centered-y-axis.js b/src/scripts/core/axis/centered-y-axis.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../../utils/contour-utils';
-import YAxis from './y-axis';
+// import d3 from 'd3';
+import * as nwt from '../../utils/contour-utils.js';
+import YAxis from './y-axis.js';
 
 // focus on vertically centering data - zero anchor is ignored
 function CenteredYAxis(data, options, domain) {

diff --git a/src/scripts/core/axis/linear-scale-axis.js b/src/scripts/core/axis/linear-scale-axis.js
@@ -1,5 +1,5 @@
-import d3 from 'd3';
-import * as nwt from '../../utils/contour-utils';
+// import d3 from 'd3';
+import * as nwt from '../../utils/contour-utils.js';
 
 function LinearScale(data, options) {
     this.options = options;

diff --git a/src/scripts/core/axis/log-y-axis.js b/src/scripts/core/axis/log-y-axis.js
@@ -1,5 +1,5 @@
-import d3 from 'd3';
-import YAxis from './y-axis';
+// import d3 from 'd3';
+import YAxis from './y-axis.js';
 
 function LogYAxis(data, options) {
     this.data = data;

diff --git a/src/scripts/core/axis/ordinal-scale-axis.js b/src/scripts/core/axis/ordinal-scale-axis.js
@@ -1,5 +1,5 @@
-import d3 from 'd3';
-import * as nwt from '../../utils/contour-utils';
+// import d3 from 'd3';
+import * as nwt from '../../utils/contour-utils.js';
 
 // implements the following interface
 /*

diff --git a/src/scripts/core/axis/smart-y-axis.js b/src/scripts/core/axis/smart-y-axis.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../../utils/contour-utils';
-import YAxis from './y-axis';
+// import d3 from 'd3';
+import * as nwt from '../../utils/contour-utils.js';
+import YAxis from './y-axis.js';
 
 function SmartYAxis(data, options, domain) {
     this.data = data;

diff --git a/src/scripts/core/axis/time-scale-axis.js b/src/scripts/core/axis/time-scale-axis.js
@@ -1,5 +1,5 @@
-import d3 from 'd3';
-import * as nwt from '../../utils/contour-utils';
+// import d3 from 'd3';
+import * as nwt from '../../utils/contour-utils.js';
 
 // implements the following interface
 /*

diff --git a/src/scripts/core/axis/y-axis.js b/src/scripts/core/axis/y-axis.js
@@ -1,5 +1,5 @@
-import d3 from 'd3';
-import * as nwt from '../../utils/contour-utils';
+// import d3 from 'd3';
+import * as nwt from '../../utils/contour-utils.js';
 
 function YAxis(data, options, domain) {
     this.data = data;

diff --git a/src/scripts/core/cartesian.js b/src/scripts/core/cartesian.js
@@ -1,7 +1,7 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from './contour';
-import { xScaleFactory, yScaleFactory } from './axis/axis-scale-factory';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from './contour.js';
+import { xScaleFactory, yScaleFactory } from './axis/axis-scale-factory.js';
 
 var defaults = {
     chart: {

diff --git a/src/scripts/core/contour.js b/src/scripts/core/contour.js
@@ -1,7 +1,7 @@
-import d3 from 'd3';
-import VisualizationContainer from '../utils/visualization-container';
-import * as nwt from '../utils/contour-utils';
-import { xScaleFactory, yScaleFactory, addAxis, axes } from './axis/axis-scale-factory';
+// import d3 from 'd3';
+import VisualizationContainer from '../utils/visualization-container.js';
+import * as nwt from '../utils/contour-utils.js';
+import { xScaleFactory, yScaleFactory, addAxis, axes } from './axis/axis-scale-factory.js';
 
 var defaults = {
     chart: {

diff --git a/src/scripts/core/exportable.js b/src/scripts/core/exportable.js
@@ -1,4 +1,4 @@
-import Contour from './contour';
+import Contour from './contour.js';
 
 var root = typeof window === 'undefined' ? this : window;
 

diff --git a/src/scripts/core/horizontal-frame.js b/src/scripts/core/horizontal-frame.js
@@ -1,5 +1,5 @@
-import Contour from './contour';
-import * as nwt from '../utils/contour-utils';
+import Contour from './contour.js';
+import * as nwt from '../utils/contour-utils.js';
 
 var defaults = {
     chart: {

diff --git a/src/scripts/index.js b/src/scripts/index.js
@@ -1,31 +1,39 @@
 
-import Contour from './core/contour';
-import './core/cartesian';
-import './core/horizontal-frame';
-import './core/exportable';
-
-import './core/axis/y-axis';
-import './core/axis/axis-scale-factory';
-import './core/axis/centered-y-axis';
-import './core/axis/linear-scale-axis';
-import './core/axis/log-y-axis';
-import './core/axis/ordinal-scale-axis';
-import './core/axis/smart-y-axis';
-import './core/axis/time-scale-axis';
-
-import './visualizations/area';
-import './visualizations/bar';
-import './visualizations/column';
-import './visualizations/cool-narwhal';
-import './visualizations/legend';
-import './visualizations/line';
-import './visualizations/null';
-import './visualizations/pie';
-import './visualizations/scatter';
-import './visualizations/stack-tooltip';
-import './visualizations/tooltip';
-import './visualizations/trend-line';
-
-import '../styles/contour.less';
-
-module.exports = Contour;
+import Contour from './core/contour.js';
+import './core/cartesian.js';
+import './core/horizontal-frame.js';
+import './core/exportable.js';
+
+import './core/axis/y-axis.js';
+import './core/axis/axis-scale-factory.js';
+import './core/axis/centered-y-axis.js';
+import './core/axis/linear-scale-axis.js';
+import './core/axis/log-y-axis.js';
+import './core/axis/ordinal-scale-axis.js';
+import './core/axis/smart-y-axis.js';
+import './core/axis/time-scale-axis.js';
+
+import './visualizations/area.js';
+import './visualizations/bar.js';
+import './visualizations/column.js';
+import './visualizations/cool-narwhal.js';
+import './visualizations/legend.js';
+import './visualizations/line.js';
+import './visualizations/null.js';
+import './visualizations/pie.js';
+import './visualizations/scatter.js';
+import './visualizations/stack-tooltip.js';
+import './visualizations/tooltip.js';
+import './visualizations/trend-line.js';
+
+// import '../styles/contour.less';
+
+// module.exports = Contour;
+
+export default Contour;
+
+if (typeof window !== 'undefined') {
+  window.Contour = Contour;
+}
+
+
diff --git a/src/scripts/utils/contour-utils.js b/src/scripts/utils/contour-utils.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-export { default as defaults } from 'lodash.defaults';
-export { default as merge } from 'lodash.merge';
+// import d3 from 'd3';
+// export { default as defaults } from 'lodash.defaults';
+// export { default as merge } from 'lodash.merge';
 
 // cheap trick to add decimals without hitting javascript issues
 // note that this fails for very large numbers
@@ -131,6 +131,73 @@ export const range = function (start, end, step) {
     return result;
 };
 
+export const merge = function (a, b) {
+    var args = new Array(arguments.length);
+    for (var i = 0; i < arguments.length; ++i) {
+        args[i] = arguments[i];
+    }
+
+    var isMergable = function (prop) { return prop && Object.prototype.toString.call(prop) === '[object Object]'; };
+    var cloneIfNeeded = function (val) { return val && Object.prototype.toString.call(val) === '[object Object]' ? merge({}, val) : val; };
+
+    if (a == null) {
+        return a;
+    }
+
+    if (!isMergable(a)) {
+        return b;
+    }
+
+    if (!b) {
+        return a;
+    }
+
+    var target = a;
+    /*jshint loopfunc: true */
+    for (var j=1, src = args[1]; j<args.length; j++, src=args[j]) {
+        if (src == null) continue;
+        Object.keys(src).forEach(function (key) {
+            if (target[key]) {
+                if (Array.isArray(target[key]) && Array.isArray(src[key])) {
+                    target[key] = target[key].map(function (el, i) {
+                        return merge(el, src[key][i]);
+                    });
+                } else if (isMergable(target[key]) && isMergable(src[key])) {
+                    target[key] = merge(target[key], src[key]);
+                } else if (src[key] != null) {
+                    target[key] = src[key];
+                }
+            } else {
+                target[key] = cloneIfNeeded(src[key]);
+            }
+        });
+    }
+
+    return target;
+};
+
+export const defaults = function (target /* ...sources */) {
+    var sources = new Array(arguments.length-1);
+    for (var i = 1; i < arguments.length; ++i) {
+        sources[i-1] = arguments[i];
+    }
+
+    if (!target) return null;
+
+    /*jshint loopfunc: true */
+    for (var j=0; j<sources.length; j++) {
+        var src = sources[j];
+        Object.keys(src).forEach(function (key) {
+            var val = target[key];
+            if (val === undefined) {
+                target[key] = src[key];
+            }
+        });
+    }
+
+    return target;
+};
+
 // return the uniq elements in the array
 // we are implementing our own version since this algorithm seems
 // to be a lot faster than what lodash uses

diff --git a/src/scripts/utils/visualization-container.js b/src/scripts/utils/visualization-container.js
@@ -1,5 +1,5 @@
-import d3 from 'd3';
-import * as nwt from './contour-utils';
+// import d3 from 'd3';
+import * as nwt from './contour-utils.js';
 
 var _extent = function (series, field) {
     var maxs = [], mins = [];

diff --git a/src/scripts/visualizations/area.js b/src/scripts/visualizations/area.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     xAxis: {

diff --git a/src/scripts/visualizations/bar.js b/src/scripts/visualizations/bar.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     bar: {

diff --git a/src/scripts/visualizations/column.js b/src/scripts/visualizations/column.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     column : {

diff --git a/src/scripts/visualizations/cool-narwhal.js b/src/scripts/visualizations/cool-narwhal.js
diff --git a/src/scripts/visualizations/legend.js b/src/scripts/visualizations/legend.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     legend: {

diff --git a/src/scripts/visualizations/line.js b/src/scripts/visualizations/line.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     xAxis: {

diff --git a/src/scripts/visualizations/null.js b/src/scripts/visualizations/null.js
@@ -1,4 +1,4 @@
-import { noop } from '../utils/contour-utils';
-import Contour from '../core/contour';
+import { noop } from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 Contour.export('nullVis', noop);
diff --git a/src/scripts/visualizations/pie.js b/src/scripts/visualizations/pie.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     pie: {

diff --git a/src/scripts/visualizations/scatter.js b/src/scripts/visualizations/scatter.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     xAxis: {

diff --git a/src/scripts/visualizations/stack-tooltip.js b/src/scripts/visualizations/stack-tooltip.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     tooltip: {

diff --git a/src/scripts/visualizations/tooltip.js b/src/scripts/visualizations/tooltip.js
@@ -1,6 +1,6 @@
-import d3 from 'd3';
-import * as nwt from '../utils/contour-utils';
-import Contour from '../core/contour';
+// import d3 from 'd3';
+import * as nwt from '../utils/contour-utils.js';
+import Contour from '../core/contour.js';
 
 var defaults = {
     tooltip: {