@tamagui/static 1.0.1-beta.28 → 1.0.1-beta.29

package/dist/jsx/extractor/createExtractor.js

@@ -9,7 +9,8 @@ import {
   normalizeStyleObject,
   proxyThemeVariables,
   pseudos,
-  rnw
+  rnw,
+  stylePropsTransform
 } from "@tamagui/core-node";
 import { difference, pick } from "lodash";
 import { FAILED_EVAL } from "../constants";
@@ -330,7 +331,7 @@ function createExtractor() {
                 let keys = [name];
                 let out = null;
                 if (staticConfig.propMapper) {
-                  out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, "auto");
+                  out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, { resolveVariablesAs: "auto" });
                   if (out) {
                     out = rnw.createDOMProps(isTextView ? "span" : "div", out);
                     delete out.className;
@@ -600,12 +601,23 @@ function createExtractor() {
                   prev2[key] = next[key];
                 }
               }
+            }, omitInvalidStyles = function(style) {
+              if (staticConfig.validStyles) {
+                for (const key in style) {
+                  if (stylePropsTransform[key] || !staticConfig.validStyles[key] && !pseudos[key] && !/(hoverStyle|focusStyle|pressStyle)$/.test(key)) {
+                    if (shouldPrintDebug)
+                      console.log(" delete invalid style", key);
+                    delete style[key];
+                  }
+                }
+              }
             };
             __name(isValidStyleKey, "isValidStyleKey");
             __name(evaluateAttribute, "evaluateAttribute");
             __name(isExtractable, "isExtractable");
             __name(createTernariesFromObjectProperties, "createTernariesFromObjectProperties");
             __name(mergeStyles, "mergeStyles");
