@tamagui/static 1.0.0-alpha.7 → 1.0.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "source": "src/index.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -35,6 +35,7 @@
     "@types/webpack": "^4.41.26",
     "babel-loader": "^8.2.2",
     "css-loader": "^5.2.4",
+    "esbuild-loader": "^2.16.0",
     "jest": "^27.3.1",
     "loader-utils": "^2.0.0",
     "react": "*",
@@ -52,11 +53,11 @@
     "@babel/traverse": "^7.15.4",
     "@dish/babel-preset": "^0.0.6",
     "@expo/match-media": "^0.1.0",
-    "@tamagui/build": "^1.0.0-alpha.2",
-    "@tamagui/core": "^1.0.0-alpha.7",
-    "@tamagui/core-node": "^1.0.0-alpha.5",
+    "@tamagui/build": "^1.0.0-alpha.8",
+    "@tamagui/core": "^1.0.0-alpha.8",
+    "@tamagui/core-node": "^1.0.0-alpha.8",
     "@tamagui/fake-react-native": "^1.0.0-alpha.2",
-    "@tamagui/helpers": "^1.0.0-alpha.5",
+    "@tamagui/helpers": "^1.0.0-alpha.8",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.13.12",
     "esbuild-register": "^3.1.2",
@@ -64,10 +65,10 @@
     "fs-extra": "^9.0.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.20",
-    "tamagui": "^1.0.0-alpha.7"
+    "tamagui": "^1.0.0-alpha.8"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "13694a98d31535846699004532630788177537e9"
+  "gitHead": "ecb0afe6782276b1f2ece90320fd2748f2f05c93"
 }

package/src/extractor/createExtractor.ts

@@ -54,7 +54,7 @@ export function createExtractor() {
   let hasLogged = false
 
   return {
-    getTamaguiConfig() {
+    getTamagui() {
       return loadedTamaguiConfig
     },
     parse: (
@@ -576,12 +576,12 @@ export function createExtractor() {
             }
 
             // shorthand media queries
-            if (
-              name[0] === '$' &&
-              t.isJSXExpressionContainer(attribute?.value) &&
+            if (name[0] === '$' && t.isJSXExpressionContainer(attribute?.value)) {
               // allow disabling this extraction
-              !disableExtractInlineMedia
-            ) {
+              if (disableExtractInlineMedia) {
+                return attr
+              }
+
               const shortname = name.slice(1)
               if (mediaQueryConfig[shortname]) {
                 const expression = attribute.value.expression
@@ -633,8 +633,8 @@ export function createExtractor() {
             // if value can be evaluated, extract it and filter it out
             const styleValue = attemptEvalSafe(value)
 
-            // we never flatten if a prop isn't a valid static attribute
-            // but we need to make sure its post-prop mapping
+            // never flatten if a prop isn't a valid static attribute
+            // only post prop-mapping
             if (!isStaticAttributeName(name)) {
               let keys = [name]
               if (staticConfig.propMapper) {
@@ -664,6 +664,8 @@ export function createExtractor() {
               return {
                 type: 'style',
                 value: { [name]: styleValue },
+                name,
+                attr: path.node,
               }
             }
 
@@ -904,29 +906,27 @@ export function createExtractor() {
               if (cur.type === 'style') {
                 // TODO need to loop over initial props not just style props
                 for (const key in cur.value) {
-                  const shouldInsertNull =
-                    !!(
-                      staticConfig.ensureOverriddenProp?.[key] // || staticConfig.defaultProps?.[key]
-                    )
+                  const shouldEnsureOverridden = !!staticConfig.ensureOverriddenProp?.[key]
                   const isSetInAttrsAlready = attrs.some(
                     (x) =>
                       x.type === 'attr' &&
                       x.value.type === 'JSXAttribute' &&
                       x.value.name.name === key
                   )
-                  const shouldInsertNullOverride = shouldInsertNull && !isSetInAttrsAlready
-                  // if (shouldPrintDebug) {
-                  //   // prettier-ignore
-                  //   console.log('what is', key, { shouldInsertNullOverride, shouldInsertNull, isSetInAttrsAlready })
-                  // }
-                  if (shouldInsertNullOverride) {
-                    acc.push({
-                      type: 'attr',
-                      value: t.jsxAttribute(
-                        t.jsxIdentifier(key),
-                        t.jsxExpressionContainer(t.nullLiteral())
-                      ),
-                    })
+
+                  if (!isSetInAttrsAlready) {
+                    const isVariant = !!staticConfig.variants?.[cur.name || '']
+                    if (isVariant || shouldEnsureOverridden) {
+                      acc.push({
+                        type: 'attr',
+                        value:
+                          cur.attr ||
+                          t.jsxAttribute(
+                            t.jsxIdentifier(key),
+                            t.jsxExpressionContainer(t.nullLiteral())
+                          ),
+                      })
+                    }
                   }
                 }
               }

package/src/extractor/extractToClassNames.ts

@@ -182,7 +182,7 @@ export function extractToClassNames({
             const mediaExtraction = extractMediaStyle(
               attr.value,
               jsxPath,
-              extractor.getTamaguiConfig(),
+              extractor.getTamagui(),
               sourcePath,
               lastMediaImportance,
               shouldPrintDebug

package/src/types.ts

@@ -32,7 +32,12 @@ export type ExtractedAttrAttr = {
   value: t.JSXAttribute | t.JSXSpreadAttribute
 }
 
-export type ExtractedAttrStyle = { type: 'style'; value: Object }
+export type ExtractedAttrStyle = {
+  type: 'style'
+  value: Object
+  attr?: t.JSXAttribute | t.JSXSpreadAttribute
+  name?: string
+}
 
 export type ExtractedAttr =
   | ExtractedAttrAttr

package/types.d.ts

@@ -27,6 +27,8 @@ export declare type ExtractedAttrAttr = {
 export declare type ExtractedAttrStyle = {
 	type: "style";
 	value: Object;
+	attr?: t.JSXAttribute | t.JSXSpreadAttribute;
+	name?: string;
 };
 export declare type ExtractedAttr = ExtractedAttrAttr | {
 	type: "ternary";
@@ -157,7 +159,7 @@ export declare type TamaguiProviderProps = Partial<Omit<ThemeProviderProps, "chi
 };
 export declare type Extractor = ReturnType<typeof createExtractor>;
 export declare function createExtractor(): {
-	getTamaguiConfig(): TamaguiInternalConfig<import("@tamagui/core").CreateTokens<string | number | import("@tamagui/core").Variable>, {
+	getTamagui(): TamaguiInternalConfig<import("@tamagui/core").CreateTokens<string | number | import("@tamagui/core").Variable>, {
 		[key: string]: {
 			bg: string | import("@tamagui/core").Variable;
 			bg2: string | import("@tamagui/core").Variable;