@stylexjs/shared 0.1.0-beta.7 → 0.2.0-beta.10

package/README.md

@@ -0,0 +1,81 @@
+# @stylexjs/shared
+
+This package contains most of the core JavaScript logic for stylex.
+
+It exports two primary functions `create` and `keyframes`.
+
+1. `create` - takes a map of style rules. The return value include: a) the map with each style value replaced by a unique, reproducible, hashed className string, and b) a list of the CSS styles to be inserted into the document.
+2. `keyframes` - takes a `@keyframes` animation as JS object. Returns a hashed string and the style ot be injected.
+
+#### ⭐️ `create`
+
+The `stylex.create` function is implemented here and can be found within `stylex-create.js` and is the default export of a function named `styleXCreateSet(...)`.
+
+##### `styleXCreateSet(...)`
+
+> The function is called `styleXCreateSet` because `stylex.create` transforms a "set" or collection of multiple style [namespaces](#namespace)
+
+This function itself mostly just traverses over the objects to run each [namespaces](#namespace) through the `styleXCreateNamespace(...)` function. Other than that, it takes the styles to be injected from each namespace in a [Namespace Set](#namespace-set) and deduplicates them so the style isn't injected multiple times if it's used within multiple Namespaces in the same set.
+
+##### `styleXCreateNamespace(...)`
+
+> This function has been kept separate in case we want to add a new function to the StyleX API in the future called `stylex.createOne` which transforms a single [namespace](#namespace) instead of a [Namespace Set](#namespace-set)
+
+This function is responsible to transforming a [namespace](#namespace) to a [Compiled Namespace](#compiled-namespace) by hashing each key value pair and returning an object where the values have been replaced by classNames.
+
+**Step 1**
+
+The first step here is expanding all [shorthands](#shorthands) into their individual properties. To do this we `.flatMap` over the object entries of the Namespace and use the `expandShorthands(...)` function defined within `expand-shorthands.js`
+
+**Step 2**
+
+We hash each style `[key, value]` pair and generate a className and an associated CSS rule. Thie is done in the `convertToClassName(...)` function defined within [`convert-to-className.js`](#convert-to-classname-shared-package). (Explained below)
+
+**Step 3**
+
+Using the classNames generated in _step 2_ above, we collect all the individual style keys along with their associated classNames in the `resolvedNamespace` object.
+
+All the generated CSS rules from _step 2_ are collected in the `injectedStyles` object.
+
+The `[resolvedNamespace, injectedStyles]` is returned.
+
+##### Back to `styleXCreateSet(...)`
+
+`styleXCreateSet(...)` takes all the `[resolvedNamespace, finalInjectedStyles]` tuples and returns a tuple of `[compiledNamespaceSet, allInjectedStyles]`
+
+### Back to `create` with the `@stylexjs/babel-plugin` package
+
+The `create` function within the babel plugin package takes the `stylex.create(...)` function call and replaces it with the `compiledNamespaceSet`.
+
+It also takes each of the `injectedStyles` and:
+
+1. Either injects it as a `stylex.inject` call (if in `dev` mode)
+2. Or, adds it to the array of injected styles on [`babel.state.metadata`](#babel-metadata)
+
+#### ⭐️ `keyframes`
+
+This is the function backing `stylex.keyframes`. It works similarly to `create` but it's more simplified since it only defines a single CSS `@keyframes` rule and returns a single string.
+
+Here again, the source AST is converted to a JS object and passed to `stylex-keyframes.js` within the `shared` package.
+
+There, first the shorthands are expanded and then the whole objects is hashed. The resulting hash is used as the generated `animation name` for a `@keyframes` rule.
+
+The "name" and the CSS `@keyframes` rules are returned as a tuple.
+
+The `stylex.keyframes` call is replaced with the final string.
+
+The CSS `@keyframes` rule is either injected using `stylex.inject` in dev mode or set onto the `stylex` array on [`babel.state.metadata`](#babel-metadata).
+
+#### `convert-to-className` (`shared` package)
+
+This function is responsible for converting a single style key-value pair into a tuple of `[key, className, CSSRules]`
+
+It does so in the following steps:
+
+1. Convert the camelCased keys that are used by end-users to define [Namespaces](#namespace) and convert them to the dash-separated keys used within CSS.
+2. Hash `key` + (any `pseudo` or `at-rule`) + `value` to generate a className
+3. Generate the CSS rule using the `generateCSSRule` function defined in [`generate-css-rule.js`](#generate-css-rulejs) in the `shared` package.
+
+#### `generate-css-rule.js`
+
+This function takes a CSS key value pair, checks if has an RTL counterpart and returns them along side a pre-configured priority based on the type of CSS rule it is.

package/lib/convert-to-className.js

@@ -3,11 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = convertToClassName;
+exports.convertStyleToClassName = convertStyleToClassName;
 var _hash = _interopRequireDefault(require("./hash"));
 var _dashify = _interopRequireDefault(require("./utils/dashify"));
 var _transformValue = _interopRequireDefault(require("./transform-value"));
-var _generateCssRule = _interopRequireDefault(require("./generate-css-rule"));
+var _generateCssRule = require("./generate-css-rule");
+var _defaultOptions = require("./utils/default-options");
+var _objectUtils = require("./utils/object-utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -25,16 +27,21 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Handles RTL-flipping
 // Hashes to get a className
 // Returns the final key, className a CSS Rule
-function convertToClassName(objEntry, pseudo) {
+function convertStyleToClassName(objEntry, pseudos, atRules) {
   let {
     stylexSheetName = '<>',
     classNamePrefix = 'x'
-  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _defaultOptions.defaultOptions;
   const [key, rawValue] = objEntry;
   const dashedKey = (0, _dashify.default)(key);
   const value = Array.isArray(rawValue) ? rawValue.map(eachValue => (0, _transformValue.default)(key, eachValue)) : (0, _transformValue.default)(key, rawValue);
-  const stringToHash = Array.isArray(value) ? dashedKey + value.join(', ') + (pseudo ?? 'null') : dashedKey + value + (pseudo ?? 'null');
+  const sortedPseudos = (0, _objectUtils.arraySort)(pseudos ?? []);
+  const sortedAtRules = (0, _objectUtils.arraySort)(atRules ?? []);
+  const atRuleHashString = sortedPseudos.join('');
+  const pseudoHashString = sortedAtRules.join('');
+  const modifierHashString = atRuleHashString + pseudoHashString || 'null';
+  const stringToHash = Array.isArray(value) ? dashedKey + value.join(', ') + modifierHashString : dashedKey + value + modifierHashString;
   const className = classNamePrefix + (0, _hash.default)(stylexSheetName + stringToHash);
-  const cssRules = (0, _generateCssRule.default)(className, dashedKey, value, pseudo);
+  const cssRules = (0, _generateCssRule.generateRule)(className, dashedKey, value, pseudos, atRules);
   return [key, className, cssRules];
 }

package/lib/expand-shorthands.d.ts

@@ -0,0 +1,5 @@
+export const BANNED_PROPERTIES: { [key: string]: string };
+export const expandedKeys: $ReadOnlyArray<string>;
+export default function flatMapExpandedShorthands<T>(
+  objEntry: [string, T]
+): Array<[string, T]>;

package/lib/expand-shorthands.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = flatMapExpandedShorthands;
+exports.expandedKeys = void 0;
 var _postcssValueParser = _interopRequireDefault(require("postcss-value-parser"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -40,143 +41,282 @@ function splitValue(str) {
   return nodes;
 }
 
-// TODO: to be added later.
-// const aliases = {
-//   marginInlineStart: (rawValue) => [['marginStart', rawValue]],
-//   marginInlineEnd: (rawValue) => [['marginEnd', rawValue]],
-//   marginInline: (rawValue) => [
-//     ['marginStart', rawValue],
-//     ['marginEnd', rawValue],
-//   ],
-//   paddingInlineStart: (rawValue) => [['paddingStart', rawValue]],
-//   paddingInlineEnd: (rawValue) => [['paddingEnd', rawValue]],
-//   paddingInline: (rawValue) => [
-//     ['paddingStart', rawValue],
-//     ['paddingEnd', rawValue],
-//   ],
-//   // 'borderInlineStart': (rawValue) => [['borderStart', rawValue]],
-//   // 'borderInlineEnd': (rawValue) => [['borderEnd', rawValue]],
-//   // // This will need to change.
-//   // 'borderInline': (rawValue) => [
-//   //   ['borderStart', rawValue],
-//   //   ['borderEnd', rawValue],
-//   // ],
-// };
-
 /**
  * Shorthand properties:
  * - [x] all - Should be banned
- * - [ ] animation
- * - [ ] background
- * - [-] border
+ * - [x] animation
+ * - [x] background
+ * - [x] border
  * - [x] border-block-end
  * - [x] border-block-start
- * - [ ] border-bottom
+ * - [x] border-bottom
  * - [x] border-color
  * - [x] border-image
  * - [x] border-inline-end
  * - [x] border-inline-start
- * - [ ] border-left
+ * - [x] border-left
  * - [x] border-radius
- * - [ ] border-right
+ * - [x] border-right
  * - [x] border-style
- * - [ ] border-top
+ * - [x] border-top
  * - [x] border-width
- * - [ ] column-rule
- * - [ ] columns
- * - [ ] flex
- * - [ ] flex-flow
- * - [ ] font
- * - [ ] gap
- * - [ ] grid
- * - [ ] grid-area
- * - [ ] grid-column
- * - [ ] grid-row
- * - [ ] grid-template
- * - [ ] list-style
+ * - [x] column-rule
+ * - [x] columns
+ * - [x] container
+ * - [x] flex
+ * - [x] flex-flow
+ * - [x] font
+ * - [x] gap
+ * - [x] grid
+ * - [x] grid-area
+ * - [x] grid-column
+ * - [x] grid-row
+ * - [x] grid-template
+ * - [x] inset
+ * - [x] inset-block
+ * - [x] inset-inline
+ * - [x] list-style
  * - [x] margin
- * - [ ] mask
- * - [ ] offset
- * - [ ] outline
+ * - [x] mask
+ * - [x] offset
+ * - [x] outline
  * - [x] overflow
  * - [x] padding
- * - [ ] place-content
- * - [ ] place-items
- * - [ ] place-self
- * - [ ] scroll-margin
- * - [ ] scroll-padding
- * - [ ] text-decoration
- * - [ ] text-emphasis
- * - [ ] transition
+ * - [x] place-content
+ * - [x] place-items
+ * - [x] place-self
+ * - [x] scroll-margin
+ * - [x] scroll-padding
+ * - [x] text-decoration
+ * - [x] text-emphasis
+ * - [x] transition
  */
 
-const expansions = {
-  // ...aliases,
+const shorthands = {
+  all: _ => {
+    throw new Error('all is not supported');
+  },
+  animation: value => [['animation', value], ['animationName', null], ['animationDuration', null], ['animationTimingFunction', null], ['animationDelay', null], ['animationIterationCount', null], ['animationDirection', null], ['animationFillMode', null], ['animationPlayState', null]],
+  background: value => [['background', value], ['backgroundAttachment', null], ['backgroundClip', null], ['backgroundColor', null], ['backgroundImage', null], ['backgroundOrigin', null], ['backgroundPosition', null], ['backgroundRepeat', null], ['backgroundSize', null]],
+  // These will be removed later, matching the properties with React Native.
+  // For now, we're compiling them to the React Native properties.
+  // @Deprecated
   border: rawValue => {
-    return [['borderTop', rawValue], ['borderEnd', rawValue], ['borderBottom', rawValue], ['borderStart', rawValue]];
+    if (typeof rawValue === 'number') {
+      return shorthands.borderWidth(rawValue);
+    }
+    const [width, style, color] = splitValue(rawValue);
+    return [...shorthands.borderWidth(width), ...shorthands.borderStyle(style), ...shorthands.borderColor(color)];
   },
-  /*
-  // Add this later, as this will be a breaking change
-  border: (rawValue: string) => {
+  // @Deprecated
+  borderInline: rawValue => {
     if (typeof rawValue === 'number') {
-      return expansions.borderWidth(rawValue);
+      return [['borderInlineWidth', rawValue], ['borderInlineStartWidth', null], ['borderInlineEndWidth', null]];
     }
     const [width, style, color] = splitValue(rawValue);
-    return [
-      ...expansions.borderWidth(width),
-      ...expansions.borderStyle(style),
-      ...expansions.borderColor(color),
-    ];
-  }
-  */
-  borderColor: rawValue => {
-    const [top, right = top, bottom = top, left = right] = splitValue(rawValue);
-    return [['borderTopColor', top], ['borderEndColor', right], ['borderBottomColor', bottom], ['borderStartColor', left]];
+    return [...shorthands.borderInlineWidth(width), ...shorthands.borderInlineStyle(style), ...shorthands.borderInlineColor(color)];
   },
-  borderHorizontal: rawValue => {
-    return [['borderStart', rawValue], ['borderEnd', rawValue]];
+  // @Deprecated
+  borderBlock: rawValue => {
+    if (typeof rawValue === 'number') {
+      return [['borderBlockWidth', rawValue], ['borderTopWidth', null], ['borderBottomWidth', null]];
+    }
+    const [width, style, color] = splitValue(rawValue);
+    return [...shorthands.borderBlockWidth(width), ...shorthands.borderBlockStyle(style), ...shorthands.borderBlockColor(color)];
   },
-  borderStyle: rawValue => {
-    const [top, right = top, bottom = top, left = right] = splitValue(rawValue);
-    return [['borderTopStyle', top], ['borderEndStyle', right], ['borderBottomStyle', bottom], ['borderStartStyle', left]];
+  // @Deprecated
+  borderTop: rawValue => {
+    if (typeof rawValue === 'number') {
+      return [['borderTopWidth', rawValue]];
+    }
+    const [width, style, color] = splitValue(rawValue);
+    return [['borderTopWidth', width], ['borderTopStyle', style], ['borderTopColor', color]];
   },
-  borderVertical: rawValue => {
-    return [['borderTop', rawValue], ['borderBottom', rawValue]];
+  // @Deprecated
+  borderInlineEnd: rawValue => {
+    if (typeof rawValue === 'number') {
+      return [['borderInlineEndWidth', rawValue]];
+    }
+    const [width, style, color] = splitValue(rawValue);
+    return [['borderInlineEndWidth', width], ['borderInlineEndStyle', style], ['borderInlineEndColor', color]];
   },
-  borderWidth: rawValue => {
-    const [top, right = top, bottom = top, left = right] = typeof rawValue === 'number' ? [rawValue] : splitValue(rawValue);
-    return [['borderTopWidth', top], ['borderEndWidth', right], ['borderBottomWidth', bottom], ['borderStartWidth', left]];
+  // @Deprecated
+  borderRight: rawValue => {
+    throw new Error(['`borderRight` is not supported.', 'You could use `borderRightWidth`, `borderRightStyle` and `borderRightColor`,', 'but it is preferable to use `borderInlineEndWidth`, `borderInlineEndStyle` and `borderInlineEndColor`.'].join(' '));
   },
-  borderRadius: rawValue => {
-    const [top, right = top, bottom = top, left = right] = typeof rawValue === 'string' ? splitValue(rawValue) : typeof rawValue === 'number' ? [rawValue] : rawValue; // remove
-
-    return [['borderTopStartRadius', top], ['borderTopEndRadius', right], ['borderBottomEndRadius', bottom], ['borderBottomStartRadius', left]];
+  // @Deprecated
+  borderBottom: rawValue => {
+    if (typeof rawValue === 'number') {
+      return [['borderBottomWidth', rawValue]];
+    }
+    const [width, style, color] = splitValue(rawValue);
+    return [['borderBottomWidth', width], ['borderBottomStyle', style], ['borderBottomColor', color]];
   },
-  margin: rawValue => {
-    const [top, right = top, bottom = top, left = right] = typeof rawValue === 'number' ? [rawValue] : splitValue(rawValue);
-    return [['marginTop', top], ['marginEnd', right], ['marginBottom', bottom], ['marginStart', left]];
+  // @Deprecated
+  borderInlineStart: rawValue => {
+    if (typeof rawValue === 'number') {
+      return [['borderInlineStartWidth', rawValue]];
+    }
+    const [width, style, color] = splitValue(rawValue);
+    return [['borderInlineStartWidth', width], ['borderInlineStartStyle', style], ['borderInlineStartColor', color]];
   },
-  marginHorizontal: rawValue => {
-    return [['marginStart', rawValue], ['marginEnd', rawValue]];
+  // @Deprecated
+  borderLeft: rawValue => {
+    throw new Error(['`borderLeft` is not supported.', 'You could use `borderLeftWidth`, `borderLeftStyle` and `borderLeftColor`,', 'but it is preferable to use `borderInlineStartWidth`, `borderInlineStartStyle` and `borderInlineStartColor`.'].join(' '));
   },
-  marginVertical: rawValue => {
-    return [['marginTop', rawValue], ['marginBottom', rawValue]];
+  borderInlineWidth: rawValue => [['borderInlineWidth', rawValue], ['borderInlineStartWidth', null], ['borderLeftWidth', null], ['borderInlineEndWidth', null], ['borderRightWidth', null]],
+  borderInlineStyle: rawValue => [['borderInlineStyle', rawValue], ['borderInlineStartStyle', null], ['borderLeftStyle', null], ['borderInlineEndStyle', null], ['borderRightStyle', null]],
+  borderInlineColor: rawValue => [['borderInlineColor', rawValue], ['borderInlineStartColor', null], ['borderLeftColor', null], ['borderInlineEndColor', null], ['borderRightColor', null]],
+  borderBlockWidth: rawValue => [['borderBlockWidth', rawValue], ['borderTopWidth', null], ['borderBottomWidth', null]],
+  borderBlockStyle: rawValue => [['borderBlockStyle', rawValue], ['borderTopStyle', null], ['borderBottomStyle', null]],
+  borderBlockColor: rawValue => [['borderBlockColor', rawValue], ['borderTopColor', null], ['borderBottomColor', null]],
+  borderColor: value => [['borderColor', value], ['borderTopColor', null], ['borderInlineEndColor', null], ['borderRightColor', null], ['borderBottomColor', null], ['borderInlineStartColor', null], ['borderLeftColor', null]],
+  borderStyle: value => [['borderStyle', value], ['borderTopStyle', null], ['borderInlineEndStyle', null], ['borderRightStyle', null], ['borderBottomStyle', null], ['borderInlineStartStyle', null], ['borderLeftStyle', null]],
+  borderWidth: value => [['borderWidth', value], ['borderTopWidth', null], ['borderInlineEndWidth', null], ['borderRightWidth', null], ['borderBottomWidth', null], ['borderInlineStartWidth', null], ['borderLeftWidth', null]],
+  borderRadius: value => {
+    const values = typeof value === 'number' ? [value] : splitValue(value);
+    if (values.length === 1) {
+      return [['borderRadius', value],
+      // // logical constituents
+      ['borderStartStartRadius', null], ['borderStartEndRadius', null], ['borderEndStartRadius', null], ['borderEndEndRadius', null],
+      // physical constituents
+      ['borderTopLeftRadius', null], ['borderTopRightRadius', null], ['borderBottomLeftRadius', null], ['borderBottomRightRadius', null]];
+    }
+
+    // @Deprecated
+    const [startStart, startEnd = startStart, endEnd = startStart, endStart = startEnd] = values;
+    return [
+    // split into logical consituents
+    ['borderStartStartRadius', startStart], ['borderStartEndRadius', startEnd], ['borderEndEndRadius', endEnd], ['borderEndStartRadius', endStart],
+    // unset physical consituents
+    ['borderTopLeftRadius', null], ['borderTopRightRadius', null], ['borderBottomLeftRadius', null], ['borderBottomRightRadius', null]];
   },
-  overflow: rawValue => {
-    const [x, y = x] = splitValue(rawValue);
-    return [['overflowX', x], ['overflowY', y]];
+  columnRule: value => [['columnRule', value], ['columnRuleWidth', null], ['columnRuleStyle', null], ['columnRuleColor', null]],
+  columns: value => [['columns', value], ['columnCount', null], ['columnWidth', null]],
+  container: value => [['container', value], ['containerName', null], ['containerType', null]],
+  flex: value => [['flex', value], ['flexGrow', null], ['flexShrink', null], ['flexBasis', null]],
+  flexFlow: value => [['flexFlow', value], ['flexDirection', null], ['flexWrap', null]],
+  // @Deprecated ?
+  font: value => [['font', value], ['fontFamily', null], ['fontSize', null], ['fontStretch', null], ['fontStyle', null], ['fontVariant', null], ['fontWeight', null], ['lineHeight', null]],
+  gap: value => [['gap', value], ['rowGap', null], ['columnGap', null]],
+  grid: value => [['grid', value], ['gridTemplate', null], ['gridTemplateAreas', null], ['gridTemplateColumns', null], ['gridTemplateRows', null], ['gridAutoRows', null], ['gridAutoColumns', null], ['gridAutoFlow', null]
+
+  // This is for grid items only
+  // Not a constituent of `grid`
+  // ['gridRow', null],
+  // ['gridRowStart', null],
+  // ['gridRowEnd', null],
+  // ['gridColumn', null],
+  // ['gridColumnStart', null],
+  // ['gridColumnEnd', null],
+  // ['gridArea', null],
+  ],
+
+  gridArea: value => [['gridArea', value], ['gridRow', null], ['gridRowStart', null], ['gridRowEnd', null], ['gridColumn', null], ['gridColumnStart', null], ['gridColumnEnd', null]],
+  gridRow: value => [['gridRow', value], ['gridRowStart', null], ['gridRowEnd', null]],
+  gridColumn: value => [['gridColumn', value], ['gridColumnStart', null], ['gridColumnEnd', null]],
+  gridTemplate: value => [['gridTemplate', value], ['gridTemplateAreas', null], ['gridTemplateColumns', null], ['gridTemplateRows', null]],
+  inset: value => [['inset', value], ['insetInline', null], ['insetBlock', null], ['insetInlineStart', null], ['insetInlineEnd', null], ['top', null], ['right', null], ['bottom', null], ['left', null]],
+  insetInline: value => [['insetInline', value], ['insetInlineStart', null], ['insetInlineEnd', null], ['left', null], ['right', null]],
+  insetBlock: value => [['insetBlock', value], ['top', null], ['bottom', null]],
+  listStyle: value => [['listStyle', value], ['listStyleImage', null], ['listStylePosition', null], ['listStyleType', null]],
+  margin: value => {
+    const values = typeof value === 'number' ? [value] : splitValue(value);
+    if (values.length === 1) {
+      return [['margin', values[0]], ['marginInlineStart', null], ['marginLeft', null], ['marginInlineEnd', null], ['marginRight', null], ['marginTop', null], ['marginBottom', null]];
+    }
+    // @Deprecated
+    const [top, right = top, bottom = top, left = right] = values;
+    return [['marginTop', top], ['marginInlineEnd', right], ['marginBottom', bottom], ['marginInlineStart', left], ['marginLeft', null], ['marginRight', null]];
   },
+  marginInline: value => [['marginInline', value], ['marginInlineStart', null], ['marginLeft', null], ['marginInlineEnd', null], ['marginRight', null]],
+  marginBlock: value => [['marginBlock', value], ['marginTop', null], ['marginBottom', null]],
+  mask: value => [['mask', value], ['maskClip', null], ['maskComposite', null], ['maskImage', null], ['maskMode', null], ['maskOrigin', null], ['maskPosition', null], ['maskRepeat', null], ['maskSize', null]],
+  offset: value => [['offset', value], ['offsetAnchor', null], ['offsetDistance', null], ['offsetPath', null], ['offsetPosition', null], ['offsetRotate', null]],
+  outline: value => [['outline', value], ['outlineColor', null], ['outlineStyle', null], ['outlineWidth', null]],
+  overflow: value => [['overflow', value], ['overflowX', null], ['overflowY', null]],
   padding: rawValue => {
-    const [top, right = top, bottom = top, left = right] = typeof rawValue === 'number' ? [rawValue] : splitValue(rawValue);
+    const values = typeof rawValue === 'number' ? [rawValue] : splitValue(rawValue);
+    if (values.length === 1) {
+      return [['padding', values[0]], ['paddingStart', null], ['paddingLeft', null], ['paddingEnd', null], ['paddingRight', null], ['paddingTop', null], ['paddingBottom', null]];
+    }
+    // @Deprecated
+    const [top, right = top, bottom = top, left = right] = values;
     return [['paddingTop', top], ['paddingEnd', right], ['paddingBottom', bottom], ['paddingStart', left]];
   },
-  paddingHorizontal: rawValue => {
-    return [['paddingStart', rawValue], ['paddingEnd', rawValue]];
-  },
-  paddingVertical: rawValue => {
-    return [['paddingTop', rawValue], ['paddingBottom', rawValue]];
-  }
+  paddingInline: rawValue => [['paddingInline', rawValue], ['paddingStart', null], ['paddingLeft', null], ['paddingEnd', null], ['paddingRight', null]],
+  paddingBlock: rawValue => [['paddingBlock', rawValue], ['paddingTop', null], ['paddingBottom', null]],
+  placeContent: value => [['placeContent', value], ['alignContent', null], ['justifyContent', null]],
+  placeItems: value => [['placeItems', value], ['alignItems', null], ['justifyItems', null]],
+  placeSelf: value => [['placeSelf', value], ['alignSelf', null], ['justifySelf', null]],
+  scrollMargin: value => [['scrollMargin', value], ['scrollMarginBottom', null], ['scrollMarginLeft', null], ['scrollMarginStart', null], ['scrollMarginRight', null], ['scrollMarginEnd', null], ['scrollMarginTop', null]],
+  scrollPadding: value => [['scrollPadding', value], ['scrollPaddingBottom', null], ['scrollPaddingLeft', null], ['scrollPaddingStart', null], ['scrollPaddingRight', null], ['scrollPaddingEnd', null], ['scrollPaddingTop', null]],
+  scrollTimeline: value => [['scrollTimeline', value], ['scrollTimelineName', null], ['scrollTimelineAxis', null]],
+  textDecoration: value => [['textDecoration', value], ['textDecorationColor', null], ['textDecorationLine', null], ['textDecorationStyle', null], ['textDecorationThickness', null]],
+  textEmphasis: value => [['textEmphasis', value], ['textEmphasisColor', null], ['textEmphasisStyle', null]],
+  transition: value => [['transition', value], ['transitionDelay', null], ['transitionDuration', null], ['transitionProperty', null], ['transitionTimingFunction', null]]
 };
+const aliases = {
+  // @Deprecated
+  borderHorizontal: shorthands.borderInline,
+  // @Deprecated
+  borderVertical: shorthands.borderBlock,
+  // @Deprecated
+  borderBlockStart: shorthands.borderTop,
+  // @Deprecated
+  borderEnd: shorthands.borderInlineEnd,
+  // @Deprecated
+  borderBlockEnd: shorthands.borderBottom,
+  // @Deprecated
+  borderStart: shorthands.borderInlineStart,
+  borderHorizontalWidth: shorthands.borderInlineWidth,
+  borderHorizontalStyle: shorthands.borderInlineStyle,
+  borderHorizontalColor: shorthands.borderInlineColor,
+  borderVerticalWidth: shorthands.borderBlockWidth,
+  borderVerticalStyle: shorthands.borderBlockStyle,
+  borderVerticalColor: shorthands.borderBlockColor,
+  borderBlockStartColor: value => [['borderTopColor', value]],
+  borderBlockEndColor: value => [['borderBottomColor', value]],
+  borderStartColor: value => [['borderInlineStartColor', value]],
+  borderEndColor: value => [['borderInlineEndColor', value]],
+  borderBlockStartStyle: value => [['borderTopStyle', value]],
+  borderBlockEndStyle: value => [['borderBottomStyle', value]],
+  borderStartStyle: value => [['borderInlineStartStyle', value]],
+  borderEndStyle: value => [['borderInlineEndStyle', value]],
+  borderBlockStartWidth: value => [['borderTopWidth', value]],
+  borderBlockEndWidth: value => [['borderBottomWidth', value]],
+  borderStartWidth: value => [['borderInlineStartWidth', value]],
+  borderEndWidth: value => [['borderInlineEndWidth', value]],
+  borderTopStartRadius: value => [['borderStartStartRadius', value]],
+  borderTopEndRadius: value => [['borderStartEndRadius', value]],
+  borderBottomStartRadius: value => [['borderEndStartRadius', value]],
+  borderBottomEndRadius: value => [['borderEndEndRadius', value]],
+  marginBlockStart: value => [['marginTop', value]],
+  marginBlockEnd: value => [['marginBottom', value]],
+  marginStart: value => [['marginInlineStart', value]],
+  marginEnd: value => [['marginInlineEnd', value]],
+  marginHorizontal: shorthands.marginInline,
+  marginVertical: shorthands.marginBlock,
+  paddingBlockStart: rawValue => [['paddingTop', rawValue]],
+  paddingBlockEnd: rawValue => [['paddingBottom', rawValue]],
+  paddingStart: rawValue => [['paddingInlinStart', rawValue]],
+  paddingEnd: rawValue => [['paddingInlineEnd', rawValue]],
+  paddingHorizontal: shorthands.paddingInline,
+  paddingVertical: shorthands.paddingBlock,
+  insetBlockStart: value => [['top', value]],
+  insetBlockEnd: value => [['bottom', value]],
+  start: value => [['insetInlineStart', value]],
+  end: value => [['insetInlineEnd', value]]
+};
+const expansions = {
+  ...shorthands,
+  ...aliases
+};
+
+// TODO: It should be possible to remove this as we should no longer have
+// to disallow shorthand properties with object values.
+const expandedKeys = Object.keys(expansions);
+exports.expandedKeys = expandedKeys;
 function flatMapExpandedShorthands(objEntry) {
   const [key, value] = objEntry;
   const expansion = expansions[key];

package/lib/generate-css-rule.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = generateCSSRule;
+exports.generateRule = generateRule;
 var _generateLtr = _interopRequireDefault(require("./physical-rtl/generate-ltr"));
 var _generateRtl = _interopRequireDefault(require("./physical-rtl/generate-rtl"));
-var _genCSSRule = _interopRequireDefault(require("./utils/genCSSRule"));
+var _genCSSRule = require("./utils/genCSSRule");
+var _propertyPriorities = _interopRequireDefault(require("./utils/property-priorities"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -17,48 +18,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * 
  */
 
-function generateCSSRule(className, key, value, pseudo) {
+function generateRule(className, key,
+// pre-dashed
+value, pseudos, atRules) {
   const pairs = Array.isArray(value) ? value.map(eachValue => [key, eachValue]) : [[key, value]];
   const ltrPairs = pairs.map(_generateLtr.default);
   const ltrDecls = ltrPairs.map(pair => pair.join(':')).join(';');
   const rtlDecls = pairs.map(_generateRtl.default).filter(Boolean).map(pair => pair.join(':')).join(';');
-  const ltrRule = (0, _genCSSRule.default)(className, ltrDecls, pseudo);
-  const rtlRule = !rtlDecls ? null : (0, _genCSSRule.default)(className, rtlDecls, pseudo);
-  let priority = 1;
-  if (pseudo != null) {
-    if (pseudo[0] === '@') {
-      priority = 2;
-    } else if (pseudo[0] === ':') {
-      priority = pseudoPriorities[pseudo] ?? 2;
-      if (pseudo.startsWith(':nth-child')) {
-        priority = 6;
-      }
-      if (pseudo.startsWith(':nth-of-type')) {
-        priority = 7;
-      }
-    }
-  }
-  if (key.toLowerCase().includes('left') || key.toLowerCase().includes('right')) {
-    // Bump priority for physical left/right values.
-    priority += 0.1;
-  }
+  const ltrRule = (0, _genCSSRule.genCSSRule)(className, ltrDecls, pseudos, atRules);
+  const rtlRule = !rtlDecls ? null : (0, _genCSSRule.genCSSRule)(className, rtlDecls, pseudos, atRules);
+  const priority = (0, _propertyPriorities.default)(key) + Math.max(...pseudos.map(_propertyPriorities.default), ...atRules.map(_propertyPriorities.default), 0);
   return {
     priority,
     ltr: ltrRule,
     rtl: rtlRule
   };
-}
-const pseudoPriorities = {
-  // Might become unsupported:
-  ':first-child': 3,
-  ':last-child': 4,
-  ':only-child': 5,
-  ':nth-child': 6,
-  ':nth-of-type': 7,
-  ':hover': 8,
-  ':focus': 9,
-  ':active': 10,
-  ':disabled': 11,
-  '::placeholder': 12,
-  '::thumb': 13
-};
+}

package/lib/index.d.ts

@@ -64,6 +64,13 @@ export type StyleXOptions = {
   stylexSheetName?: string | undefined;
   classNamePrefix: string;
   definedStylexCSSVariables?: { [key: string]: any };
+  styleResolution:
+    | 'application-order' // The last style applied wins.
+    // More specific styles will win over less specific styles. (margin-top wins over margin)
+    | 'property-specificity'
+    // Legacy behavior, that expands shorthand properties into their longhand counterparts at compile-time.
+    // This is not recommended, and will be removed in a future version.
+    | 'legacy-expand-shorthands';
   [key: string]: any;
 };
 
@@ -89,4 +96,7 @@ export const messages: {
   LOCAL_ONLY: string;
   UNEXPECTED_ARGUMENT: string;
   EXPECTED_FUNCTION_CALL: string;
+  INVALID_PSEUDO_OR_AT_RULE: string;
+  ONLY_TOP_LEVEL_INLCUDES: string;
+  DUPLICATE_CONDITIONAL: string;
 };

package/lib/index.js.flow

@@ -0,0 +1,5 @@
+/**
+ * Flowtype definitions for index.js
+ * Generated by Flowgen from a Typescript Definition
+ * Flowgen v1.21.0
+ */