@rowsncolumns/charts 28.1.17 → 28.1.18

package/dist/esm/utils/echarts-gl-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"echarts-gl-loader.d.ts","sourceRoot":"","sources":["../../../utils/echarts-gl-loader.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAK7E,eAAO,MAAM,iBAAiB,QAAO,kBAA2B,CAAC;AAEjE;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAO,OAAO,CAAC,OAAO,CAyB/C,CAAC;AAEF,sDAAsD;AACtD,eAAO,MAAM,8BAA8B,QAAO,IAGjD,CAAC"}
+{"version":3,"file":"echarts-gl-loader.d.ts","sourceRoot":"","sources":["../../../utils/echarts-gl-loader.ts"],"names":[],"mappings":"AAqBA,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAK7E,eAAO,MAAM,iBAAiB,QAAO,kBAA2B,CAAC;AAgBjE;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,QAAQ,OAAO,KAAG,IAUrD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAO,OAAO,CAAC,OAAO,CA8B/C,CAAC;AAEF,sDAAsD;AACtD,eAAO,MAAM,8BAA8B,QAAO,IAGjD,CAAC"}

package/dist/esm/utils/echarts-gl-loader.js

@@ -7,12 +7,47 @@
  * draws the 2-D fallback immediately, and upgrades to 3-D when the module
  * resolves. A failed import latches the "failed" state so the renderer
  * keeps the 2-D fallback without retrying on every update.
