@tamagui/static 1.82.9 → 1.84.0

package/src/extractor/createExtractor.ts

@@ -1533,7 +1533,7 @@ export function createExtractor(
               (traversePath.node.children &&
                 traversePath.node.children.every((x) => x.type === 'JSXText')))
 
-          const themeVal = inlined.get('theme')
+          let themeVal = inlined.get('theme')
 
           // on native we can't flatten when theme prop is set
           if (platform !== 'native') {
@@ -1562,9 +1562,7 @@ export function createExtractor(
               (staticConfig.neverFlatten === 'jsx' ? hasOnlyStringChildren : true)
           )
 
-          const shouldWrapTheme = shouldFlatten && themeVal
           const usedThemeKeys = new Set<string>()
-
           // if it accesses any theme values during evaluation
           themeAccessListeners.add((key) => {
             if (options.experimentalFlattenThemesOnNative) {
@@ -1579,72 +1577,24 @@ export function createExtractor(
             }
           })
 
-          if (shouldPrintDebug) {
-            try {
-              // prettier-ignore
-              logger.info([' flatten?', shouldFlatten, objToStr({ hasSpread, shouldDeopt, canFlattenProps, shouldWrapTheme, hasOnlyStringChildren }), 'inlined', inlined.size, [...inlined]].join(' '))
-            } catch {
-              // ok
-            }
-          }
-
-          // wrap theme around children on flatten
-          // TODO move this to bottom and re-check shouldFlatten
-          // account for shouldFlatten could change w the above block "if (disableExtractVariables)"
-          if (shouldFlatten && shouldWrapTheme) {
-            if (!programPath) {
-              console.warn(
-                `No program path found, avoiding importing flattening / importing theme in ${sourcePath}`
-              )
-            } else {
-              if (shouldPrintDebug) {
-                logger.info(['  - wrapping theme', themeVal].join(' '))
-              }
-
-              // remove theme attribute from flattened node
-              attrs = attrs.filter((x) =>
-                x.type === 'attr' &&
-                t.isJSXAttribute(x.value) &&
-                x.value.name.name === 'theme'
-                  ? false
-                  : true
-              )
-
-              // add import
-              if (!hasImportedTheme) {
-                hasImportedTheme = true
-                programPath.node.body.push(
-                  t.importDeclaration(
-                    [
-                      t.importSpecifier(
-                        t.identifier('_TamaguiTheme'),
-                        t.identifier('Theme')
-                      ),
-                    ],
-                    t.stringLiteral('@tamagui/web')
-                  )
-                )
-              }
-
-              traversePath.replaceWith(
-                t.jsxElement(
-                  t.jsxOpeningElement(t.jsxIdentifier('_TamaguiTheme'), [
-                    t.jsxAttribute(t.jsxIdentifier('name'), themeVal.value),
-                  ]),
-                  t.jsxClosingElement(t.jsxIdentifier('_TamaguiTheme')),
-                  [traversePath.node]
-                )
-              )
-            }
-          }
-
           // only if we flatten, ensure the default styles are there
           if (shouldFlatten) {
+            let skipMap = false
             const defaultStyleAttrs = Object.keys(defaultProps).flatMap((key) => {
+              if (skipMap) return []
+              const value = defaultProps[key]
+              if (key === 'theme' && !themeVal) {
+                if (platform === 'native') {
+                  shouldFlatten = false
+                  skipMap = true
+                  inlined.set('theme', { value: t.stringLiteral(value) })
+                }
+                themeVal = { value: t.stringLiteral(value) }
+                return []
+              }
               if (!isValidStyleKey(key, staticConfig)) {
                 return []
               }
-              const value = defaultProps[key]
               const name = tamaguiConfig?.shorthands[key] || key
               if (value === undefined) {
                 logger.warn(
@@ -1683,8 +1633,10 @@ export function createExtractor(
               return attr
             }) as ExtractedAttr[]
 
-            if (defaultStyleAttrs.length) {
-              attrs = [...defaultStyleAttrs, ...attrs]
+            if (!skipMap) {
+              if (defaultStyleAttrs.length) {
+                attrs = [...defaultStyleAttrs, ...attrs]
+              }
             }
           }
 
@@ -1729,6 +1681,65 @@ export function createExtractor(
             }, [])
             .flat()
 
+          const shouldWrapTheme = shouldFlatten && themeVal
+          // wrap theme around children on flatten
+          // account for shouldFlatten could change w the above block "if (disableExtractVariables)"
+          if (shouldWrapTheme) {
+            if (!programPath) {
+              console.warn(
+                `No program path found, avoiding importing flattening / importing theme in ${sourcePath}`
+              )
+            } else {
+              if (shouldPrintDebug) {
+                logger.info(['  - wrapping theme', themeVal].join(' '))
+              }
+
+              // remove theme attribute from flattened node
+              attrs = attrs.filter((x) =>
+                x.type === 'attr' &&
+                t.isJSXAttribute(x.value) &&
+                x.value.name.name === 'theme'
+                  ? false
+                  : true
+              )
+
+              // add import
+              if (!hasImportedTheme) {
+                hasImportedTheme = true
+                programPath.node.body.push(
+                  t.importDeclaration(
+                    [
+                      t.importSpecifier(
+                        t.identifier('_TamaguiTheme'),
+                        t.identifier('Theme')
+                      ),
+                    ],
+                    t.stringLiteral('@tamagui/web')
+                  )
+                )
+              }
+
+              traversePath.replaceWith(
+                t.jsxElement(
+                  t.jsxOpeningElement(t.jsxIdentifier('_TamaguiTheme'), [
+                    t.jsxAttribute(t.jsxIdentifier('name'), themeVal.value),
+                  ]),
+                  t.jsxClosingElement(t.jsxIdentifier('_TamaguiTheme')),
+                  [traversePath.node]
+                )
+              )
+            }
+          }
+
+          if (shouldPrintDebug) {
+            try {
+              // prettier-ignore
+              logger.info([' flatten?', shouldFlatten, objToStr({ hasSpread, shouldDeopt, canFlattenProps, shouldWrapTheme, hasOnlyStringChildren }), 'inlined', inlined.size, [...inlined]].join(' '))
+            } catch {
+              // ok
+            }
+          }
+
           if (shouldDeopt || !shouldFlatten) {
             if (shouldPrintDebug) {
               logger.info(`Deopting ${shouldDeopt} ${shouldFlatten}`)

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

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAGA,OAAiB,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAcjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAmC1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA0CjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EA+oE1D"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAGA,OAAiB,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAcjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAmC1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA0CjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EA0pE1D"}