canvasxpress-cli 41.3.4 → 41.4.6

package/cmds/help.js

@@ -7,94 +7,29 @@ const menus = {
     svg ................ create a svg CanvasXpress file from inline parameters, file or url
     json ............... create a json CanvasXpress file from inline parameters, file or url
 
-    csv ................ create a CanvasXpress png file from a local csv file or url
-    reproduce .......... create CanvasXpress png files from a local file or url
-    canvas ............. run scripts files to test CanvasXpres
+    canvas ............. run scripts files to test CanvasXpres [internal]
 
     test ............... test package. Creates images and json file in test directory
     version ............ show this package version
     help ............... show this help. Add command to show correponding help
   `,
 
-  canvas: `
-    --input, -i ........ <required> path/to/js/file
-    --directory, -f .... [optional] directory of CanvasXpres version to check
-    --graph, -g ........ [optional] graph name
-    --number, -n ....... [optional] number for the graph
-    --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
-    --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-
-    Examples:
-
-      canvasxpress canvas -i canvas/scripts/compareImages.js
-
-      canvasxpress canvas -i canvas/scripts/compareImages.js -g violin -n 11
-  `,
-
-  csv: `
-    --input, -i ........ [optional - required] file or url with a csv file:
-                         file:///path/to/local/file.csv
-                         http://page/with/file.csv
-                         https://page/with/file.csv
-    --output, -o ....... [optional] directory path to save image
-                         {default} './'
-    --width, -x ........ [optional] integer for image width
-                         {default} 800
-    --height, -y ....... [optional] integer for image height
-                         {default} 800
-    --data, -d ......... [optional - required] json string with the data for CanvasXpress
-    --config, -c ....... [optional] json string with configuration for CanvasXpress
-    --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
-    --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-
-    Examples:
-
-      canvasxpress csv -i ../src/ToothGrowth.csv -t 3000
-
-      canvasxpress csv -i https://raw.githubusercontent.com/neuhausi/Rdatasets/master/csv/datasets/ToothGrowth.csv -t 3000
-
-      canvasxpress csv -i file:///node/src/ToothGrownth.csv -c '{"graphType":"Boxplot","transposeData":true,"asVariableFactors":["dose"],"stringSampleFactors":["dose"],"groupingFactors":["dose"]}' -t 3000
-
-      canvasxpress csv -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}' -c '{"graphOrientation":"vertical","theme":"CanvasXpress","title":"Bar Graph Title"}' -t 3000
-  `,
-
-  reproduce: `
-    --input, -i ........ <required> file or url with a html file:
-                         file:///path/to/local/file.html
-                         http://page/with/file.html
-                         https://page/with/file.html
-    --output, -o ....... [optional] directory path to save image
-                         {default} './'
-    --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
-    --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-
-    Examples:
-
-      canvasxpress reproduce -i https://canvasxpress.org/examples/layout-7.html
-
-      canvasxpress reproduce -i file:///node/src/canvasXpress.html
-
-      canvasxpress reproduce -i ../src/canvasXpress.html
-  `,
-
   png: `
-    --input, -i ........ [optional - required] file or url with a html file:
-                         file:///path/to/local/file.html
-                         http://page/with/file.html
-                         https://page/with/file.html
+    --input, -i ........ [optional - required] file or url:
+                         /path/to/local/file.[json|png|csv|txt|html]
+                         http://page/with/file.[json|png|csv|txt|html]
+                         https://page/with/file.[json|png|csv|txt|html]
     --output, -o ....... [optional] directory path to save image
                          {default} './'
     --width, -x ........ [optional] integer for image width
                          {default} 800
     --height, -y ....... [optional] integer for image height
                          {default} 800
+    --target, -t ....... [optional] string id for CanvasXpress
     --data, -d ......... [optional - required] json string with the data for CanvasXpress
-    --config, -c ....... [optional] json string with configuration for CanvasXpress    --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
-    --timeout, -t ...... [optional] timeout in millisecods to close browser
+    --config, -c ....... [optional] json string with configuration for CanvasXpress
+    --events, -e ....... [optional] json/javascript string with events for CanvasXpress
+    --timeout, -q ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
 