+ *
+ * A page whose Content-Security-Policy has no `'unsafe-eval'` is treated
+ * the same way: echarts-gl's `EffectCompositor` makes claygl compile its
+ * size expressions with `new Function`, which the browser blocks there
+ * (`EvalError`, surfaced by claygl as "Invalid expression."). The import
+ * itself still succeeds, so the loader probes `new Function` once before
+ * importing and latches "failed" instead of letting `setOption` throw
+ * later (rowsncolumns/spreadsheet#1187).
  */
 import { VisualMapComponent } from "echarts/components";
 import * as echarts from "echarts/core";
 let state = "unloaded";
 let loadPromise = null;
 export const getEchartsGlState = () => state;
+/**
+ * True when the page lets scripts construct functions from source — what
+ * claygl needs for every GL chart. False under a CSP whose `script-src`
+ * lacks `'unsafe-eval'`.
+ */
+const canEvaluateCode = () => {
+    try {
+        new Function("");
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+/**
+ * Record that the loaded module failed at render time (echarts-gl threw
+ * from `setOption`), so the renderer keeps the 2-D fallback and never
+ * retries 3-D for the rest of the page's lifetime. Warns once per page.
+ */
+export const markEchartsGlFailed = (error) => {
+    if (state !== "failed") {
+        // eslint-disable-next-line no-console
+        console.warn("echarts-gl failed to render a 3-D chart; 3-D charts render as their 2-D fallback on this page.", error);
+    }
+    state = "failed";
+    loadPromise = Promise.resolve(false);
+};
 /**
  * Kick off (or join) the echarts-gl dynamic import and register the 3-D
  * charts/components the renderer uses. Resolves true when 3-D rendering is
@@ -20,6 +55,11 @@ export const getEchartsGlState = () => state;
  */
 export const loadEchartsGl = () => {
     if (!loadPromise) {
+        if (!canEvaluateCode()) {
+            state = "failed";
+            loadPromise = Promise.resolve(false);
+            return loadPromise;
+        }
         state = "loading";
         loadPromise = Promise.all([
             import("echarts-gl/charts"),

package/dist/esm/utils/three-d.d.ts

@@ -44,14 +44,25 @@ export declare const normalize3DSourceType: (sourceChartType?: string | null) =>
 export declare const is3DSpec: (spec: {
     sourceChartType?: string | null;
 } | null | undefined) => boolean;
+/** Host opt-out of the WebGL pipeline (`enable3D` on the renderer / editor). */
+export type ThreeDRenderOptions = {
+    /**
+     * `false` keeps every spec on its 2-D fallback: echarts-gl is never
+     * loaded and the Chart editor offers no echarts-gl preset. The spec's
+     * `sourceChartType` is untouched, so the xlsx export still writes the
+     * 3-D chart (rowsncolumns/spreadsheet#1187). Default `true`.
+     */
+    enable3D?: boolean;
+};
 /**
  * Map a `sourceChartType` token to the echarts-gl series kind it renders
  * as, or null when the 3-D pipeline should not run:
  * - PIE_3D — echarts-gl has no pie3D, so the 2-D pie fallback stays.
  * - AREA_3D — echarts-gl has no area3D; rendered as line3D.
  * - non-3-D / unknown tokens.
+ * - any token when the host turned 3-D off (`enable3D: false`).
  */
-export declare const resolve3DRenderKind: (sourceChartType?: string | null) => ThreeDRenderKind | null;
+export declare const resolve3DRenderKind: (sourceChartType?: string | null, options?: ThreeDRenderOptions) => ThreeDRenderKind | null;
 /** Excel's Contour: the surface grid seen from above, as a flat heatmap. */
 export declare const isContourSpec: (spec: {
     sourceChartType?: string | null;

package/dist/esm/utils/three-d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"three-d.d.ts","sourceRoot":"","sources":["../../../utils/three-d.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,QAAA,MAAM,cAAc,8EAOV,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,wDAAwD;AACxD,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AAI9D;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,kBAAkB,MAAM,GAAG,IAAI,KAC9B,gBAAgB,GAAG,IAIrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GACnB,MAAM;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KAC3D,OAAgE,CAAC;AAEpE;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,kBAAkB,MAAM,GAAG,IAAI,KAC9B,gBAAgB,GAAG,IAcrB,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,aAAa,GACxB,MAAM;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KAC3D,OAAqE,CAAC;AAEzE,uFAAuF;AACvF,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,iBAAiB,EAAE,KAC1B,YAAY,EAcd,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,MAAM,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;CACvC,CAAC;AAEF,wDAAwD;AACxD,MAAM,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAKnD,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,GAAI,QAAQ,iBAAiB,EAAE,KAAG,MACO,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,iBAAiB,EAAE,KAAG,WAAW,EAUvE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,iBAAiB,EAAE,KAC1B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,WAAW,EAAE,CAAA;CAAE,EASpC,CAAC;AAEL;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,iBAAiB,EAAE,KAC1B,WAAW,EAcb,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,WAAW,EAAE,KAAG,CAAC,MAAM,EAAE,MAAM,CASrE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAY/C,CAAC"}
+{"version":3,"file":"three-d.d.ts","sourceRoot":"","sources":["../../../utils/three-d.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,QAAA,MAAM,cAAc,8EAOV,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,wDAAwD;AACxD,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AAI9D;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAChC,kBAAkB,MAAM,GAAG,IAAI,KAC9B,gBAAgB,GAAG,IAIrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GACnB,MAAM;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KAC3D,OAAgE,CAAC;AAEpE,gFAAgF;AAChF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,GAC9B,kBAAkB,MAAM,GAAG,IAAI,EAC/B,UAAU,mBAAmB,KAC5B,gBAAgB,GAAG,IAerB,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,aAAa,GACxB,MAAM;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KAC3D,OAAqE,CAAC;AAEzE,uFAAuF;AACvF,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,iBAAiB,EAAE,KAC1B,YAAY,EAcd,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,MAAM,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;CACvC,CAAC;AAEF,wDAAwD;AACxD,MAAM,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAKnD,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,GAAI,QAAQ,iBAAiB,EAAE,KAAG,MACO,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,iBAAiB,EAAE,KAAG,WAAW,EAUvE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,iBAAiB,EAAE,KAC1B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,WAAW,EAAE,CAAA;CAAE,EASpC,CAAC;AAEL;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,iBAAiB,EAAE,KAC1B,WAAW,EAcb,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,WAAW,EAAE,KAAG,CAAC,MAAM,EAAE,MAAM,CASrE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAY/C,CAAC"}

package/dist/esm/utils/three-d.js

@@ -58,8 +58,11 @@ export const is3DSpec = (spec) => normalize3DSourceType(spec?.sourceChartType) !
  * - PIE_3D — echarts-gl has no pie3D, so the 2-D pie fallback stays.
  * - AREA_3D — echarts-gl has no area3D; rendered as line3D.
  * - non-3-D / unknown tokens.
+ * - any token when the host turned 3-D off (`enable3D: false`).
  */
-export const resolve3DRenderKind = (sourceChartType) => {
+export const resolve3DRenderKind = (sourceChartType, options) => {
+    if (options?.enable3D === false)
+        return null;
     switch (normalize3DSourceType(sourceChartType)) {
         case "BAR_3D":
             return "bar3D";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/charts",
-  "version": "28.1.17",
+  "version": "28.1.18",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",