@tamagui/static 1.0.1-beta.59 → 1.0.1-beta.62

package/dist/cjs/extractor/createExtractor.js

@@ -158,7 +158,16 @@ function createExtractor() {
       }
       tm.mark("load-tamagui", shouldPrintDebug === "verbose");
       loadedTamaguiConfig = tamaguiConfig;
-      const defaultTheme = (0, import_core_node.proxyThemeVariables)(tamaguiConfig.themes[Object.keys(tamaguiConfig.themes)[0]]);
+      const proxiedTheme = (0, import_core_node.proxyThemeVariables)(tamaguiConfig.themes[Object.keys(tamaguiConfig.themes)[0]]);
+      const themeAccessListeners = /* @__PURE__ */ new Set();
+      const defaultTheme = new Proxy(proxiedTheme, {
+        get(target2, key) {
+          if (key[0] === "$") {
+            themeAccessListeners.forEach((cb) => cb(String(key)));
+          }
+          return Reflect.get(target2, key);
+        }
+      });
       const body = fileOrPath.type === "Program" ? fileOrPath.get("body") : fileOrPath.program.body;
       const isInternalImport = /* @__PURE__ */ __name((importStr) => {
         return (0, import_extractHelpers.isInsideTamagui)(sourcePath) && importStr[0] === ".";
@@ -394,7 +403,7 @@ function createExtractor() {
                 let keys = [name];
                 let out = null;
                 if (staticConfig.propMapper) {
-                  out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, { resolveVariablesAs: "auto" });
+                  out = staticConfig.propMapper(name, styleValue, defaultTheme, staticConfig.defaultProps, { resolveVariablesAs: "auto" }, void 0, shouldPrintDebug);
                   if (out) {
                     if (!Array.isArray(out)) {
                       console.warn(`Error expected array but got`, out);
@@ -423,7 +432,7 @@ function createExtractor() {
                       attr: path.node
                     };
                   }
-                  if (import_validHTMLAttributes.validHTMLAttributes[key]) {
+                  if (import_validHTMLAttributes.validHTMLAttributes[key] || key.startsWith("aria-") || key.startsWith("data-")) {
                     return attr;
                   }
                   if (shouldPrintDebug) {
@@ -890,6 +899,14 @@ function createExtractor() {
             const shouldWrapThme = allOtherPropsExtractable && !!themeVal;
             const canFlattenProps = inlined.size === 0 || shouldWrapThme || allOtherPropsExtractable;
             let shouldFlatten = !shouldDeopt && canFlattenProps && !hasSpread && staticConfig.neverFlatten !== true && (staticConfig.neverFlatten === "jsx" ? hasOnlyStringChildren : true);
+            if (disableExtractVariables) {
+              themeAccessListeners.add((key) => {
+                shouldFlatten = false;
+                if (shouldPrintDebug) {
+                  console.log(" ! accessing theme key, avoid flatten", key);
+                }
+              });
+            }
             if (shouldPrintDebug) {
               console.log(" - flatten?", (0, import_extractHelpers.objToStr)({ hasSpread, shouldDeopt, shouldFlatten, canFlattenProps, shouldWrapThme, allOtherPropsExtractable, hasOnlyStringChildren }));
             }
@@ -1035,32 +1052,43 @@ function createExtractor() {
               press: false,
               pressIn: false
             };
-            const completeStaticProps = Object.keys(attrs).reduce((acc, index) => {
-              const cur = attrs[index];
+            let foundStaticProps = {};
+            for (const key in attrs) {
+              const cur = attrs[key];
               if (cur.type === "style") {
                 (0, import_core_node.normalizeStyleObject)(cur.value);
-                Object.assign(acc, cur.value);
+                foundStaticProps = __spreadValues(__spreadValues({}, foundStaticProps), (0, import_core_node.expandStyles)(cur.value));
+                continue;
               }
               if (cur.type === "attr") {
                 if (t.isJSXSpreadAttribute(cur.value)) {
-                  return acc;
+                  continue;
                 }
                 if (!t.isJSXIdentifier(cur.value.name)) {
-                  return acc;
+                  continue;
                 }
-                const key = cur.value.name.name;
+                const key2 = cur.value.name.name;
                 const value = attemptEvalSafe(cur.value.value || t.booleanLiteral(true));
-                if (value === import_constants.FAILED_EVAL) {
-                  return acc;
+                if (value !== import_constants.FAILED_EVAL) {
+                  foundStaticProps = __spreadProps(__spreadValues({}, foundStaticProps), {
+                    [key2]: value
+                  });
                 }
-                acc[key] = value;
               }
-              return acc;
-            }, {});
-            const completeProps = __spreadValues(__spreadValues({}, staticConfig.defaultProps), completeStaticProps);
+            }
+            const completeProps = {};
+            for (const key in staticConfig.defaultProps) {
+              if (!(key in foundStaticProps)) {
+                completeProps[key] = staticConfig.defaultProps[key];
+              }
+            }
+            for (const key in foundStaticProps) {
+              completeProps[key] = foundStaticProps[key];
+            }
             if (shouldPrintDebug) {
               console.log("  - attrs (combined \u{1F500}): \n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", ")));
               console.log("  - defaultProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(staticConfig.defaultProps)));
+              console.log("  - foundStaticProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(foundStaticProps)));
               console.log("  - completeProps: \n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(completeProps)));
             }
             const getStyles = /* @__PURE__ */ __name((props2, debugName = "") => {
@@ -1081,7 +1109,7 @@ function createExtractor() {
               try {
                 const out = (0, import_core_node.getSplitStyles)(props2, staticConfig, defaultTheme, __spreadProps(__spreadValues({}, state), {
                   fallbackProps: completeProps
-                }));
+                }), void 0, props2["debug"]);
                 const outStyle = __spreadValues(__spreadValues({}, out.style), out.pseudos);
                 omitInvalidStyles(outStyle);
                 if (shouldPrintDebug) {
@@ -1102,7 +1130,7 @@ function createExtractor() {
             if (!completeStyles) {
               throw new Error(`Impossible, no styles`);
             }
-            const addInitialStyleKeys = shouldFlatten ? (0, import_lodash.difference)(Object.keys(completeStyles), Object.keys(completeStaticProps)) : [];
+            const addInitialStyleKeys = shouldFlatten ? (0, import_lodash.difference)(Object.keys(completeStyles), Object.keys(foundStaticProps)) : [];
             if (addInitialStyleKeys.length) {
               const toAdd = (0, import_lodash.pick)(completeStyles, ...addInitialStyleKeys);
               const firstGroup = attrs.find((x) => x.type === "style");
@@ -1118,14 +1146,11 @@ function createExtractor() {
             }
             if (shouldPrintDebug) {
               console.log("   -- addInitialStyleKeys", addInitialStyleKeys.join(", "), { shouldFlatten });
-              console.log("   -- completeStaticProps:\n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(completeStaticProps)));
               console.log("   -- completeStyles:\n", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(completeStyles)));
             }
             let getStyleError = null;
             for (const attr of attrs) {
               try {
-                if (shouldPrintDebug)
-                  console.log("  *", (0, import_extractHelpers.attrStr)(attr));
                 switch (attr.type) {
                   case "ternary":
                     const a = getStyles(attr.value.alternate, "ternary.alternate");
@@ -1139,7 +1164,7 @@ function createExtractor() {
                     continue;
                   case "style":
                     if (shouldPrintDebug)
-                      console.log("  * styles in", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(attr.value)));
+                      console.log("  * styles in", attr.value);
                     const styles = getStyles(attr.value, "style");
                     if (shouldPrintDebug)
                       console.log("  * styles out", (0, import_logLines.logLines)((0, import_extractHelpers.objToStr)(styles)));
@@ -1152,6 +1177,9 @@ function createExtractor() {
                 getStyleError = err;
               }
             }
+            if (shouldPrintDebug) {
+              console.log("  - attrs (ternaries/combined):\n", (0, import_logLines.logLines)(attrs.map(import_extractHelpers.attrStr).join(", ")));
+            }
             tm.mark("jsx-element-styles", shouldPrintDebug === "verbose");
             if (getStyleError) {
               console.log(" \u26A0\uFE0F postprocessing error, deopt", getStyleError);