@@ -102,28 +37,31 @@ const menus = {
 
       canvasxpress png -i https://canvasxpress.org/examples/bar-3.html
 
-      canvasxpress png -i file:///node/src/canvasXpress.html
+      canvasxpress png -i ../src/area.json
+
+      canvasxpress png -i ../src/dotplot.png
 
-      canvasxpress png -i ../src/canvasXpress.html
+      canvasxpress png -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}' -c '{"graphOrientation":"vertical","title":"Bar Graph Title"}'
 
-      canvasxpress png -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}'
-        -c '{"graphOrientation":"vertical","theme":"CanvasXpress","title":"Bar Graph Title"}'
+      canvasxpress png -i ../src/ToothGrowth.csv -c '{"graphType":"Boxplot","asVariableFactors":["dose"],"stringSampleFactors":["dose"],"groupingFactors":["dose"]}'
   `,
 
   svg: `
-    --input, -i ........ [optional - required] file or url with a html file:
-                         file:///path/to/local/file.html
-                         http://page/with/file.html
-                         https://page/with/file.html
+    --input, -i ........ [optional - required] file or url:
+                         /path/to/local/file.[json|png|csv|txt|html]
+                         http://page/with/file.[json|png|csv|txt|html]
+                         https://page/with/file.[json|png|csv|txt|html]
     --output, -o ....... [optional] directory path to save image
                          {default} './'
     --width, -x ........ [optional] integer for image width
                          {default} 800
     --height, -y ....... [optional] integer for image height
                          {default} 800
+    --target, -t ....... [optional] string id for CanvasXpress
     --data, -d ......... [optional - required] json string with the data for CanvasXpress
     --config, -c ....... [optional] json string with configuration for CanvasXpress
-    --timeout, -t ...... [optional] timeout in millisecods to close browser
+    --events, -e ....... [optional] json/javascript string with events for CanvasXpress
+    --timeout, -q ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
 
@@ -131,28 +69,31 @@ const menus = {
 
       canvasxpress svg -i https://canvasxpress.org/examples/bar-3.html
 
-      canvasxpress svg -i file:///node/src/canvasXpress.html
+      canvasxpress svg -i ../src/area.json
 
-      canvasxpress svg -i ../src/canvasXpress.html
+      canvasxpress svg -i ../src/dotplot.png
 
-      canvasxpress svg -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}'
-        -c '{"graphOrientation":"vertical","theme":"CanvasXpress","title":"Bar Graph Title"}'
+      canvasxpress svg -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}' -c '{"graphOrientation":"vertical","title":"Bar Graph Title"}'
+
+      canvasxpress svg -i ../src/ToothGrowth.csv -c '{"graphType":"Boxplot","asVariableFactors":["dose"],"stringSampleFactors":["dose"],"groupingFactors":["dose"]}'
   `,
 
   json: `
-    --input, -i ........ [optional - required] file or url with a html file:
-                         file:///path/to/local/file.html
-                         http://page/with/file.html
-                         https://page/with/file.html
+    --input, -i ........ [optional - required] file or url:
+                         /path/to/local/file.[json|png|csv|txt|html]
+                         http://page/with/file.[json|png|csv|txt|html]
+                         https://page/with/file.[json|png|csv|txt|html]
     --output, -o ....... [optional] directory path to save image
                          {default} './'
     --width, -x ........ [optional] integer for image width
                          {default} 800
     --height, -y ....... [optional] integer for image height
                          {default} 800
+    --target, -t ....... [optional] string id for CanvasXpress
     --data, -d ......... [optional - required] json string with the data for CanvasXpress
     --config, -c ....... [optional] json string with configuration for CanvasXpress
-    --timeout, -t ...... [optional] timeout in millisecods to close browser
+    --events, -e ....... [optional] json/javascript string with events for CanvasXpress
+    --timeout, -q ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
 
