@symbo.ls/scratch 2.11.225 → 2.11.227

package/dist/cjs/system/typography.js

@@ -1429,6 +1429,7 @@ var defaultProps = {
   h1Matches: 6,
   lineHeight: 1.5,
   subSequence: true,
+  mediaRegenerate: false,
   unit: "em",
   templates: {},
   sequence: {},
@@ -1484,6 +1485,7 @@ var defaultProps2 = {
   ratio: SEQUENCE.phi,
   range: [-5, 15],
   subSequence: true,
+  mediaRegenerate: false,
   unit: "em",
   sequence: {},
   scales: {},
@@ -1511,6 +1513,7 @@ var defaultProps3 = {
   type: "timing",
   ratio: SEQUENCE["perfect-fourth"],
   range: [-3, 12],
+  mediaRegenerate: false,
   unit: "ms",
   sequence: {},
   scales: {},
@@ -1627,45 +1630,77 @@ var numToLetterMap = {
   19: "T"
 };
 var setSequenceValue = (props, sequenceProps) => {
-  const { key, variable, value, scaling, index } = props;
+  const { key, variable, value, scaling, index, scalingVariable } = props;
   sequenceProps.sequence[key] = {
     key,
     decimal: ~~(value * 100) / 100,
     val: ~~value,
     scaling,
     index,
+    scalingVariable,
     variable
   };
   sequenceProps.scales[key] = scaling;
   sequenceProps.vars[variable] = scaling + sequenceProps.unit;
 };
+var setScalingVar = (key, sequenceProps) => {
+  const { type } = sequenceProps;
+  if (key === 0)
+    return "1em";
+  const prefix = "--" + (type && type.replace(".", "-"));
+  const ratioVar = `${prefix}-ratio`;
+  if (key > 0) {
+    const prevLetterKey = numToLetterMap[key - 1];
+    return `calc(var(${prefix}-${prevLetterKey}) * var(${ratioVar}))`;
+  }
+  if (key < 0) {
+    const nextLetterKey = numToLetterMap[key + 1];
+    return `calc(var(${prefix}-${nextLetterKey}) / var(${ratioVar}))`;
+  }
+};
+var setSubScalingVar = (index, arr, variable, sequenceProps) => {
+  const { type } = sequenceProps;
+  const skipMiddle = index === 2 && arr.length === 2;
+  const indexMapWithLength = skipMiddle ? index + 1 : index;
+  const prefix = "--" + (type && type.replace(".", "-"));
+  const subRatioVarPrefix = `${prefix}-sub-ratio-`;
+  return `calc(var(${variable}) * var(${subRatioVarPrefix + indexMapWithLength}))`;
+};
+var getSubratioDifference = (base, ratio) => {
+  const diff = base * ratio - base;
+  const subRatio = diff / 1.618;
+  const first = base * ratio - subRatio;
+  const second = base + subRatio;
+  const middle = (first + second) / 2;
+  return [first, middle, second];
+};
+var getSubratio = (base, ratio) => {
+  return getSubratioDifference(base, ratio).map((v) => v / base);
+};
 var generateSubSequence = (props, sequenceProps) => {
   const { key, base, value, ratio, variable, index } = props;
   const next = value * ratio;
-  const diff = next - value;
-  const smallscale = diff / 1.618;
-  const valueRounded = ~~value;
-  const nextRounded = ~~next;
-  const diffRounded = nextRounded - valueRounded;
-  let arr = [];
-  const first = next - smallscale;
-  const second = value + smallscale;
-  const middle = (first + second) / 2;
+  const diffRounded = ~~next - ~~value;
+  let arr;
+  const [first, middle, second] = getSubratioDifference(value, ratio);
   if (diffRounded > 16)
     arr = [first, middle, second];
   else
     arr = [first, second];
-  arr.map((v, k) => {
+  arr.forEach((v, k) => {
     const scaling = ~~(v / base * 1e3) / 1e3;
     const newVar = variable + (k + 1);
+    const newIndex = index + (k + 1) / 10;
+    const scalingVariable = setSubScalingVar(k + 1, arr, variable, sequenceProps);
     const props2 = {
       key: key + (k + 1),
       variable: newVar,
       value: v,
       scaling,
-      index: index + (k + 1) / 10
+      scalingVariable,
+      index: newIndex
     };
-    return setSequenceValue(props2, sequenceProps);
+    setSequenceValue(props2, sequenceProps);
   });
 };
 var switchSequenceOnNegative = (key, base, ratio) => {
@@ -1681,12 +1716,14 @@ var generateSequence = (sequenceProps) => {
     const value = switchSequenceOnNegative(key, base, ratio);
     const scaling = ~~(value / base * 100) / 100;
     const variable = prefix + letterKey;
+    const scalingVariable = setScalingVar(key, sequenceProps);
     const props = {
       key: letterKey,
       variable,
       value,
       base,
       scaling,
+      scalingVariable,
       ratio,
       index: key
     };
@@ -1770,68 +1807,122 @@ var findHeadings = (propertyNames) => {
 
 // src/utils/var.js
 var import_utils7 = __toESM(require_cjs(), 1);
-var applySequenceVars = (props, mediaName, options = {}) => {
+var applyGlobalVars = (vars, obj, options) => {
   const CONFIG2 = getActiveConfig();
-  const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
-  const unit = props.unit || UNIT2.default;
-  const { sequence, scales } = props;
+  const { UNIT: UNIT2 } = CONFIG2;
+  const unit = obj.unit || UNIT2.default;
+  const { base, ratio, type } = obj;
+  const prefix = "--" + (type && type.replace(".", "-"));
+  vars[`${prefix}-base`] = base;
+  vars[`${prefix}-unit`] = unit;
+  const ratioVar = `${prefix}-ratio`;
+  vars[ratioVar] = ratio;
+  const [first, middle, second] = getSubratio(base, ratio);
+  vars[`${prefix}-sub-ratio-1`] = first;
+  vars[`${prefix}-sub-ratio-2`] = middle;
+  vars[`${prefix}-sub-ratio-3`] = second;
+};
+var applySequenceVars = (FACTORY2, options = {}) => {
+  const CONFIG2 = getActiveConfig();
+  const { UNIT: UNIT2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
+  const unit = FACTORY2.unit || UNIT2.default;
+  const { mediaRegenerate, sequence, scales } = FACTORY2;
+  if (!mediaRegenerate) {
+    applyGlobalVars(CSS_VARS2, FACTORY2, options);
+  }
   for (const key in sequence) {
     const item = sequence[key];
-    const value = (props.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
-    if (mediaName) {
-      const query = MEDIA2[mediaName];
-      if (!query) {
-        if (CONFIG2.verbose)
-          console.warn("Can't find query ", query);
-      }
-      let underMediaQuery = CSS_VARS2[`@media ${query}`];
-      if (!underMediaQuery)
-        underMediaQuery = CSS_VARS2[`@media ${query}`] = {};
-      underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
-      CSS_VARS2[item.variable + "_" + mediaName] = value;
+    const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
+    if (!mediaRegenerate) {
+      CSS_VARS2[item.variable + "_default"] = value;
+      CSS_VARS2[item.variable] = item.scalingVariable;
+      continue;
+    }
+    if (options.useDefault === false) {
+      CSS_VARS2[item.variable] = value;
     } else {
-      if (options.useDefault === false) {
-        CSS_VARS2[item.variable] = value;
-      } else {
-        CSS_VARS2[item.variable + "_default"] = value;
-        CSS_VARS2[item.variable] = `var(${item.variable + "_default"})`;
-      }
+      CSS_VARS2[item.variable + "_default"] = value;
+      CSS_VARS2[item.variable] = `var(${item.variable + "_default"})`;
     }
   }
 };
+var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
+  const CONFIG2 = getActiveConfig();
+  const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
+  const mediaName = media.slice(1);
+  const unit = FACTORY2.unit || UNIT2.default;
+  const { mediaRegenerate } = FACTORY2;
+  const { sequence, scales } = FACTORY2[media];
+  const query = MEDIA2[mediaName];
+  if (!query && CONFIG2.verbose)
+    console.warn("Can't find media query ", query);
+  if (!mediaRegenerate) {
+    let underMediaQuery = CSS_VARS2[`@media ${query}`];
+    if (!underMediaQuery)
+      underMediaQuery = CSS_VARS2[`@media ${query}`] = {};
+    applyGlobalVars(underMediaQuery, FACTORY2[media], options);
+    return;
+  }
+  for (const key in sequence) {
+    const item = sequence[key];
+    const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
+    if (!query && CONFIG2.verbose)
+      console.warn("Can't find query ", query);
+    let underMediaQuery = CSS_VARS2[`@media ${query}`];
+    if (!underMediaQuery)
+      underMediaQuery = CSS_VARS2[`@media ${query}`] = {};
+    underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
+    CSS_VARS2[item.variable + "_" + mediaName] = value;
+  }
+  console.log(CSS_VARS2);
+};
 
 // src/utils/sprite.js
 var import_utils8 = __toESM(require_cjs(), 1);
 
 // src/system/typography.js
-var runThroughMedia = (props) => {
+var runThroughMedia = (FACTORY2) => {
   const CONFIG2 = getActiveConfig();
   const { TYPOGRAPHY: TYPOGRAPHY2, MEDIA: MEDIA2 } = CONFIG2;
-  for (const prop in props) {
-    const mediaProps = props[prop];
-    if (prop.slice(0, 1) === "@") {
-      const { type, base, ratio, range, subSequence, h1Matches, unit } = props;
-      (0, import_utils9.merge)(mediaProps, {
-        type,
-        base,
-        ratio,
-        range,
-        subSequence,
-        h1Matches,
-        unit,
-        sequence: {},
-        scales: {},
-        templates: {},
-        vars: {}
-      });
-      generateSequence(mediaProps);
-      const mediaName = prop.slice(1);
-      applySequenceVars(mediaProps, mediaName);
-      const query = MEDIA2[mediaName];
-      TYPOGRAPHY2.templates[`@media screen and ${query}`] = {
-        fontSize: mediaProps.base / TYPOGRAPHY2.browserDefault + unit
-      };
+  for (const prop in FACTORY2) {
+    const isPropMedia = prop.slice(0, 1) === "@";
+    const mediaValue = FACTORY2[prop];
+    if (!isPropMedia)
+      continue;
+    const { mediaRegenerate } = FACTORY2;
+    const mediaName = prop.slice(1);
+    const {
+      type,
+      base,
+      ratio,
+      range,
+      subSequence,
+      h1Matches,
+      unit
+    } = FACTORY2;
+    (0, import_utils9.merge)(mediaValue, {
+      type,
+      base,
+      ratio,
+      range,
+      subSequence,
+      h1Matches,
+      unit,
+      sequence: {},
+      scales: {},
+      templates: {},
+      vars: {}
+    });
+    const query = MEDIA2[mediaName];
+    TYPOGRAPHY2.templates[`@media screen and ${query}`] = {
+      fontSize: mediaValue.base / TYPOGRAPHY2.browserDefault + unit
+    };
+    if (!mediaRegenerate) {
+      applyMediaSequenceVars(FACTORY2, prop);
+      continue;
     }
+    generateSequence(mediaValue);
+    applyMediaSequenceVars(FACTORY2, prop);
   }
 };
 var applyHeadings = (props) => {

package/dist/cjs/transforms/index.js

@@ -1434,6 +1434,7 @@ var defaultProps = {
   h1Matches: 6,
   lineHeight: 1.5,
   subSequence: true,
+  mediaRegenerate: false,
   unit: "em",
   templates: {},
   sequence: {},
@@ -1489,6 +1490,7 @@ var defaultProps2 = {
   ratio: SEQUENCE.phi,
   range: [-5, 15],
   subSequence: true,
+  mediaRegenerate: false,
   unit: "em",
   sequence: {},
   scales: {},
@@ -1516,6 +1518,7 @@ var defaultProps3 = {
   type: "timing",
   ratio: SEQUENCE["perfect-fourth"],
   range: [-3, 12],
+  mediaRegenerate: false,
   unit: "ms",
   sequence: {},
   scales: {},
@@ -1742,45 +1745,74 @@ var numToLetterMap = {
   19: "T"
 };
 var setSequenceValue = (props, sequenceProps) => {
-  const { key, variable, value, scaling, index } = props;
+  const { key, variable, value, scaling, index, scalingVariable } = props;
   sequenceProps.sequence[key] = {
     key,
     decimal: ~~(value * 100) / 100,
     val: ~~value,
     scaling,
     index,
+    scalingVariable,
     variable
   };
   sequenceProps.scales[key] = scaling;
   sequenceProps.vars[variable] = scaling + sequenceProps.unit;
 };
+var setScalingVar = (key, sequenceProps) => {
+  const { type } = sequenceProps;
+  if (key === 0)
+    return "1em";
+  const prefix = "--" + (type && type.replace(".", "-"));
+  const ratioVar = `${prefix}-ratio`;
+  if (key > 0) {
+    const prevLetterKey = numToLetterMap[key - 1];
+    return `calc(var(${prefix}-${prevLetterKey}) * var(${ratioVar}))`;
+  }
+  if (key < 0) {
+    const nextLetterKey = numToLetterMap[key + 1];
+    return `calc(var(${prefix}-${nextLetterKey}) / var(${ratioVar}))`;
+  }
+};
+var setSubScalingVar = (index, arr, variable, sequenceProps) => {
+  const { type } = sequenceProps;
+  const skipMiddle = index === 2 && arr.length === 2;
+  const indexMapWithLength = skipMiddle ? index + 1 : index;
+  const prefix = "--" + (type && type.replace(".", "-"));
+  const subRatioVarPrefix = `${prefix}-sub-ratio-`;
+  return `calc(var(${variable}) * var(${subRatioVarPrefix + indexMapWithLength}))`;
+};
+var getSubratioDifference = (base, ratio) => {
+  const diff = base * ratio - base;
+  const subRatio = diff / 1.618;
+  const first = base * ratio - subRatio;
+  const second = base + subRatio;
+  const middle = (first + second) / 2;
+  return [first, middle, second];
+};
 var generateSubSequence = (props, sequenceProps) => {
   const { key, base, value, ratio, variable, index } = props;
   const next = value * ratio;
-  const diff = next - value;
-  const smallscale = diff / 1.618;
-  const valueRounded = ~~value;
-  const nextRounded = ~~next;
-  const diffRounded = nextRounded - valueRounded;
-  let arr = [];
-  const first = next - smallscale;
-  const second = value + smallscale;
-  const middle = (first + second) / 2;
+  const diffRounded = ~~next - ~~value;
+  let arr;
+  const [first, middle, second] = getSubratioDifference(value, ratio);
   if (diffRounded > 16)
     arr = [first, middle, second];
   else
     arr = [first, second];
-  arr.map((v, k) => {
+  arr.forEach((v, k) => {
     const scaling = ~~(v / base * 1e3) / 1e3;
     const newVar = variable + (k + 1);
+    const newIndex = index + (k + 1) / 10;
+    const scalingVariable = setSubScalingVar(k + 1, arr, variable, sequenceProps);
     const props2 = {
       key: key + (k + 1),
       variable: newVar,
       value: v,
       scaling,
-      index: index + (k + 1) / 10
+      scalingVariable,
+      index: newIndex
     };
-    return setSequenceValue(props2, sequenceProps);
+    setSequenceValue(props2, sequenceProps);
   });
 };
 var switchSequenceOnNegative = (key, base, ratio) => {
@@ -1796,12 +1828,14 @@ var generateSequence = (sequenceProps) => {
     const value = switchSequenceOnNegative(key, base, ratio);
     const scaling = ~~(value / base * 100) / 100;
     const variable = prefix + letterKey;
+    const scalingVariable = setScalingVar(key, sequenceProps);
     const props = {
       key: letterKey,
       variable,
       value,
       base,
       scaling,
+      scalingVariable,
       ratio,
       index: key
     };
@@ -2118,10 +2152,22 @@ var transformTextStroke = (stroke) => {
     return v;
   }).join(" ");
 };
-var transformShadow = (sh, globalTheme) => {
-  return sh.split(",").map((shadow) => getShadow(shadow, globalTheme)).join(",");
-};
-var transformBoxShadow = (sh, globalTheme) => getShadow(sh, globalTheme);
+var transformShadow = (sh, globalTheme) => getShadow(sh, globalTheme);
+var transformBoxShadow = (shadows) => shadows.split("|").map((shadow) => {
+  return shadow.split(", ").map((v) => {
+    v = v.trim();
+    if (v.slice(0, 2) === "--")
+      return `var(${v})`;
+    if (getColor(v).length > 2)
+      return getColor(v);
+    if (v.includes("px") || v.slice(-2) === "em")
+      return v;
+    const arr = v.split(" ");
+    if (!arr.length)
+      return v;
+    return arr.map((v2) => getSpacingByKey(v2, "shadow").shadow).join(" ");
+  }).join(" ");
+}).join(",");
 var transformBackgroundImage = (backgroundImage, globalTheme) => {
   const CONFIG2 = getActiveConfig();
   return backgroundImage.split(", ").map((v) => {