react-native-css 0.0.0-nightly.04af4c6 → 0.0.0-nightly.08286a2

package/src/compiler/atRules.ts

@@ -47,11 +47,11 @@ export function maybeMutateReactNativeOptions(
 }
 
 /***********************************************
- * @nativeMapping                                       *
+ * @prop                                       *
  ***********************************************/
 
-function isNativeMappingAtRule(rule: Rule | PropAtRule): rule is PropAtRule {
-  return rule.type === "unknown" && rule.value.name === "nativeMapping";
+function isPropAtRule(rule: Rule | PropAtRule): rule is PropAtRule {
+  return rule.type === "unknown" && rule.value.name === "prop";
 }
 
 export function parsePropAtRule(rules?: (Rule | PropAtRule)[]) {
@@ -71,14 +71,14 @@ export function parsePropAtRule(rules?: (Rule | PropAtRule)[]) {
   if (!rules) return mapping;
 
   for (const rule of rules) {
-    if (!isNativeMappingAtRule(rule)) continue;
+    if (!isPropAtRule(rule)) continue;
 
     if (rule.value.prelude.length > 0) {
       const prelude = rule.value.prelude.filter((item) => {
         return item.value.type !== "white-space";
       });
 
-      nativeMappingAtRuleBlock(prelude, mapping);
+      propAtRuleBlock(prelude, mapping);
     } else if (rule.value.block) {
       // Remove all whitespace tokens
       const blocks = rule.value.block.filter((item) => {
@@ -91,7 +91,7 @@ export function parsePropAtRule(rules?: (Rule | PropAtRule)[]) {
       });
 
       for (const block of blockRules) {
-        nativeMappingAtRuleBlock(block, mapping);
+        propAtRuleBlock(block, mapping);
       }
     }
   }
@@ -99,7 +99,7 @@ export function parsePropAtRule(rules?: (Rule | PropAtRule)[]) {
   return mapping;
 }
 
-function nativeMappingAtRuleBlock(
+function propAtRuleBlock(
   token: Extract<TokenOrValue, { type: "token" }>[],
   mapping: StyleRuleMapping = {},
 ): StyleRuleMapping {
@@ -107,7 +107,7 @@ function nativeMappingAtRuleBlock(
     return item.value.type === "colon";
   });
 
-  // @nativeMapping <to>; (has no from value)
+  // @props <to>; (has no from value)
   if (!to) {
     to = from;
     from = [
@@ -128,10 +128,10 @@ function nativeMappingAtRuleBlock(
     return mapping;
   }
 
-  let value: string | string[] = to.flatMap((item, index) => {
+  mapping[toRNProperty(fromToken.value.value)] = to.flatMap((item, index) => {
     switch (item.value.type) {
       case "delim":
-        return index === 0 && item.value.value === "&" ? ["&"] : [];
+        return index === 0 && item.value.value === "*" ? ["*"] : [];
       case "ident":
         return item.value.value.split(".").map((part) => toRNProperty(part));
       default:
@@ -139,11 +139,5 @@ function nativeMappingAtRuleBlock(
     }
   });
 
-  if (value.length === 2 && value[0] === "&" && value[1]) {
-    value = value[1];
-  }
-
-  mapping[toRNProperty(fromToken.value.value)] = value;
-
   return mapping;
 }

package/src/compiler/declarations.ts

@@ -1984,11 +1984,11 @@ export function parseTextShadow(
     parseColor(textShadow.color, builder),
   );
   builder.addDescriptor(
-    "&.textShadowOffset.width",
+    "*.textShadowOffset.width",
     parseLength(textShadow.xOffset, builder),
   );
   builder.addDescriptor(
-    "&.textShadowOffset.height",
+    "*.textShadowOffset.height",
     parseLength(textShadow.yOffset, builder),
   );
   builder.addDescriptor(
@@ -2374,27 +2374,27 @@ export function parseBoxShadow(
 ) {
   for (const [index, shadow] of value.entries()) {
     builder.addDescriptor(
-      `&.boxShadow.[${index}].color`,
+      `*.boxShadow.[${index}].color`,
       parseColor(shadow.color, builder),
     );
     builder.addDescriptor(
-      `&.boxShadow.[${index}].offsetX`,
+      `*.boxShadow.[${index}].offsetX`,
       parseLength(shadow.xOffset, builder),
     );
     builder.addDescriptor(
-      `&.boxShadow.[${index}].offsetY`,
+      `*.boxShadow.[${index}].offsetY`,
       parseLength(shadow.yOffset, builder),
     );
     builder.addDescriptor(
-      `&.boxShadow.[${index}].blurRadius`,
+      `*.boxShadow.[${index}].blurRadius`,
       parseLength(shadow.blur, builder),
     );
     builder.addDescriptor(
-      `&.boxShadow.[${index}].spreadDistance`,
+      `*.boxShadow.[${index}].spreadDistance`,
       parseLength(shadow.spread, builder),
     );
     builder.addDescriptor(
-      `&.boxShadow.[${index}].inset`,
+      `*.boxShadow.[${index}].inset`,
       shadow.inset ? true : undefined,
     );
   }
@@ -3088,7 +3088,7 @@ function parseObjectFit(
   builder: StylesheetBuilder,
 ) {
   builder.addMapping({
-    "object-fit": ["contentFit"],
+    "object-fit": "contentFit",
   });
   builder.addDescriptor(
     "object-fit",
@@ -3101,7 +3101,7 @@ function parseObjectPosition(
   builder: StylesheetBuilder,
 ) {
   builder.addMapping({
-    "object-position": ["contentPosition"],
+    "object-position": "contentPosition",
   });
   builder.addDescriptor("object-position", [
     {},

package/src/compiler/stylesheet.ts

@@ -56,7 +56,7 @@ export class StylesheetBuilder {
     private ruleTemplate: StyleRule = {
       s: [],
     },
-    // Any default mapping should be included in the @nativeMapping parsing
+    // Any default mapping should be included in the @prop parsing
     private mapping: StyleRuleMapping = {},
     public descriptorProperty?: string,
     private shared: {
@@ -403,10 +403,12 @@ export class StylesheetBuilder {
       } else {
         forceTuple = true;
       }
+    } else if (propPath) {
+      forceTuple = true;
+    } else {
+      propPath = property;
     }
 
-    propPath ??= property;
-
     if (forceTuple && !Array.isArray(propPath)) {
       propPath = [propPath];
     }

package/src/native/styles/calculate-props.ts

@@ -129,7 +129,7 @@ export function applyDeclarations(
         const final = rest.pop();
 
         if (final) {
-          if (first !== "&") {
+          if (first !== "*") {
             topLevelTarget[first] ??= {};
             target = topLevelTarget[first];
           }