@@ -160,28 +101,29 @@ const menus = {
 
       canvasxpress json -i https://canvasxpress.org/examples/bar-3.html
 
-      canvasxpress json -i file:///node/src/canvasXpress.html
+      canvasxpress json -i ../src/area.json
 
-      canvasxpress json -i ../src/canvasXpress.html
+      canvasxpress json -i ../src/dotplot.png
 
-      canvasxpress json -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}'
-        -c '{"graphOrientation":"vertical","theme":"CanvasXpress","title":"Bar Graph Title"}'
-  `,
+      canvasxpress json -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}' -c '{"graphOrientation":"vertical","title":"Bar Graph Title"}'
 
-  target: `
-    --target, -t ....... [optional] string with CanvasXpress target Id
+      canvasxpress json -i ../src/ToothGrowth.csv -c '{"graphType":"Boxplot","asVariableFactors":["dose"],"stringSampleFactors":["dose"],"groupingFactors":["dose"]}'
   `,
 
-  data: `
-    --data, -d ......... [optional] json string with data for CanvasXpress
-  `,
+  canvas: `
+    --input, -i ........ <required> path/to/js/file
+    --directory, -f .... [optional] directory of CanvasXpres version to check
+    --graph, -g ........ [optional] graph name
+    --number, -n ....... [optional] number for the graph
+    --timeout, -q ...... [optional] timeout in millisecods to close browser
+                         {default} 500
+    --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
 
-  config:`
-    --config, -d ....... [optional] json string with configuration for CanvasXpress
-  `,
+    Examples:
 
-  events:`
-    --events, -e ....... [optional] javascript string with events for CanvasXpress
+      canvasxpress canvas -i canvas/scripts/compareImages.js
+
+      canvasxpress canvas -i canvas/scripts/compareImages.js -g violin -n 11
   `
 
 }

package/cmds/io.js

