@xiee/utils 1.14.26 → 1.14.28

package/js/g2-patches.js

@@ -17,11 +17,11 @@ G2.register("data.column", (options) => {
   };
 });
 
-// modify G2's theme default font sizes and point sizes
+// modify G2 defaults: font sizes, grid opacity, and point radius
 (() => {
   const FONT_SCALE = 4 / 3,
-    POINT_RADIUS = 5,
-    FONT_RE = /[fF]ontSize$/;
+    FONT_RE = /[fF]ontSize$/,
+    POINT_RADIUS = 5;
 
   const isObj = (v) => v && typeof v === "object" && !Array.isArray(v);
 
@@ -38,7 +38,9 @@ G2.register("data.column", (options) => {
     scaleFontSizes(theme);
     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;
     return theme;
   };
 
@@ -54,4 +56,24 @@ G2.register("data.column", (options) => {
       G2.register(key, G2[name]);
     } catch (_) {}
   }
+
+  // Patch default point/symbol size. G2's MaybeSize transform hardcodes 3 as
+  // the constant visual size for point marks when no explicit size encoding is
+  // provided. The theme point.*.r values above are fallbacks that MaybeSize
+  // shadows, so we must also replace MaybeSize in each mark's postInference.
+  const CustomMaybeSize = () => (I, mark) => {
+    if (mark.encode.size !== undefined) return [I, mark];
+    const value = [];
+    for (const i of I) value[i] = POINT_RADIUS;
+    return [
+      I,
+      { ...mark, encode: { ...mark.encode, size: { type: "column", value, visual: true } } },
+    ];
+  };
+  CustomMaybeSize.props = {};
+  const lib = G2.corelib();
+  for (const key of ["mark.point", "mark.beeswarm"])
+    for (const [i, e] of (lib[key]?.props?.postInference ?? []).entries())
+      if (e.type === G2.MaybeSize)
+        lib[key].props.postInference[i] = { type: CustomMaybeSize };
 })();

package/js/g2-patches.min.js

@@ -1,2 +1,2 @@
-G2.register("data.column",t=>{const{value:e}=t;return async()=>{let t=e;if("string"==typeof e){const o=await fetch(e);t=await o.json()}const o=Object.keys(t);return 0===o.length?[]:t[o[0]].map((e,r)=>o.reduce((e,o)=>(e[o]=t[o][r],e),{}))}}),(()=>{const t=4/3,e=/[fF]ontSize$/,o=t=>t&&"object"==typeof t&&!Array.isArray(t),r=n=>{if(o(n))for(const[c,s]of Object.entries(n))o(s)?r(s):"number"==typeof s&&e.test(c)&&(n[c]=s*t)},n=t=>{if(r(t),o(t.point))for(const e of Object.values(t.point))o(e)&&"number"==typeof e.r&&(e.r=5);return t};for(const t of["Light","Dark","Classic","ClassicDark","Academy"]){const e=G2[t];if("function"!=typeof e)continue;let o;G2[t]=(...t)=>o??=n(e(...t));const r="theme."+t[0].toLowerCase()+t.slice(1);try{G2.register(r,G2[t])}catch(t){}}})();
+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})})();
 //# 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","name","original","cache","args","toLowerCase","slice"],"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,EAErBC,EAAU,eAENC,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,IAAgBF,EAAME,EAlB5C,GAmBf,OAAOJ,GAGT,IAAK,MAAMK,IAAQ,CAAC,QAAS,OAAQ,UAAW,cAAe,WAAY,CACzE,MAAMC,EAAWnC,GAAGkC,GACpB,GAAwB,mBAAbC,EAAyB,SACpC,IAAIC,EACJpC,GAAGkC,GAAQ,IAAIG,IAAUD,IAAUR,EAAWO,KAAYE,IAG1D,MAAMpB,EAAM,SAAWiB,EAAK,GAAGI,cAAgBJ,EAAKK,MAAM,GAC1D,IACEvC,GAAGC,SAASgB,EAAKjB,GAAGkC,GACtB,CAAE,MAAOrB,GAAI,CACf,CACD,EApCD","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","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":[]}

package/package.json

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