+            __name(omitInvalidStyles, "omitInvalidStyles");
             node.attributes.find((n) => t.isJSXAttribute(n) && t.isJSXIdentifier(n.name) && n.name.name === "debug" && n.value === null);
             if (shouldPrintDebug) {
               console.log("\n");
@@ -867,9 +879,8 @@ function createExtractor() {
               console.log("  - ensureOverriden:", Object.keys(ensureOverridden).join(", "));
             }
             attrs = attrs.reduce((acc, cur) => {
-              if (!cur) {
+              if (!cur)
                 return acc;
-              }
               if (cur.type === "attr" && !t.isJSXSpreadAttribute(cur.value)) {
                 if (shouldFlatten) {
                   if (cur.value.name.name === "tag") {
@@ -977,7 +988,7 @@ function createExtractor() {
             if (shouldPrintDebug) {
               console.log("  - attrs (combined \u{1F500}): \n", logLines(attrs.map(attrStr).join(", ")));
               console.log("  - defaultProps: \n", logLines(objToStr(staticConfig.defaultProps)));
-              console.log("  - completeStaticProps: \n", logLines(objToStr(completeStaticProps)));
+              console.log("  - completeProps: \n", logLines(objToStr(completeProps)));
             }
             const getStyles = /* @__PURE__ */ __name((props2, debugName = "") => {
               if (!props2 || !Object.keys(props2).length) {
@@ -1003,15 +1014,7 @@ function createExtractor() {
                   ...out.style,
                   ...out.pseudos
                 };
-                if (staticConfig.validStyles) {
-                  for (const key in outStyle) {
-                    if (!staticConfig.validStyles[key] && !pseudos[key] && !/(hover|focus|press)Style$/.test(key)) {
-                      if (shouldPrintDebug)
-                        console.log(" delete invalid style", key);
-                      delete outStyle[key];
-                    }
-                  }
-                }
+                omitInvalidStyles(outStyle);
                 if (shouldPrintDebug) {
                   console.log(`       getStyles ${debugName} (props):
 `, logLines(objToStr(props2)));
@@ -1026,13 +1029,13 @@ function createExtractor() {
                 return {};
               }
             }, "getStyles");
-            const completeStylesProcessed = getStyles(completeProps, "completeStylesProcessed");
-            if (!completeStylesProcessed) {
+            const completeStyles = getStyles(completeProps, "completeStyles");
+            if (!completeStyles) {
               throw new Error(`Impossible, no styles`);
             }
-            const stylesToAddToInitialGroup = shouldFlatten ? difference(Object.keys(completeStylesProcessed), Object.keys(completeStaticProps)) : [];
-            if (stylesToAddToInitialGroup.length) {
-              const toAdd = pick(completeStylesProcessed, ...stylesToAddToInitialGroup);
+            const addInitialStyleKeys = shouldFlatten ? difference(Object.keys(completeStyles), Object.keys(completeStaticProps)) : [];
+            if (addInitialStyleKeys.length) {
+              const toAdd = pick(completeStyles, ...addInitialStyleKeys);
               const firstGroup = attrs.find((x) => x.type === "style");
               if (shouldPrintDebug) {
                 console.log("    toAdd", objToStr(toAdd));
@@ -1040,13 +1043,14 @@ function createExtractor() {
               if (!firstGroup) {
                 attrs.unshift({ type: "style", value: toAdd });
               } else {
+                omitInvalidStyles(firstGroup.value);
                 Object.assign(firstGroup.value, toAdd);
               }
             }
             if (shouldPrintDebug) {
-              console.log("   -- stylesToAddToInitialGroup", stylesToAddToInitialGroup.join(", "), { shouldFlatten });
+              console.log("   -- addInitialStyleKeys", addInitialStyleKeys.join(", "), { shouldFlatten });
               console.log("   -- completeStaticProps:\n", logLines(objToStr(completeStaticProps)));
-              console.log("   -- completeStylesProcessed:\n", logLines(objToStr(completeStylesProcessed)));
+              console.log("   -- completeStyles:\n", logLines(objToStr(completeStyles)));
             }
             let getStyleError = null;
             for (const attr of attrs) {
@@ -1071,7 +1075,7 @@ function createExtractor() {
                     if (shouldPrintDebug)
                       console.log("  * styles out", logLines(objToStr(styles)));
                     if (styles) {
-                      attr.value = Object.fromEntries(Object.keys(styles).map((k) => [k, completeStylesProcessed[k]]));
+                      attr.value = Object.fromEntries(Object.keys(styles).map((k) => [k, completeStyles[k]]));
                     }
                     continue;
                 }

package/dist/jsx/extractor/extractToClassNames.js

@@ -79,10 +79,13 @@ function extractToClassNames({
       let finalClassNames = [];
       let finalAttrs = [];
       let finalStyles = [];
-      const viewStyles = {};
+      let viewStyles = {};
       for (const attr of attrs) {
         if (attr.type === "style") {
-          Object.assign(viewStyles, attr.value);
+          viewStyles = {
+            ...viewStyles,
+            ...attr.value
+          };
         }
       }
       const ensureNeededPrevStyle = /* @__PURE__ */ __name((style) => {
@@ -129,6 +132,9 @@ function extractToClassNames({
                 }
               }
               for (const style of styles2) {
+                if (style.pseudo) {
+                  continue;
+                }
                 finalAttrs.push(t.jsxAttribute(t.jsxIdentifier(style.property), t.stringLiteral(style.identifier)));
               }
             } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.28",
+  "version": "1.0.1-beta.29",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -34,11 +34,11 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.28",
-    "@tamagui/core-node": "^1.0.1-beta.28",
-    "@tamagui/fake-react-native": "^1.0.1-beta.28",
-    "@tamagui/helpers": "^1.0.1-beta.28",
-    "@tamagui/proxy-worm": "^1.0.1-beta.28",
+    "@tamagui/build": "^1.0.1-beta.29",
+    "@tamagui/core-node": "^1.0.1-beta.29",
+    "@tamagui/fake-react-native": "^1.0.1-beta.29",
+    "@tamagui/helpers": "^1.0.1-beta.29",
+    "@tamagui/proxy-worm": "^1.0.1-beta.29",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.36",
     "esbuild-register": "^3.3.2",
@@ -46,7 +46,7 @@
     "fs-extra": "^9.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.1-beta.28"
+    "tamagui": "^1.0.1-beta.29"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",

package/types/extractor/createExtractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAOtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;;;wBAqBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,kPAiBrC,mBAAmB;;;;;;EA0/C3B"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAQtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;;;wBAqBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,kPAiBrC,mBAAmB;;;;;;EAw/C3B"}

package/types/extractor/extractToClassNames.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAGvC,OAAO,EAAgC,cAAc,EAAW,MAAM,UAAU,CAAA;AAGhF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAiB7C,oBAAY,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,iBAAiB,GAAG,IAAI,CAkY3B"}
+{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAGvC,OAAO,EAAgC,cAAc,EAAW,MAAM,UAAU,CAAA;AAGhF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAiB7C,oBAAY,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,iBAAiB,GAAG,IAAI,CAwY3B"}