@@ -14,7 +14,7 @@ module.exports = async (obj) => {
 
   const logStdout = process.stdout;
 
-  const defhtml = ("file://" + dirname + "/src/canvasXpress.html" + (obj.debug ? "?cXH" : ""));
+  const html = (obj.input && obj.input.match(/.html$/) ? obj.input : ("file://" + dirname + "/src/canvasXpress.html")) + (obj.debug ? "?cXH" : "");
 
   console.log = function () {
     logFile.write(util.format.apply(null, arguments) + '\n');
@@ -44,17 +44,20 @@ module.exports = async (obj) => {
 
     const page = await browser.newPage();
 
+    page.on("console", (consoleObj) => console.log(consoleObj.text()));
+
     if (obj.input && !obj.input.match(/^file|^http/)) {
       obj.input = "file://" + path.resolve(obj.input);
     }
 
     const func = function (obj) {
+
       if (obj.debug) {
         debugger;
       }
+
       var exec = function (cx, tg) {
         switch (obj.cmd) {
-          case 'csv':
           case 'png':
             cx.print(false, tg + '.png');
             break;
@@ -64,70 +67,72 @@ module.exports = async (obj) => {
           case 'json':
             cx.save(false, tg + '.json');
             break;
-          case 'reproduce':
-            cx.reproduce(false, true, true);
-            break;
         }
       }
+
       var clbk = function () {
-        var cxs = CanvasXpress.instances;
-        var cx = cxs[cxs.length - 1];
-        var tg = cx.target;
-        console.log("Creating " + (obj.cmd == 'csv' ? 'png' : obj.cmd) + " file from " + (obj.input ? obj.input : 'input data') + " (" + obj.output + (obj.target || cx.target) + ".png)");
-        exec(cx, tg);
+        var cx = CanvasXpress.instances[1];
+        console.log(logStr);
+        exec(cx, cx.target);
       }
-      var cxs = CanvasXpress.instances;
-      for (var i = 0; i < cxs.length; i++) {
-        var cx = cxs[i];
-
-        cx.setDimensions(obj.width, obj.height);
-        if (obj.input) {
-          try {
-            if (obj.cmd == 'csv') {
+
+      var cx = CanvasXpress.instances[0];
+
+      const extFile = obj.input ? obj.input.split(".").pop() : false;
+
+      const logStr = "Creating " + obj.cmd + " file from " + (obj.input ? obj.input : 'input data') + " (" + obj.output + (obj.target || cx.target) + (extFile == 'html' ? '' : '-1') + "." + obj.cmd + ")";
+
+      cx.setDimensions(obj.width, obj.height);
+
+      if (obj.input) {
+        try {
+          switch (extFile) {
+            case 'html':
+              console.log(logStr);
+              exec(cx, obj.target || cx.target);
+              return;
+            case 'json':
+            case 'csv':
+            case 'text':
+            case 'png':
               cx.dataURL = obj.input;
               cx.remoteTransitionEffect = 'none';
               cx.getDataFromURLOrString(obj.target || cx.target, obj.config, false, false, clbk);
-            } else {
-              console.log("Creating " + (obj.cmd == 'csv' ? 'png' : obj.cmd) + " file from " + (obj.input ? obj.input : 'input data') + " (" + obj.output + (obj.target || cx.target) + "." + obj.cmd + ")");
-              exec(cx, obj.target || cx.target);
-            }
-          } catch (err) {
-            console.error(err);
-          }
-        } else if (obj.data) {
-          try {
-            console.log("Creating " + (obj.cmd == 'csv' ? 'png' : obj.cmd) + " file from " + (obj.input ? obj.input : 'input data') + " (" + obj.output + (obj.target || cx.target) + "." + obj.cmd + ")");
-            cx.updateData(obj.data, false, false, obj.config);
-            exec(cx, obj.target || cx.target);
-            return;
-          } catch (err) {
-            console.error(err);
+              return;
           }
+        } catch (err) {
+          console.error(err);
+        }
+      } else if (obj.data) {
+        try {
+          console.log(logStr);
+          cx.updateData(obj.data, false, false, obj.config);
+          exec(cx, obj.target || cx.target);
+          return;
+        } catch (err) {
+          console.error(err);
         }
-
       }
+
     }
 
-    const client = await page.target().createCDPSession()
+    const client = await page.target().createCDPSession();
+
     await client.send('Page.setDownloadBehavior', {
       behavior: 'allow',
       downloadPath: obj.output
     })
 
-    if (obj.input) {
-      await page.goto(obj.cmd == 'csv' ? defhtml : obj.cmd == 'reproduce' ? obj.input + '?showTransition=false' + (obj.debug ? '&cXH' : '') : obj.input + (obj.debug ? '?cXH' : ''));
-    } else {
-      await page.goto(defhtml);
-    }
+    await page.goto(html);
 
-    await page.waitForTimeout(() => typeof (CanvasXpress) !== undefined && CanvasXpress.ready);
+    await page.waitForFunction('typeof (CanvasXpress) !== undefined && CanvasXpress.ready');
 
     await page.evaluate(`(${func.toString()})(${JSON.stringify(obj)})`);
 
     await setTimeout(() => {
       browser.close();
       spinner.stop();
-    }, obj.cmd == 'csv' || obj.cmd == 'reproduce' ? obj.tmout + 2500 : obj.tmout);
+    }, obj.tmout);
 
   } catch (err) {
 

package/index.js

@@ -28,11 +28,11 @@ module.exports = () => {
 
   let height = args.height || args.y || 800;
 
-  let tmout = args.timeout || args.t || 2500;
+  let tmout = args.timeout || args.q || 2500;
 
-  let data = dat ? JSON.parse(dat) : { "y": { "vars": ["Variable1"], "smps": ["Sample1", "Sample2", "Sample3"], "data": [[55, 44, 33]] } };
+  let data = dat ? JSON.parse(dat) : false;
 
-  let config = conf ? JSON.parse(conf) : { "graphType": "Boxplot", "transposeData": true, "asVariableFactors": ["dose"], "stringSampleFactors": ["dose"], "groupingFactors": ["dose"] };
+  let config = conf ? JSON.parse(conf) : false;
 
   let obj = {
     cmd: cmd,
@@ -71,11 +71,9 @@ module.exports = () => {
 
   switch (cmd) {
 
-    case 'csv':
     case 'png':
     case 'svg':
     case 'json':
-    case 'reproduce':
       if (input || data) {
         require('./cmds/io')(obj);
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvasxpress-cli",
-  "version": "41.3.4",
+  "version": "41.4.6",
   "license": {
     "type": "Dual licensing",
     "url": "https://www.canvasxpress.org/docs/license.html"
@@ -34,6 +34,6 @@
     "figlet": "^1.2.1",
     "minimist": "^1.2.0",
     "ora": "^3.4.0",
-    "puppeteer": "^19.3.0"
+    "puppeteer": "^13.0.0"
   }
 }

package/src/area.json

@@ -0,0 +1,66 @@
+{
+  "version": 41.2,
+  "renderTo": "area1",
+  "data": {
+    "y": {
+      "data": [
+        [10,100,70,130,60]
+      ],
+      "vars": ["A"],
+      "smps": ["S1","S2","S3","S4","S5"]
+    }
+  },
+  "config": {
+    "colorScheme": "CanvasXpress",
+    "graphOrientation": "vertical",
+    "graphType": "Area",
+    "lineType": "rect",
+    "objectBorderColor": false,
+    "showLegend": false,
+    "showSampleNames": true,
+    "showTransition": false,
+    "smpLabelRotate": 90,
+    "smpTitle": "time"
+  },
+  "events": false,
+  "info": false,
+  "afterRenderInit": false,
+  "afterRender": [
+    [
+      "setDimensions",
+      [609,609,true]
+    ]
+  ],
+  "noValidate": true,
+  "factory": {
+    "version": 41.2,
+    "buildDate": "12-05-2022",
+    "client": "MDo6MTo6NDEuMjo6",
+    "siteSrc": false,
+    "href": "http://localhost:8000/examples/area-1.html",
+    "services": "https://www.canvasxpress.org/cgi-bin/services.pl"
+  },
+  "system": {
+    "browser": "Chrome",
+    "browserVersion": "107",
+    "os": "Mac OS",
+    "alt": "⌥",
+    "command": "⌘",
+    "control": "⌃",
+    "shift": "⇧",
+    "isNode": false,
+    "isHeadless": false,
+    "isjQuery": false,
+    "isReveal": false,
+    "isZoom": false,
+    "isIE": false,
+    "isInIframe": false,
+    "isTouchScreen": 0,
+    "isR": false,
+    "isHTMLWidgets": false,
+    "isShiny": false,
+    "isRViewer": false,
+    "isRConsole": false,
+    "isCxplot": false
+  }
+}

package/src/canvasXpress.html

@@ -3,29 +3,26 @@
     <!-- CanvasXpress -->
     <link rel="stylesheet" href="../src/canvasXpress.css" type="text/css"/>
     <script type="text/javascript" src="../src/canvasXpress.js"></script>
-    <!-- Page Script -->
-    <script>
-      onReady(function () {
-        var cx = new CanvasXpress("cX", 
-        	 {
-        	    "y" : {
-        	  	  "vars" : ["Variable1"],
-        	  	  "smps" : ["Sample1", "Sample2", "Sample3"],
-        		  "data" : [[33, 44, 55]]
-                }
-        	 },
-             {
-                "graphOrientation": "vertical",
-                "graphType": "Bar",
-                "title": "Simple Bar graph"
-             }
-        );
-      });
-    </script>
   </head>
   <body>
     <div>
       <canvas id='cX' width='600' height='600' data-responsive='true' data-aspectRatio='1:1'></canvas>
     </div>
+    <!-- Page Script -->
+    <script>
+      var cx = new CanvasXpress("cX", 
+        {
+          "y" : {
+            "vars" : ["Variable1"],
+            "smps" : ["Sample1", "Sample2", "Sample3"],
+            "data" : [[33, 44, 55]]
+          }
+        }, {
+          "graphOrientation": "vertical",
+          "graphType": "Bar",
+          "title": "Simple Bar graph"
+        }
+      );
+    </script>
   </body>
 </html>