Refactor plotting module to only appear in browser version

Author: risenW

src/danfojs-base/core/frame.ts

@@ -20,7 +20,6 @@ import { _genericMathOp } from "./math.ops";
 import Groupby from '../aggregators/groupby';
 import ErrorThrower from "../shared/errors"
 import { _iloc, _loc } from "./indexing";
-import { PlotlyLib } from "../plotting";
 import Utils from "../shared/utils"
 import NDframe from "./generic";
 import { table } from "table";
@@ -3360,21 +3359,6 @@ export default class DataFrame extends NDframe implements DataFrameInterface {
 
     }
 
-    /**
-     * Exposes functions for creating charts from a DataFrame. 
-     * Charts are created using the Plotly.js library, so all Plotly's configuration parameters are available.
-     * @param divId name of the HTML Div to render the chart in.
-    */
-    plot(divId: string) {
-        //TODO: Add support for check plot library to use. So we can support other plot library like d3, vega, etc
-        if (utils.isBrowserEnv()) {
-            const plt = new PlotlyLib(this, divId);
-            return plt;
-        } else {
-            throw new Error("Not supported in NodeJS");
-        }
-    }
-
     /**
      * Access a single value for a row/column pair by integer position.
      * Similar to {@link iloc}, in that both provide integer-based lookups. 

src/danfojs-base/core/series.ts

@@ -19,7 +19,6 @@ import { DATA_TYPES } from '../shared/defaults'
 import { _genericMathOp } from "./math.ops";
 import ErrorThrower from "../shared/errors"
 import { _iloc, _loc } from "./indexing";
-import { PlotlyLib } from "../plotting";
 import Utils from "../shared/utils"
 import NDframe from "./generic";
 import { table } from "table";
@@ -30,12 +29,6 @@ import {
     ArrayType1D,
     BaseDataOptionType,
     SeriesInterface,
-    CsvOutputOptionsBrowser,
-    ExcelOutputOptionsBrowser,
-    JsonOutputOptionsBrowser,
-    CsvOutputOptionsNode,
-    ExcelOutputOptionsNode,
-    JsonOutputOptionsNode,
     mapParam
 } from "../shared/types";
 
@@ -192,7 +185,7 @@ export default class Series extends NDframe implements SeriesInterface {
         if (this.shape[0] - rows < 0) {
             throw new Error("ParamError: Number of rows cannot be greater than available rows in data")
         }
-        
+
         const startIdx = this.shape[0] - rows
         return this.iloc([`${startIdx}:`])
     }
@@ -2135,28 +2128,6 @@ export default class Series extends NDframe implements SeriesInterface {
         return dummyEncode(this, options)
     }
 
-
-    /**
-     * Exposes functions for creating charts from a Series. 
-     * Charts are created using the Plotly.js library, so all Plotly's configuration parameters are available.
-     * @param divId name of the HTML Div to render the chart in.
-     * @example
-     * ```
-     * const sf = new Series([1, 2, 3, 4, 5]);
-     * sf.plot("myDiv").line() //renders the chart in the div with id "myDiv"
-     * ```
-    */
-    plot(divId: string) {
-        //TODO: Add support for check plot library to use
-        // So we can support other plot library like d3, vega, etc
-        if (utils.isBrowserEnv()) {
-            const plt = new PlotlyLib(this, divId);
-            return plt;
-        } else {
-            throw new Error("Not supported in NodeJS");
-        }
-    }
-
     /**
      * Access a single value for a row index.
      * Similar to iloc, in that both provide index-based lookups. 

src/danfojs-base/io/browser/io.excel.ts

@@ -19,15 +19,11 @@ import {
     ExcelInputOptionsBrowser
 } from "../../shared/types"
 import { DataFrame, NDframe, Series } from '../../'
-
-let XLSX: any;
-
-try {
-    XLSX = require("xlsx");
-} catch (err) {
-    console.info(`xlsx not found. Please run "npm install xlsx" or "yarn add xlsx" in order to work with Excel files.`)
-
-}
+import {
+    read,
+    writeFile,
+    utils
+} from "xlsx";
 
 /**
  * Reads a JSON file from local or remote location into a DataFrame.
@@ -64,9 +60,9 @@ const $readExcel = async (file: any, options?: ExcelInputOptionsBrowser) => {
                 }
                 response.arrayBuffer().then(arrBuf => {
                     const arrBufInt8 = new Uint8Array(arrBuf);
-                    const workbook = XLSX.read(arrBufInt8, { type: "array" })
+                    const workbook = read(arrBufInt8, { type: "array" })
                     const worksheet = workbook.Sheets[workbook.SheetNames[sheet]];
-                    const data = XLSX.utils.sheet_to_json(worksheet);
+                    const data = utils.sheet_to_json(worksheet);
                     const df = new DataFrame(data, frameConfig);
                     resolve(df);
                 });
@@ -78,9 +74,9 @@ const $readExcel = async (file: any, options?: ExcelInputOptionsBrowser) => {
     } else if (file instanceof File) {
         const arrBuf = await file.arrayBuffer()
         const arrBufInt8 = new Uint8Array(arrBuf);
-        const workbook = XLSX.read(arrBufInt8, { type: "array" })
+        const workbook = read(arrBufInt8, { type: "array" })
         const worksheet = workbook.Sheets[workbook.SheetNames[sheet]];
-        const data = XLSX.utils.sheet_to_json(worksheet);
+        const data = utils.sheet_to_json(worksheet);
         const df = new DataFrame(data, frameConfig);
         return df;
     } else {
@@ -122,10 +118,10 @@ const $toExcel = (df: NDframe | DataFrame | Series, options?: ExcelOutputOptions
         data = [cols, ...row]
     }
 
-    const worksheet = XLSX.utils.aoa_to_sheet(data);
-    const wb = XLSX.utils.book_new();
-    XLSX.utils.book_append_sheet(wb, worksheet, sheetName);
-    XLSX.writeFile(wb, `${fileName}`)
+    const worksheet = utils.aoa_to_sheet(data);
+    const wb = utils.book_new();
+    utils.book_append_sheet(wb, worksheet, sheetName);
+    writeFile(wb, `${fileName}`)
 };
 
 export {

src/danfojs-base/io/node/io.excel.ts

@@ -15,8 +15,12 @@
 import { ArrayType1D, ArrayType2D, ExcelInputOptionsNode, ExcelOutputOptionsNode } from "../../shared/types"
 import { DataFrame, NDframe, Series } from '../../'
 import fetch from "node-fetch";
-import XLSX from 'xlsx';
-
+import {
+    read,
+    writeFile,
+    readFile,
+    utils
+} from "xlsx";
 /**
  * Reads a JSON file from local or remote location into a DataFrame.
  * @param filePath URL or local file path to JSON file.
@@ -57,9 +61,9 @@ const $readExcel = async (filePath: string, options: ExcelInputOptionsNode = {})
                 }
                 response.arrayBuffer().then(arrBuf => {
                     const arrBufInt8 = new Uint8Array(arrBuf);
-                    const workbook = XLSX.read(arrBufInt8, { type: "array" })
+                    const workbook = read(arrBufInt8, { type: "array" })
                     const worksheet = workbook.Sheets[workbook.SheetNames[sheet]];
-                    const data = XLSX.utils.sheet_to_json(worksheet);
+                    const data = utils.sheet_to_json(worksheet);
                     const df = new DataFrame(data, frameConfig);
                     resolve(df);
                 });
@@ -70,9 +74,9 @@ const $readExcel = async (filePath: string, options: ExcelInputOptionsNode = {})
 
     } else {
         return new Promise(resolve => {
-            const workbook = XLSX.readFile(filePath);
+            const workbook = readFile(filePath);
             const worksheet = workbook.Sheets[workbook.SheetNames[sheet]];
-            const data = XLSX.utils.sheet_to_json(worksheet);
+            const data = utils.sheet_to_json(worksheet);
             const df = new DataFrame(data, frameConfig);
             resolve(df);
         });
@@ -113,10 +117,10 @@ const $toExcel = (df: NDframe | DataFrame | Series, options?: ExcelOutputOptions
         data = [cols, ...row]
     }
 
-    const worksheet = XLSX.utils.aoa_to_sheet(data);
-    const wb = XLSX.utils.book_new();
-    XLSX.utils.book_append_sheet(wb, worksheet, sheetName);
-    XLSX.writeFile(wb, `${filePath}`)
+    const worksheet = utils.aoa_to_sheet(data);
+    const wb = utils.book_new();
+    utils.book_append_sheet(wb, worksheet, sheetName);
+    writeFile(wb, `${filePath}`)
 };
 
 export {

src/danfojs-base/plotting/index.ts

@@ -25,14 +25,8 @@ import {
 import Series from "../core/series";
 import DataFrame from "../core/frame";
 import { PlotConfigObject, IPlotlyLib } from "../shared/types"
+import Plotly from "plotly.js-dist-min";
 
-let Plotly: IPlotlyLib;
-
-if (typeof window !== "undefined") {
-    //check if in browser environment and require "plotly.js-dist-min" module
-    Plotly = require("plotly.js-dist-min") as IPlotlyLib;
-
-}
 
 class PlotlyLib implements IPlotlyLib {
     divId: string;

src/danfojs-base/shared/types.ts

@@ -180,7 +180,6 @@ export interface SeriesInterface extends NDframeInterface {
         prefixSeparator?: string | Array<string>,
         inplace?: boolean
     }): DataFrame
-    plot(divId: string): IPlotlyLib
     iat(index: number): number | string | boolean | undefined
     at(index: string | number): number | string | boolean | undefined
 }
@@ -325,7 +324,6 @@ export interface DataFrameInterface extends NDframeInterface {
         prefixSeparator?: string | Array<string>,
         inplace?: boolean
     }): DataFrame | void
-    plot(divId: string): IPlotlyLib
     iat(row: number, column: number): number | string | boolean | undefined
     at(row: string | number, column: string): number | string | boolean | undefined
 }

src/danfojs-browser/package.json

@@ -23,20 +23,18 @@
     "@tensorflow/tfjs": "^3.13.0",
     "mathjs": "9.4.4",
     "papaparse": "^5.3.1",
-    "table": "6.7.1"
-  },
-  "peerDependencies": {
+    "table": "6.7.1",
     "plotly.js-dist-min": "2.8.0",
     "xlsx": "0.17.2"
   },
   "scripts": {
     "test": "karma start --single-run --browsers ChromeHeadless karma.conf.js",
-    "test:clean": "yarn build:clean && yarn add xlsx@0.17.2 -P && yarn run test",
+    "test:clean": "yarn build:clean && yarn run test",
     "build": "node ./scripts/prebuild.js && tsc && yarn run bundle",
     "build:clean": "rimraf ./dist && rimraf ./lib && node ./scripts/prebuild.js && yarn run build",
     "dev": "nodemon",
     "lint": "eslint ./src",
-    "bundle": "webpack --mode production",
+    "bundle": "webpack --mode development",
     "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
     "coverage": "nyc report --reporter=text-lcov | coveralls && nyc report --reporter=lcov",
     "patch": "npm version patch"