Merge branch 'danfo/typescript' of https://github.com/opensource9ja/danfojs into danfo/typescript

Author: steveoni

src/danfojs-base/core/frame.ts

@@ -116,7 +116,7 @@ const $streamCSV = async (file: string, callback: (df: DataFrame) => void, optio
  * ```
  */
 const $toCSV = (df: NDframe | DataFrame | Series, options?: CsvOutputOptionsBrowser): string | void => {
-  let { fileName, download, sep, header } = { fileName: "output.csv", sep: ",", header: true, download: true, ...options }
+  let { fileName, download, sep, header } = { fileName: "output.csv", sep: ",", header: true, download: false, ...options }
 
   if (df.$isSeries) {
     const csv = df.values.join(sep);

src/danfojs-base/core/series.ts

@@ -93,7 +93,7 @@ const $readJSON = async (file: any, options?: JsonInputOptionsBrowser) => {
  * ```
  */
 const $toJSON = (df: NDframe | DataFrame | Series, options?: JsonOutputOptionsBrowser): object | void => {
-    let { fileName, format, download } = { fileName: "output.json", download: true, format: "column", ...options }
+    let { fileName, format, download } = { fileName: "output.json", download: false, format: "column", ...options }
 
     if (df.$isSeries) {
         const obj: { [key: string]: ArrayType1D } = {};

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

@@ -135,7 +135,7 @@ export interface SeriesInterface extends NDframeInterface {
     var(): number
     isNa(): Series
     fillNa(value: number | string | boolean, options?: { inplace?: boolean }): Series | void
-    sortValues(ascending: boolean, options?: { inplace?: boolean }): Series | void
+    sortValues(options?: {  ascending?: boolean, inplace?: boolean }): Series | void
     copy(): Series
     describe(): Series
     resetIndex(options?: { inplace?: boolean }): Series | void
@@ -264,7 +264,7 @@ export interface DataFrameInterface extends NDframeInterface {
                 inplace?: boolean
             }): DataFrame | void
     isNa(): DataFrame
-    dropNa(axis?: 0 | 1, options?: { inplace?: boolean }): DataFrame | void
+    dropNa(options?: { axis: 0 | 1, inplace?: boolean }): DataFrame | void
     apply(callable: any, options?: { axis?: 0 | 1 }): DataFrame | Series
     applyMap(callable: any, options?: { inplace?: boolean }): DataFrame | void
     lt(other: DataFrame | Series | number, options?: { axis?: 0 | 1 }): DataFrame

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

@@ -1536,7 +1536,7 @@ describe("DataFrame", function () {
       const df_val = [ [ 2, 4 ],
         [ 180, 360 ],
         [ 180, 360 ] ];
-      assert.deepEqual(df.dropNa(0).values, df_val);
+      assert.deepEqual(df.dropNa({ axis: 0 }).values, df_val);
 
     });
     it("drop NaNs along axis 1", function () {
@@ -1547,15 +1547,15 @@ describe("DataFrame", function () {
       const df = new dfd.DataFrame(data, { columns: column });
       const df_val = [ [ 0, 2, 4 ],
         [ 360, 180, 360 ] ];
-      assert.deepEqual(df.dropNa(1).values, df_val);
+      assert.deepEqual(df.dropNa({ axis: 1 }).values, df_val);
 
     });
     it("drop NaNs along axis 1", function () {
       const data = [ [ NaN, 1, 2, 3 ], [ 3, 4, NaN, 9 ], [ 5, 6, 7, 8 ] ];
       const column = [ "A", "B", "C", "D" ];
       const df = new dfd.DataFrame(data, { columns: column });
       const df_val = [ [ 5, 6, 7, 8 ] ];
-      assert.deepEqual(df.dropNa(1).values, df_val);
+      assert.deepEqual(df.dropNa({ axis: 1 }).values, df_val);
 
     });
     it("drop inplace at axis 0, inplace false ", function () {
@@ -1565,7 +1565,7 @@ describe("DataFrame", function () {
 
       const df_val = [ [ 1, 3 ], [ 4, 9 ], [ 6, 8 ] ];
 
-      assert.deepEqual(df.dropNa(0).values, df_val);
+      assert.deepEqual(df.dropNa({ axis: 0 }).values, df_val);
 
     });
     it("drop inplace at axis 0, inplace true ", function () {
@@ -1574,7 +1574,7 @@ describe("DataFrame", function () {
       const df = new dfd.DataFrame(data, { columns: column });
 
       const df_val = [ [ 1, 3 ], [ 4, 9 ], [ 6, 8 ] ];
-      df.dropNa(0, { inplace: true });
+      df.dropNa({ axis: 0, inplace: true });
       assert.deepEqual(df.values, df_val);
 
     });
@@ -1585,7 +1585,7 @@ describe("DataFrame", function () {
 
       const df_val = [ [ 5, 6, 7, 8 ] ];
 
-      df.dropNa(1, { inplace: true });
+      df.dropNa({ axis: 1, inplace: true });
       assert.deepEqual(df.values, df_val);
 
     });
@@ -1597,7 +1597,7 @@ describe("DataFrame", function () {
 
       let df_val = [ [ 5, 6, 7, 8 ] ];
 
-      df.dropNa(1, { inplace: true });
+      df.dropNa({ axis: 1, inplace: true });
       assert.deepEqual(df.values, df_val);
 
     });

src/danfojs-base/shared/types.ts

@@ -654,20 +654,20 @@ describe("Series Functions", () => {
       const sf = new dfd.Series([ 20, 30, 1, 2, 4, 57, 89, 0, 4 ]);
       const result = [ 0, 1, 2, 4, 4, 20, 30, 57, 89 ];
       const expectedIndex = [ 7, 2, 3, 8, 4, 0, 1, 5, 6 ];
-      sf.sortValues(true, { inplace: true });
+      sf.sortValues({ ascending:true, inplace: true });
       assert.deepEqual(sf.values, result);
       assert.deepEqual(sf.index, expectedIndex);
     });
     it("Sort values in a Series in Descending order", function () {
       const sf = new dfd.Series([ 20, 30, 1, 2, 4, 57, 89, 0, 4 ]);
       const result = [ 89, 57, 30, 20, 4, 4, 2, 1, 0 ];
-      const sortedSf = sf.sortValues(false);
+      const sortedSf = sf.sortValues({ ascending: false });
       assert.deepEqual(sortedSf.values, result);
     });
     it("confirms that sortValues in descending order happens inplace", function () {
       const sf = new dfd.Series([ 20, 30, 1, 2, 4, 57, 89, 0, 4 ]);
       const result = [ 89, 57, 30, 20, 4, 4, 2, 1, 0 ];
-      sf.sortValues(false, { inplace: true });
+      sf.sortValues({ ascending: false, inplace: true });
       assert.deepEqual(sf.values, result);
     });
     it("Confirms that series index is sorted in ascending order (not in inplace)", function () {
@@ -679,13 +679,13 @@ describe("Series Functions", () => {
     it("Confirms that series index is sorted in descending order (not in inplace)", function () {
       const sf = new dfd.Series([ 20, 30, 1, 2, 4, 57, 89, 0, 4 ]);
       const result = [ 6, 5, 1, 0, 4, 8, 3, 2, 7 ];
-      const sortedSf = sf.sortValues(false);
+      const sortedSf = sf.sortValues({ ascending: false });
       assert.deepEqual(sortedSf.index, result);
     });
     it("Sort string values in a Series", function () {
       const sf = new dfd.Series([ "boy", "zebra", "girl", "man" ]);
       const result = [ "boy", "girl", "man", "zebra" ];
-      const sortedSf = sf.sortValues(false);
+      const sortedSf = sf.sortValues({ ascending: false });
       assert.deepEqual(sortedSf.values, result);
     });
   });