happy-dom 20.14.1 → 20.14.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/css/declaration/property-manager/utilities/CSSVariableFormatter.d.ts.map +1 -1
  2. package/lib/css/declaration/property-manager/utilities/CSSVariableFormatter.js +2 -1
  3. package/lib/css/declaration/property-manager/utilities/CSSVariableFormatter.js.map +1 -1
  4. package/lib/version.js +1 -1
  5. package/package.json +1 -1
  6. package/src/css/declaration/property-manager/utilities/CSSVariableFormatter.ts +2 -1
package/lib/css/declaration/property-manager/utilities/CSSVariableFormatter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CSSVariableFormatter.d.ts","sourceRoot":"","sources":["../../../../../src/css/declaration/property-manager/utilities/CSSVariableFormatter.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACxC;;;;;OAKG;WACW,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAiBvD;;;;;;OAMG;WACW,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM;CAoC5F"}
1
+ {"version":3,"file":"CSSVariableFormatter.d.ts","sourceRoot":"","sources":["../../../../../src/css/declaration/property-manager/utilities/CSSVariableFormatter.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACxC;;;;;OAKG;WACW,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAiBvD;;;;;;OAMG;WACW,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM;CAqC5F"}
package/lib/css/declaration/property-manager/utilities/CSSVariableFormatter.js CHANGED
@@ -53,7 +53,8 @@ export default class CSSVariableFormatter {
53
53
  if (variable && variable.parentheses === parentheses) {
54
54
  const fallbackValue = value.substring(variable.fallbackIndex, match.index).trim();
55
55
  const variableValue = cssVariables[variable.name];
56
- return `${value.substring(0, variable.index)}${this.resolveVariables(variableValue || fallbackValue, cssVariables)}${value.substring(match.index + match[0].length)}`;
56
+ // The rest of the value may hold further var() references (e.g. "calc(var(--a) + var(--b))").
57
+ return `${value.substring(0, variable.index)}${this.resolveVariables(variableValue || fallbackValue, cssVariables)}${this.resolveVariables(value.substring(match.index + match[0].length), cssVariables)}`;
57
58
  }
58
59
  }
59
60
  return value;
package/lib/css/declaration/property-manager/utilities/CSSVariableFormatter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CSSVariableFormatter.js","sourceRoot":"","sources":["../../../../../src/css/declaration/property-manager/utilities/CSSVariableFormatter.ts"],"names":[],"mappings":"AAAA,MAAM,0BAA0B,GAAG,mCAAmC,CAAC;AACvE,MAAM,4BAA4B,GAAG,wCAAwC,CAAC;AAC9E,MAAM,cAAc,GAAG,wCAAwC,CAAC;AAEhE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACxC;;;;;OAKG;IACI,MAAM,CAAC,WAAW,CAAC,KAAa;QACtC,MAAM,mBAAmB,GAAG,KAAK,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAEpE,IAAI,mBAAmB,EAAE,CAAC;YACzB,OAAO,OAAO,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC;QACzC,CAAC;QAED,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAEhE,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC9C,OAAO,OAAO,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,aAAa,GAAG,CAAC;QACxF,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,gBAAgB,CAAC,KAAa,EAAE,YAAqC;QAClF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QAC/C,IAAI,KAA8B,CAAC;QACnC,IAAI,QAAQ,GAKD,IAAI,CAAC;QAChB,IAAI,WAAW,GAAG,CAAC,CAAC;QAEpB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YAC7C,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC3B,QAAQ,GAAG;oBACV,WAAW;oBACX,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;oBACd,KAAK,EAAE,KAAK,CAAC,KAAM;oBACnB,aAAa,EAAE,KAAK,CAAC,KAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;iBAC7C,CAAC;YACH,CAAC;YAED,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1B,WAAW,EAAE,CAAC;YACf,CAAC;iBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,WAAW,EAAE,CAAC;YACf,CAAC;YAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;gBACtD,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;gBAClF,MAAM,aAAa,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClD,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,IAAI,aAAa,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,KAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;YACxK,CAAC;QACF,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD"}
1
+ {"version":3,"file":"CSSVariableFormatter.js","sourceRoot":"","sources":["../../../../../src/css/declaration/property-manager/utilities/CSSVariableFormatter.ts"],"names":[],"mappings":"AAAA,MAAM,0BAA0B,GAAG,mCAAmC,CAAC;AACvE,MAAM,4BAA4B,GAAG,wCAAwC,CAAC;AAC9E,MAAM,cAAc,GAAG,wCAAwC,CAAC;AAEhE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACxC;;;;;OAKG;IACI,MAAM,CAAC,WAAW,CAAC,KAAa;QACtC,MAAM,mBAAmB,GAAG,KAAK,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAEpE,IAAI,mBAAmB,EAAE,CAAC;YACzB,OAAO,OAAO,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC;QACzC,CAAC;QAED,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAEhE,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC9C,OAAO,OAAO,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,aAAa,GAAG,CAAC;QACxF,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,gBAAgB,CAAC,KAAa,EAAE,YAAqC;QAClF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QAC/C,IAAI,KAA8B,CAAC;QACnC,IAAI,QAAQ,GAKD,IAAI,CAAC;QAChB,IAAI,WAAW,GAAG,CAAC,CAAC;QAEpB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YAC7C,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC3B,QAAQ,GAAG;oBACV,WAAW;oBACX,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;oBACd,KAAK,EAAE,KAAK,CAAC,KAAM;oBACnB,aAAa,EAAE,KAAK,CAAC,KAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;iBAC7C,CAAC;YACH,CAAC;YAED,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1B,WAAW,EAAE,CAAC;YACf,CAAC;iBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,WAAW,EAAE,CAAC;YACf,CAAC;YAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;gBACtD,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;gBAClF,MAAM,aAAa,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClD,8FAA8F;gBAC9F,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,IAAI,aAAa,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,KAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC;YAC7M,CAAC;QACF,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD"}
package/lib/version.js CHANGED
@@ -1 +1 @@
1
- export default { version: '20.14.1' };
1
+ export default { version: '20.14.2' };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "happy-dom",
3
- "version": "20.14.1",
3
+ "version": "20.14.2",
4
4
  "license": "MIT",
5
5
  "homepage": "https://github.com/capricorn86/happy-dom",
6
6
  "repository": "https://github.com/capricorn86/happy-dom",
package/src/css/declaration/property-manager/utilities/CSSVariableFormatter.ts CHANGED
@@ -66,7 +66,8 @@ export default class CSSVariableFormatter {
66
66
  if (variable && variable.parentheses === parentheses) {
67
67
  const fallbackValue = value.substring(variable.fallbackIndex, match.index).trim();
68
68
  const variableValue = cssVariables[variable.name];
69
- return `${value.substring(0, variable.index)}${this.resolveVariables(variableValue || fallbackValue, cssVariables)}${value.substring(match.index! + match[0].length)}`;
69
+ // The rest of the value may hold further var() references (e.g. "calc(var(--a) + var(--b))").
70
+ return `${value.substring(0, variable.index)}${this.resolveVariables(variableValue || fallbackValue, cssVariables)}${this.resolveVariables(value.substring(match.index! + match[0].length), cssVariables)}`;
70
71
  }
71
72
  }
72
73