javascriptdata · risenW · Jan 24, 2021 · Aug 6, 2020 · Aug 6, 2020 · Aug 6, 2020
diff --git a/.babelrc b/.babelrc
@@ -8,5 +8,6 @@
         }
       }
     ]
-  ]
+  ],
+  "plugins": ["@babel/plugin-transform-runtime"]
 }
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ coverage
 danfojs/data
 .DS_Store
 .idea/
+
+dist/
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ easy and intuitive. It is heavily inspired by [Pandas](https://pandas.pydata.org
 To use Danfo.js via script tags, copy and paste the CDN below to your HTML file
 
 ```html
-  <script src="https://cdn.jsdelivr.net/npm/danfojs@0.1.5/dist/index.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/opensource9ja/danfojs@0.2.1/lib/bundle.js"></script>
 ```
 
 ### Example Usage in the Browser
@@ -64,7 +64,7 @@ To use Danfo.js via script tags, copy and paste the CDN below to your HTML file
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://cdn.jsdelivr.net/npm/danfojs@0.1.5/dist/index.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/opensource9ja/danfojs@0.2.1/lib/bundle.js"></script>
     <title>Document</title>
 </head>
 

diff --git a/danfojs/src/core/concat.js b/danfojs/src/core/concat.js
@@ -1,5 +1,4 @@
 import { DataFrame } from './frame';
-// import { Series } from "../../src/core/series";
 import { Utils } from "./utils";
 import { Series } from './series';
 

diff --git a/danfojs/src/core/frame.js b/danfojs/src/core/frame.js
@@ -12,8 +12,7 @@
 * limitations under the License.
 */
 
-import * as tf from '@tensorflow/tfjs-node'; //Use this import when building optimized version for danfojs-node
-// import * as tf from "@tensorflow/tfjs"; //Use this import when building optimized version for danfojs browser side
+import * as tf from "@tensorflow/tfjs";
 import Ndframe from "./generic";
 import { Series } from "./series";
 import { Utils } from "./utils";

diff --git a/danfojs/src/core/generic.js b/danfojs/src/core/generic.js
@@ -13,15 +13,15 @@
  *
 */
 
-import * as tf from '@tensorflow/tfjs-node'; //Use this import when building optimized version for danfojs-node
-// import * as tf from "@tensorflow/tfjs"; //Use this import when building optimized version for danfojs browser side
+import * as tf from "@tensorflow/tfjs";
 import { table } from "table";
 import { Utils } from "./utils";
 import { Configs } from "../config/config";
 
+
 const utils = new Utils();
 const config = new Configs(); //package wide configuration object
-
+const _VERSION = "0.1.5";
 export default class NDframe {
   /**
    * N-Dimensiona data structure. Stores multi-dimensional
@@ -264,6 +264,14 @@ export default class NDframe {
     return this.index_arr;
   }
 
+  /**
+   * Returns current version
+   * @return {String} version of danfojs
+   */
+  get __version() {
+    return _VERSION;
+  }
+
   /**
    * Sets index of the NDFrame
    */

diff --git a/danfojs/src/core/get_dummies.js b/danfojs/src/core/get_dummies.js
@@ -1,4 +1,3 @@
-// import { Series } from "./series"
 import { DataFrame } from "./frame";
 import { Utils } from "./utils";
 

diff --git a/danfojs/src/core/series.js b/danfojs/src/core/series.js
@@ -14,8 +14,7 @@
 */
 
 
-import * as tf from '@tensorflow/tfjs-node'; //Use this import when building optimized version for danfojs-node
-// import * as tf from '@tensorflow/tfjs'; //Use this import when building optimized version for danfojs browser sideimport { std, variance } from 'mathjs'
+import * as tf from "@tensorflow/tfjs";
 import { variance, std } from 'mathjs';
 import { Utils } from "./utils";
 import { Str } from "./strings";

diff --git a/danfojs/src/core/strings.js b/danfojs/src/core/strings.js
@@ -1,8 +1,4 @@
-//handled string columns in Series and DataFrame
 import { Series } from "./series";
-// import {Utils} from "./utils"
-
-// const utils = new Utils()
 
 /**
  * String methods applied on Series and DataFrames

diff --git a/danfojs/src/core/utils.js b/danfojs/src/core/utils.js
@@ -1,5 +1,5 @@
-import * as tf from '@tensorflow/tfjs-node';
-// import * as tf from "@tensorflow/tfjs";
+import * as tf from "@tensorflow/tfjs";
+import '@tensorflow/tfjs-backend-cpu';
 import { Configs } from "../config/config";
 
 const config = new Configs();

diff --git a/danfojs/src/index.js b/danfojs/src/index.js
@@ -1,10 +1,16 @@
-export { Series } from './core/series';
-export { DataFrame } from './core/frame';
-export { to_datetime } from './core/timeseries';
-export { read_csv, read_json, read_excel, read } from './io/reader';
-export { merge } from './core/merge';
-export { concat } from './core/concat';
-export { LabelEncoder, OneHotEncoder } from './preprocessing/encodings'; //TODO Create js file to expose functions
-export { MinMaxScaler, StandardScaler } from './preprocessing/scalers';
-export { date_range } from './core/date_range';
-export { get_dummies } from './core/get_dummies';
+import NDframe from "./core/generic";
+
+export { Series } from "./core/series";
+export { DataFrame } from "./core/frame";
+export { to_datetime } from "./core/timeseries";
+export { read_csv, read_json, read_excel, read } from "./io/reader";
+export { merge } from "./core/merge";
+export { concat } from "./core/concat";
+export { LabelEncoder, OneHotEncoder } from "./preprocessing/encodings";
+export { MinMaxScaler, StandardScaler } from "./preprocessing/scalers";
+export { date_range } from "./core/date_range";
+export { get_dummies } from "./core/get_dummies";
+export { Configs } from "./config/config";
+export { NDframe };
+export { Str } from "./core/strings";
+export { Utils } from "./core/utils";
diff --git a/danfojs/src/io/reader.js b/danfojs/src/io/reader.js
@@ -1,11 +1,10 @@
-import { DataFrame } from "../core/frame";
-import * as tf from '@tensorflow/tfjs-node';
-// import * as tf from "@tensorflow/tfjs";
-import { Utils } from "../core/utils";
+import * as tf from "@tensorflow/tfjs";
 import fetch from "node-fetch";
 import XLSX from "xlsx";
 import { open, Dataset, isDataset } from "frictionless.js";
 import toArray from "stream-to-array";
+import { Utils } from "../core/utils";
+import { DataFrame } from "../core/frame";
 
 const utils = new Utils();
 

diff --git a/danfojs/src/plotting/plot.js b/danfojs/src/plotting/plot.js
@@ -1,4 +1,4 @@
-// import { newPlot } from 'plotly.js'; //comment out when building for Node Version
+import { newPlot } from 'plotly.js';
 import { Utils } from "../core/utils";
 import { Series } from "../core/series";
 

diff --git a/danfojs/src/preprocessing/scalers.js b/danfojs/src/preprocessing/scalers.js
@@ -1,9 +1,7 @@
-import * as tf from '@tensorflow/tfjs-node';
-// import * as tf from "@tensorflow/tfjs";
+import * as tf from "@tensorflow/tfjs";
 import { Series } from "../core/series";
 import { DataFrame } from "../core/frame";
 import { Utils } from "../core/utils";
-// import { std } from "mathjs";
 
 const utils = new Utils();
 

diff --git a/danfojs/tests/config/config.js b/danfojs/tests/config/config.js
@@ -1,8 +1,5 @@
-import { Configs } from '../../src/config/config';
-import { assert } from 'chai';
-
-const config = new Configs();
-
+/* eslint-disable no-undef */
+const config = new dfd.Configs();
 
 describe("Config", function () {
   it("gets the default config val for table width", function () {

diff --git a/danfojs/tests/core/concat.js b/danfojs/tests/core/concat.js
@@ -1,25 +1,20 @@
-import { assert } from "chai";
-import { DataFrame } from '../../src/core/frame';
-import { concat } from '../../src/core/concat';
-import { Series } from "../../src/core/series";
-
 
 describe("Concatenate", function () {
 
   it("Check the axis 0 concatenation", function () {
     let data = [ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 20, 30, 40 ], [ 39, 89, 78 ] ];
     let cols = [ "A", "B", "C" ];
-    let df = new DataFrame(data, { columns: cols });
+    let df = new dfd.DataFrame(data, { columns: cols });
 
     let data1 = [ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 20, 30, 40 ], [ 39, 89, 78 ] ];
     let cols1 = [ "A", "B", "C" ];
-    let df1 = new DataFrame(data1, { columns: cols1 });
+    let df1 = new dfd.DataFrame(data1, { columns: cols1 });
 
     let data2 = [ [ 1, 2, 3, 5 ], [ 4, 5, 6, 8 ], [ 20, 30, 40, 10 ] ];
     let cols2 = [ "A", "B", "C", "D" ];
-    let df2 = new DataFrame(data2, { columns: cols2 });
+    let df2 = new dfd.DataFrame(data2, { columns: cols2 });
 
-    let new_df = concat({ "df_list": [ df, df1, df2 ], "axis": 0 });
+    let new_df = dfd.concat({ "df_list": [ df, df1, df2 ], "axis": 0 });
 
     let data_values = [ [ 1, 2, 3, NaN ], [ 4, 5, 6, NaN ], [ 20, 30, 40, NaN ], [ 39, 89, 78, NaN ],
       [ 1, 2, 3, NaN ], [ 4, 5, 6, NaN ], [ 20, 30, 40, NaN ], [ 39, 89, 78, NaN ],
@@ -31,35 +26,35 @@ describe("Concatenate", function () {
   it("Check the axis 1 concatenation", function () {
     let data = [ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 20, 30, 40 ], [ 39, 89, 78 ] ];
     let cols = [ "A", "B", "C" ];
-    let df = new DataFrame(data, { columns: cols });
+    let df = new dfd.DataFrame(data, { columns: cols });
 
     let data1 = [ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 20, 30, 40 ], [ 39, 89, 78 ] ];
     let cols1 = [ "A", "B", "C" ];
-    let df1 = new DataFrame(data1, { columns: cols1 });
+    let df1 = new dfd.DataFrame(data1, { columns: cols1 });
 
     let data2 = [ [ 1, 2, 3, 5 ], [ 4, 5, 6, 8 ], [ 20, 30, 40, 10 ] ];
     let cols2 = [ "A", "B", "C", "D" ];
-    let df2 = new DataFrame(data2, { columns: cols2 });
+    let df2 = new dfd.DataFrame(data2, { columns: cols2 });
 
-    let new_df = concat({ "df_list": [ df, df1, df2 ], "axis": 1 });
+    let new_df = dfd.concat({ "df_list": [ df, df1, df2 ], "axis": 1 });
 
     let data_values = [ [ 1, 2, 3, 1, 2, 3, 1, 2, 3, 5 ], [ 4, 5, 6, 4, 5, 6, 4, 5, 6, 8 ],
       [ 20, 30, 40, 20, 30, 40, 20, 30, 40, 10 ], [ 39, 89, 78, 39, 89, 78, NaN,
         NaN, NaN, NaN ] ];
     assert.deepEqual(new_df.values, data_values);
   });
 
-  it("concatenate dataframe and series along 0 axis", function(){
+  it("concatenate dfd.dataframe and series along 0 axis", function(){
 
     let data1 = [ 1, 2, 3, 4 ];
     let data2 = [ 3, 4, 5, 6 ];
 
     let data = [ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 20, 30, 40 ], [ 39, 89, 78 ] ];
     let cols = [ "A", "B", "C" ];
-    let df = new DataFrame(data, { columns: cols });
+    let df = new dfd.DataFrame(data, { columns: cols });
 
-    let s1 = new Series(data1);
-    let s2 = new Series(data2);
+    let s1 = new dfd.Series(data1);
+    let s2 = new dfd.Series(data2);
     let rslt = [
       [ 1, 2, 3, NaN ],
       [ 4, 5, 6, NaN ],
@@ -72,20 +67,20 @@ describe("Concatenate", function () {
     ];
 
 
-    let con = concat({ "df_list": [ df, s1 ], "axis": 0 });
+    let con = dfd.concat({ "df_list": [ df, s1 ], "axis": 0 });
 
     assert.deepEqual(con.values, rslt);
 
   });
 
-  it("concatenate dataframe and series along axis 1", function(){
+  it("concatenate dfd.dataframe and series along axis 1", function(){
 
     let data = [ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 20, 30, 40 ], [ 39, 89, 78 ] ];
     let cols = [ "A", "B", "C" ];
-    let df = new DataFrame(data, { columns: cols });
+    let df = new dfd.DataFrame(data, { columns: cols });
 
     let data1 = [ 1, 2, 3, 4 ];
-    let s1 = new Series(data1);
+    let s1 = new dfd.Series(data1);
     let rslt = [
       [ 1, 2, 3, 1 ],
       [ 4, 5, 6, 2 ],
@@ -94,7 +89,7 @@ describe("Concatenate", function () {
     ];
 
 
-    let con = concat({ "df_list": [ df, s1 ], "axis": 1 });
+    let con = dfd.concat({ "df_list": [ df, s1 ], "axis": 1 });
 
     assert.deepEqual(con.values, rslt);
 
@@ -104,12 +99,12 @@ describe("Concatenate", function () {
     let data1 = [ 1, 2, 3, 4 ];
     let data2 = [ 3, 4, 5, 6 ];
 
-    let s1 = new Series(data1);
-    let s2 = new Series(data2);
+    let s1 = new dfd.Series(data1);
+    let s2 = new dfd.Series(data2);
     let rslt = [ [ 1, 3 ], [ 2, 4 ], [ 3, 5 ], [ 4, 6 ] ];
 
 
-    let con = concat({ "df_list": [ s1, s2 ], "axis": 1 });
+    let con = dfd.concat({ "df_list": [ s1, s2 ], "axis": 1 });
 
     assert.deepEqual(con.values, rslt);
 
@@ -119,45 +114,45 @@ describe("Concatenate", function () {
     let data1 = [ 1, 2, 3, 4 ];
     let data2 = [ 3, 4, 5, 6 ];
 
-    let s1 = new Series(data1);
-    let s2 = new Series(data2);
+    let s1 = new dfd.Series(data1);
+    let s2 = new dfd.Series(data2);
     let rslt = [
       1, 2, 3, 4,
       3, 4, 5, 6
     ];
 
-    let con = concat({ "df_list": [ s1, s2 ], "axis": 0 });
+    let con = dfd.concat({ "df_list": [ s1, s2 ], "axis": 0 });
 
     assert.deepEqual(con.values, rslt);
 
   });
 
   it("test if df_list is an array", function(){
 
-    assert.throws(function () { concat({ "df_list":23, "axis":0 }); }, Error, 'df_list must be an Array of dataFrames/Series');
+    assert.throws(function () { dfd.concat({ "df_list":23, "axis":0 }); }, Error, 'df_list must be an Array of dataFrames/Series');
 
   });
   it("assign default axis for concating", function(){
     let data1 = [ 1, 2, 3, 4 ];
     let data2 = [ 3, 4, 5, 6 ];
 
-    let s1 = new Series(data1);
-    let s2 = new Series(data2);
+    let s1 = new dfd.Series(data1);
+    let s2 = new dfd.Series(data2);
     let rslt = [ [ 1, 3 ], [ 2, 4 ], [ 3, 5 ], [ 4, 6 ] ];
 
 
-    let con = concat({ "df_list": [ s1, s2 ], "axis": 12 });
+    let con = dfd.concat({ "df_list": [ s1, s2 ], "axis": 12 });
 
     assert.deepEqual(con.values, rslt);
   });
   it("ensure axis is a number", function(){
     let data1 = [ 1, 2, 3, 4 ];
     let data2 = [ 3, 4, 5, 6 ];
 
-    let s1 = new Series(data1);
-    let s2 = new Series(data2);
+    let s1 = new dfd.Series(data1);
+    let s2 = new dfd.Series(data2);
 
-    assert.throws(function () { concat({ "df_list":[ s1, s2 ], "axis":"r" }); }, Error, 'axis must be a number');
+    assert.throws(function () { dfd.concat({ "df_list":[ s1, s2 ], "axis":"r" }); }, Error, 'axis must be a number');
   });
 
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,5 +8,6 @@ @@
             }
           }
         ]
-      ]
+      ],
+      "plugins": ["@babel/plugin-transform-runtime"]
     }