@tamagui/static 1.0.0-alpha.59 → 1.0.0-alpha.62

package/dist/jsx/extractor/createExtractor.js

@@ -206,9 +206,6 @@ function createExtractor() {
           if (shouldPrintDebug) {
             console.log("  staticNamespace", Object.keys(staticNamespace).join(", "));
           }
-          const hasDeopt = /* @__PURE__ */ __name((obj) => {
-            return Object.keys(obj).some(isDeoptedProp);
-          }, "hasDeopt");
           const flattenedAttrs = [];
           traversePath.get("openingElement").get("attributes").forEach((path) => {
             const attr = path.node;
@@ -391,10 +388,16 @@ function createExtractor() {
               }
             }
             if (t.isJSXSpreadAttribute(attribute) || !attribute.name || typeof attribute.name.name !== "string") {
+              if (shouldPrintDebug) {
+                console.log("  ! inlining, spread attr");
+              }
               inlinePropCount++;
               return attr;
             }
             const name = attribute.name.name;
+            if (name.startsWith("data-")) {
+              return attr;
+            }
             if (isExcludedProp(name)) {
               return null;
             }
@@ -455,7 +458,7 @@ function createExtractor() {
               if (value) {
                 if (value.type === "StringLiteral" && value.value[0] === "$") {
                   if (shouldPrintDebug) {
-                    console.log(`  native, disable extract:  ${name} =`, value.value);
+                    console.log(`  ! inlining, native disable extract: ${name} =`, value.value);
                   }
                   inlinePropCount++;
                   return attr;
@@ -471,11 +474,15 @@ function createExtractor() {
                   keys = Object.keys(out);
                 }
               }
-              if (keys.some((k) => !isStaticAttributeName(k) && k !== "tag" && !k.startsWith("data-"))) {
-                if (shouldPrintDebug) {
-                  console.log("  ! inlining, not static attribute name", name);
+              for (const key of keys) {
+                if (!isStaticAttributeName(key)) {
+                  if (shouldPrintDebug) {
+                    console.log("  ! inlining, non-static", key);
+                  }
+                  inlinePropCount++;
                 }
-                inlinePropCount++;
+              }
+              if (inlinePropCount) {
                 return attr;
               }
             }
@@ -715,31 +722,33 @@ function createExtractor() {
                 cur.value = { [nonShortKey]: value };
                 key = nonShortKey;
               }
+              if (!shouldFlatten) {
+                if (stylePropsTransform[key] || !validStyles[key] && !pseudos[key] && !key.startsWith("data-")) {
+                  acc.push({
+                    type: "attr",
+                    value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(typeof value === "string" ? t.stringLiteral(value) : literalToAst(value)))
+                  });
+                  return acc;
+                }
+              }
               if (disableExtractVariables) {
                 if (value[0] === "$") {
                   if (shouldPrintDebug) {
                     console.log(`   keeping variable inline: ${key} =`, value);
                   }
-                  return [
-                    {
-                      type: "attr",
-                      value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(t.stringLiteral(value)))
-                    }
-                  ];
-                }
-              }
-              if (!validStyles[key] && !pseudos[key]) {
-                if (shouldPrintDebug) {
-                  console.log("   - ignoring (expanded already):", key);
+                  acc.push({
+                    type: "attr",
+                    value: t.jsxAttribute(t.jsxIdentifier(key), t.jsxExpressionContainer(t.stringLiteral(value)))
+                  });
+                  return acc;
                 }
-                return acc;
               }
             }
             acc.push(cur);
             return acc;
           }, []);
           if (shouldPrintDebug) {
-            console.log("  - attrs (evaluated styles): \n", logLines(attrs.map(attrStr).join(", ")));
+            console.log("  - attrs (evaluated): \n", logLines(attrs.map(attrStr).join(", ")));
           }
           let prev = null;
           attrs = attrs.reduce((acc, cur) => {
@@ -766,12 +775,18 @@ function createExtractor() {
                   delete props2[key];
               }
             }
+            if (shouldPrintDebug) {
+              props2["debug"] = true;
+            }
             const out = postProcessStyles(props2, staticConfig, defaultTheme);
+            if (shouldPrintDebug) {
+              delete props2["debug"];
+            }
             const next = (_a2 = out == null ? void 0 : out.style) != null ? _a2 : props2;
             if (shouldPrintDebug) {
-              console.log("  viewProps >>\n", logLines(objToStr(out.viewProps)));
-              console.log("  props >>\n", logLines(objToStr(props2)));
-              console.log("  next  <<\n", logLines(objToStr(next)));
+              console.log("    -- viewProps:\n", logLines(objToStr(out.viewProps)));
+              console.log("    -- props:\n", logLines(objToStr(props2)));
+              console.log("    -- next:\n", logLines(objToStr(next)));
             }
             for (const key in next) {
               if (staticConfig.validStyles) {
@@ -800,8 +815,8 @@ function createExtractor() {
             }
           }
           if (shouldPrintDebug) {
-            console.log("   completeStaticProps\n", logLines(objToStr(completeStaticProps)));
-            console.log("   completeStylesProcessed\n", logLines(objToStr(completeStylesProcessed)));
+            console.log("   completeStaticProps\n", completeStaticProps);
+            console.log("   completeStylesProcessed\n", completeStylesProcessed);
           }
           let getStyleError = null;
           for (const attr of attrs) {

package/dist/jsx/extractor/extractToClassNames.js

@@ -96,6 +96,9 @@ function extractToClassNames({
           return [];
         const styleWithPrev = ensureNeededPrevStyle(style);
         const res2 = getStylesAtomic(styleWithPrev);
+        if (shouldPrintDebug) {
+          console.log("styleWithPrev", styleWithPrev, res2);
+        }
         if (res2.length) {
           finalStyles = [...finalStyles, ...res2];
         }

package/dist/jsx/extractor/logLines.js

@@ -4,7 +4,7 @@ const logLines = /* @__PURE__ */ __name((str) => {
   let lines = [""];
   const items = str.split(" ");
   for (const item of items) {
-    if (item.length + lines[lines.length - 1].length > 100) {
+    if (item.length + lines[lines.length - 1].length > 85) {
       lines.push("");
     }
     lines[lines.length - 1] += item + " ";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-alpha.59",
+  "version": "1.0.0-alpha.62",
   "source": "src/index.ts",
   "typings": "types",
   "main": "dist/cjs",
@@ -60,7 +60,7 @@
     "@dish/babel-preset": "^0.0.6",
     "@expo/match-media": "^0.1.0",
     "@tamagui/build": "^1.0.0-alpha.58",
-    "@tamagui/core": "^1.0.0-alpha.59",
+    "@tamagui/core": "^1.0.0-alpha.62",
     "@tamagui/core-node": "^1.0.0-alpha.58",
     "@tamagui/fake-react-native": "^1.0.0-alpha.17",
     "@tamagui/helpers": "^1.0.0-alpha.58",
@@ -72,10 +72,10 @@
     "invariant": "^2.2.4",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.0-alpha.59"
+    "tamagui": "^1.0.0-alpha.62"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "fc9f0f06708907f2f8d3968f56d9fc67df3345d5"
+  "gitHead": "76f3b735226bdb7feffb53e3c8e3fd34392b6a10"
 }

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,EAAsB,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAM9E,OAAO,EAAoC,mBAAmB,EAAW,MAAM,UAAU,CAAA;AAyBzF,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;;;;;;;;wBAsBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,+MAcrC,mBAAmB;;;;;EA4mC3B"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,EAAsB,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAM9E,OAAO,EAAoC,mBAAmB,EAAW,MAAM,UAAU,CAAA;AAyBzF,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;;;;;;;;wBAsBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,+MAcrC,mBAAmB;;;;;EAwoC3B"}

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;AAQjC,OAAO,EAAgC,cAAc,EAAE,MAAM,UAAU,CAAA;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAc7C,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,GAAG,CAAA;IACX,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,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,IAAI,GAAG;IACT,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,CA4RA"}
+{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAQjC,OAAO,EAAgC,cAAc,EAAE,MAAM,UAAU,CAAA;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAc7C,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,OAAO,GACR,EAAE;IACD,MAAM,EAAE,GAAG,CAAA;IACX,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,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GAAG,IAAI,GAAG;IACT,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,CA+RA"}