@xiee/utils 1.14.28 → 1.14.29

package/js/g2-patches.js

@@ -17,7 +17,7 @@ G2.register("data.column", (options) => {
   };
 });
 
-// modify G2 defaults: font sizes, grid opacity, and point radius
+// modify G2 defaults: font sizes, grid opacity, point radius, shapes, and inset
 (() => {
   const FONT_SCALE = 4 / 3,
     FONT_RE = /[fF]ontSize$/,
@@ -36,11 +36,16 @@ G2.register("data.column", (options) => {
 
   const patchTheme = (theme) => {
     scaleFontSizes(theme);
+    if (
+      isObj(theme.legendCategory) &&
+      typeof theme.legendCategory.itemMarkerSize === "number"
+    )
+      theme.legendCategory.itemMarkerSize *= FONT_SCALE;
     if (isObj(theme.point))
       for (const style of Object.values(theme.point))
-        if (isObj(style) && typeof style.r === "number")
-          style.r = POINT_RADIUS;
+        if (isObj(style) && typeof style.r === "number") style.r = POINT_RADIUS;
     if (isObj(theme.axis)) theme.axis.gridStrokeOpacity = 0.25;
+    theme.inset = 16;
     return theme;
   };
 
@@ -67,7 +72,13 @@ G2.register("data.column", (options) => {
     for (const i of I) value[i] = POINT_RADIUS;
     return [
       I,
-      { ...mark, encode: { ...mark.encode, size: { type: "column", value, visual: true } } },
+      {
+        ...mark,
+        encode: {
+          ...mark.encode,
+          size: { type: "column", value, visual: true },
+        },
+      },
     ];
   };
   CustomMaybeSize.props = {};
@@ -76,4 +87,36 @@ G2.register("data.column", (options) => {
     for (const [i, e] of (lib[key]?.props?.postInference ?? []).entries())
       if (e.type === G2.MaybeSize)
         lib[key].props.postInference[i] = { type: CustomMaybeSize };
+
+  // Reorder point shapes: solid shapes first, then hollow ones.
+  for (const key of ["mark.point", "mark.beeswarm"]) {
+    const mark = lib[key];
+    if (!mark?.props?.shape) continue;
+    mark.props.defaultShape = "point";
+    const newShape = Object.fromEntries(
+      Object.entries(mark.props.shape).sort(([a], [b]) => /^hollow/.test(a) - /^hollow/.test(b))
+    );
+    mark.props.shape = newShape;
+    for (const ch of mark.props.channels || [])
+      if (ch.name === "shape") ch.range = Object.keys(newShape);
+  }
+
+  // Scale hardcoded label font sizes in composite marks.
+  for (const key of ["mark.sankey", "mark.chord", "mark.treemap"]) {
+    const orig = lib[key];
+    if (typeof orig !== "function") continue;
+    const wrapped = function (...args) {
+      const result = orig.apply(this, args);
+      for (const m of Array.isArray(result) ? result : [result]) {
+        if (!Array.isArray(m?.labels)) continue;
+        for (const l of m.labels)
+          if (typeof l?.fontSize === "number") l.fontSize *= FONT_SCALE;
+      }
+      return result;
+    };
+    wrapped.props = orig.props;
+    try {
+      G2.register(key, wrapped);
+    } catch (_) {}
+  }
 })();

package/js/g2-patches.min.js

@@ -1,2 +1,2 @@
-G2.register("data.column",e=>{const{value:t}=e;return async()=>{let e=t;if("string"==typeof t){const o=await fetch(t);e=await o.json()}const o=Object.keys(e);return 0===o.length?[]:e[o[0]].map((t,r)=>o.reduce((t,o)=>(t[o]=e[o][r],t),{}))}}),(()=>{const e=4/3,t=/[fF]ontSize$/,o=e=>e&&"object"==typeof e&&!Array.isArray(e),r=n=>{if(o(n))for(const[s,c]of Object.entries(n))o(c)?r(c):"number"==typeof c&&t.test(s)&&(n[s]=c*e)},n=e=>{if(r(e),o(e.point))for(const t of Object.values(e.point))o(t)&&"number"==typeof t.r&&(t.r=5);return o(e.axis)&&(e.axis.gridStrokeOpacity=.25),e};for(const e of["Light","Dark","Classic","ClassicDark","Academy"]){const t=G2[e];if("function"!=typeof t)continue;let o;G2[e]=(...e)=>o??=n(t(...e));const r="theme."+e[0].toLowerCase()+e.slice(1);try{G2.register(r,G2[e])}catch(e){}}const s=()=>(e,t)=>{if(void 0!==t.encode.size)return[e,t];const o=[];for(const t of e)o[t]=5;return[e,{...t,encode:{...t.encode,size:{type:"column",value:o,visual:!0}}}]};s.props={};const c=G2.corelib();for(const e of["mark.point","mark.beeswarm"])for(const[t,o]of(c[e]?.props?.postInference??[]).entries())o.type===G2.MaybeSize&&(c[e].props.postInference[t]={type:s})})();
+G2.register("data.column",e=>{const{value:t}=e;return async()=>{let e=t;if("string"==typeof t){const o=await fetch(t);e=await o.json()}const o=Object.keys(e);return 0===o.length?[]:e[o[0]].map((t,r)=>o.reduce((t,o)=>(t[o]=e[o][r],t),{}))}}),(()=>{const e=4/3,t=/[fF]ontSize$/,o=e=>e&&"object"==typeof e&&!Array.isArray(e),r=n=>{if(o(n))for(const[s,c]of Object.entries(n))o(c)?r(c):"number"==typeof c&&t.test(s)&&(n[s]=c*e)},n=t=>{if(r(t),o(t.legendCategory)&&"number"==typeof t.legendCategory.itemMarkerSize&&(t.legendCategory.itemMarkerSize*=e),o(t.point))for(const e of Object.values(t.point))o(e)&&"number"==typeof e.r&&(e.r=5);return o(t.axis)&&(t.axis.gridStrokeOpacity=.25),t.inset=16,t};for(const e of["Light","Dark","Classic","ClassicDark","Academy"]){const t=G2[e];if("function"!=typeof t)continue;let o;G2[e]=(...e)=>o??=n(t(...e));const r="theme."+e[0].toLowerCase()+e.slice(1);try{G2.register(r,G2[e])}catch(e){}}const s=()=>(e,t)=>{if(void 0!==t.encode.size)return[e,t];const o=[];for(const t of e)o[t]=5;return[e,{...t,encode:{...t.encode,size:{type:"column",value:o,visual:!0}}}]};s.props={};const c=G2.corelib();for(const e of["mark.point","mark.beeswarm"])for(const[t,o]of(c[e]?.props?.postInference??[]).entries())o.type===G2.MaybeSize&&(c[e].props.postInference[t]={type:s});for(const e of["mark.point","mark.beeswarm"]){const t=c[e];if(!t?.props?.shape)continue;t.props.defaultShape="point";const o=Object.fromEntries(Object.entries(t.props.shape).sort(([e],[t])=>/^hollow/.test(e)-/^hollow/.test(t)));t.props.shape=o;for(const e of t.props.channels||[])"shape"===e.name&&(e.range=Object.keys(o))}for(const t of["mark.sankey","mark.chord","mark.treemap"]){const o=c[t];if("function"!=typeof o)continue;const r=function(...t){const r=o.apply(this,t);for(const t of Array.isArray(r)?r:[r])if(Array.isArray(t?.labels))for(const o of t.labels)"number"==typeof o?.fontSize&&(o.fontSize*=e);return r};r.props=o.props;try{G2.register(t,r)}catch(e){}}})();
 //# sourceMappingURL=g2-patches.min.js.map

package/js/g2-patches.min.js.map

@@ -1 +1 @@
-{"version":3,"names":["G2","register","options","value","async","d","resp","fetch","json","keys","Object","length","map","_","i","reduce","row","key","FONT_SCALE","FONT_RE","isObj","v","Array","isArray","scaleFontSizes","obj","entries","test","patchTheme","theme","point","style","values","r","axis","gridStrokeOpacity","name","original","cache","args","toLowerCase","slice","CustomMaybeSize","I","mark","undefined","encode","size","type","visual","props","lib","corelib","e","postInference","MaybeSize"],"sources":["g2-patches.js"],"mappings":"AACAA,GAAGC,SAAS,cAAgBC,IAC1B,MAAMC,MAAEA,GAAUD,EAClB,OAAOE,UACL,IAAIC,EAAIF,EAER,GAAqB,iBAAVA,EAAoB,CAC7B,MAAMG,QAAaC,MAAMJ,GACzBE,QAAUC,EAAKE,MACjB,CACA,MAAMC,EAAOC,OAAOD,KAAKJ,GACzB,OAAoB,IAAhBI,EAAKE,OAAqB,GAEvBN,EAAEI,EAAK,IAAIG,IAAI,CAACC,EAAGC,IACxBL,EAAKM,OAAO,CAACC,EAAKC,KAAUD,EAAIC,GAAOZ,EAAEY,GAAKH,GAAKE,GAAM,CAAC,OAMhE,MACE,MAAME,EAAa,EAAI,EACrBC,EAAU,eAGNC,EAASC,GAAMA,GAAkB,iBAANA,IAAmBC,MAAMC,QAAQF,GAE5DG,EAAkBC,IACtB,GAAKL,EAAMK,GACX,IAAK,MAAOR,EAAKd,KAAUO,OAAOgB,QAAQD,GACpCL,EAAMjB,GAAQqB,EAAerB,GACP,iBAAVA,GAAsBgB,EAAQQ,KAAKV,KACjDQ,EAAIR,GAAOd,EAAQe,IAInBU,EAAcC,IAElB,GADAL,EAAeK,GACXT,EAAMS,EAAMC,OACd,IAAK,MAAMC,KAASrB,OAAOsB,OAAOH,EAAMC,OAClCV,EAAMW,IAA6B,iBAAZA,EAAME,IAC/BF,EAAME,EAlBG,GAoBf,OADIb,EAAMS,EAAMK,QAAOL,EAAMK,KAAKC,kBAAoB,KAC/CN,GAGT,IAAK,MAAMO,IAAQ,CAAC,QAAS,OAAQ,UAAW,cAAe,WAAY,CACzE,MAAMC,EAAWrC,GAAGoC,GACpB,GAAwB,mBAAbC,EAAyB,SACpC,IAAIC,EACJtC,GAAGoC,GAAQ,IAAIG,IAAUD,IAAUV,EAAWS,KAAYE,IAG1D,MAAMtB,EAAM,SAAWmB,EAAK,GAAGI,cAAgBJ,EAAKK,MAAM,GAC1D,IACEzC,GAAGC,SAASgB,EAAKjB,GAAGoC,GACtB,CAAE,MAAOvB,GAAI,CACf,CAMA,MAAM6B,EAAkB,IAAM,CAACC,EAAGC,KAChC,QAAyBC,IAArBD,EAAKE,OAAOC,KAAoB,MAAO,CAACJ,EAAGC,GAC/C,MAAMzC,EAAQ,GACd,IAAK,MAAMW,KAAK6B,EAAGxC,EAAMW,GA3CV,EA4Cf,MAAO,CACL6B,EACA,IAAKC,EAAME,OAAQ,IAAKF,EAAKE,OAAQC,KAAM,CAAEC,KAAM,SAAU7C,QAAO8C,QAAQ,OAGhFP,EAAgBQ,MAAQ,CAAC,EACzB,MAAMC,EAAMnD,GAAGoD,UACf,IAAK,MAAMnC,IAAO,CAAC,aAAc,iBAC/B,IAAK,MAAOH,EAAGuC,KAAOF,EAAIlC,IAAMiC,OAAOI,eAAiB,IAAI5B,UACtD2B,EAAEL,OAAShD,GAAGuD,YAChBJ,EAAIlC,GAAKiC,MAAMI,cAAcxC,GAAK,CAAEkC,KAAMN,GACjD,EA1DD","ignoreList":[]}
+{"version":3,"names":["G2","register","options","value","async","d","resp","fetch","json","keys","Object","length","map","_","i","reduce","row","key","FONT_SCALE","FONT_RE","isObj","v","Array","isArray","scaleFontSizes","obj","entries","test","patchTheme","theme","legendCategory","itemMarkerSize","point","style","values","r","axis","gridStrokeOpacity","inset","name","original","cache","args","toLowerCase","slice","CustomMaybeSize","I","mark","undefined","encode","size","type","visual","props","lib","corelib","e","postInference","MaybeSize","shape","defaultShape","newShape","fromEntries","sort","a","b","ch","channels","range","orig","wrapped","result","apply","this","m","labels","l","fontSize"],"sources":["g2-patches.js"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiee/utils",
-  "version": "1.14.28",
+  "version": "1.14.29",
   "description": "Miscellaneous tools and utilities to manipulate HTML pages",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"