Load base option from file and add it as param

Author: codebarista

README.md

@@ -70,6 +70,7 @@ Overwrite the default attributes from config file:
 
 ```php
 $action = StoreChartImage::make()
+    ->baseOptionPath(resource_path('echarts/base-option.js')) // base chart to be merged
     ->mimeType(MimeTypes::PNG) // PNG, JPG, PDF, SVG
     ->optimize(true) // optimize with pngcrush
     ->filePath('app/public') // storage path

resources/echarts/base-option.js

@@ -0,0 +1,11 @@
+export const option = {
+    animation: false,
+    tooltip: {},
+    xAxis: {
+        type: 'category',
+    },
+    yAxis: {
+        type: 'value'
+    },
+    series: {}
+};

src/Actions/StoreChartImage.php

@@ -15,6 +15,8 @@ class StoreChartImage
 {
     use Makeable;
 
+    private string $baseOptionPath;
+
     private MimeTypes $mimeType;
 
     private string $fileName;
@@ -29,6 +31,13 @@ class StoreChartImage
 
     private int $height;
 
+    public function baseOptionPath(string $value): static
+    {
+        $this->baseOptionPath = $value;
+
+        return $this;
+    }
+
     public function mimeType(MimeTypes $value): static
     {
         $this->mimeType = $value;
@@ -73,6 +82,7 @@ public function height(int $value): static
 
     public function __construct()
     {
+        $this->baseOptionPath(codebarista_path('resources/echarts/base-option.js'));
         $this->filePath(config('echarts.storage.path', 'app/public/vendor/echarts'));
         $this->mimeType(config('echarts.canvas.mime_type', MimeTypes::PNG));
         $this->optimize(config('echarts.optimize.png', false));
@@ -84,10 +94,10 @@ public function __construct()
     /**
      * @throws StoreChartImageException|Throwable
      */
-    public function handle(array $options): string
+    public function handle(array $option): string
     {
         $process = Process::path(codebarista_path('tools/echarts'))
-            ->run($this->getCommand($options));
+            ->run($this->getCommand($option));
 
         throw_if($process->failed(),
             new StoreChartImageException($process->errorOutput()));
@@ -99,7 +109,7 @@ public function handle(array $options): string
         return $this->fullPath;
     }
 
-    private function getCommand(array $options): array
+    private function getCommand(array $option): array
     {
         $filePath = storage_path($this->filePath);
 
@@ -116,7 +126,8 @@ private function getCommand(array $options): array
 
         return [
             'node', 'render.js',
-            '--options', Arr::toJson($options),
+            '--baseOptionPath', $this->baseOptionPath,
+            '--option', Arr::toJson($option),
             '--type', $this->mimeType->value,
             '--path', $this->fullPath,
             '--height', $this->height,

tools/echarts/package.json

@@ -1,13 +1,14 @@
 {
     "name": "laravel-echarts",
     "type": "module",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Create images from echarts",
     "main": "render.js",
     "license": "MIT",
     "dependencies": {
         "canvas": "^2.11.2",
         "echarts": "^5.4.3",
+        "lodash": "^4.17.21",
         "yargs": "^17.7.2"
     }
 }

tools/echarts/render.js

@@ -1,39 +1,26 @@
 'use strict';
 
 import {createCanvas} from 'canvas';
+import * as echarts from 'echarts';
 import {writeFile} from 'node:fs';
-// import echarts from 'echarts';
-import echarts from 'echarts/dist/echarts.js';
 import yargs from 'yargs';
-
-echarts.setPlatformAPI(createCanvas);
+import _ from 'lodash';
 
 const argv = yargs(process.argv.slice(2)).argv;
 
 const type = argv.type.includes('svg') ? 'svg' : argv.type.split('/').pop();
 const canvas = createCanvas(argv.width, argv.height, type);
 const chart = echarts.init(canvas);
 
-const options = JSON.parse(argv.options);
-const defaults = {
-    animation: false,
-    tooltip: {},
-    xAxis: {
-        type: 'category',
-    },
-    yAxis: {
-        type: 'value'
-    },
-    series: {}
-};
-
-chart.setOption({
-    ...defaults,
-    ...options
-});
+const {option} = await import(argv.baseOptionPath)
+const params = JSON.parse(argv.option);
+
+chart.setOption(_.merge(option, params));
 
 const buffer = canvas.toBuffer(argv.type);
 
+echarts.setPlatformAPI(canvas);
+
 writeFile(argv.path, buffer, (err) => {
     if (err) throw err;
 });