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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-alpha.9",
   "source": "src/index.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -54,7 +54,7 @@
     "@dish/babel-preset": "^0.0.6",
     "@expo/match-media": "^0.1.0",
     "@tamagui/build": "^1.0.0-alpha.8",
-    "@tamagui/core": "^1.0.0-alpha.8",
+    "@tamagui/core": "^1.0.0-alpha.9",
     "@tamagui/core-node": "^1.0.0-alpha.8",
     "@tamagui/fake-react-native": "^1.0.0-alpha.2",
     "@tamagui/helpers": "^1.0.0-alpha.8",
@@ -65,10 +65,10 @@
     "fs-extra": "^9.0.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.20",
-    "tamagui": "^1.0.0-alpha.8"
+    "tamagui": "^1.0.0-alpha.9"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "ecb0afe6782276b1f2ece90320fd2748f2f05c93"
+  "gitHead": "48ab0be0ca0b8d7e9a1470ee18d46348bc316cdd"
 }

package/src/extractor/createExtractor.ts

@@ -13,6 +13,7 @@ import { findTopmostFunction } from './findTopmostFunction'
 import { getStaticBindingsForScope } from './getStaticBindingsForScope'
 import { literalToAst } from './literalToAst'
 import { loadTamagui } from './loadTamagui'
+import { logLines } from './logLines'
 import { normalizeTernaries } from './normalizeTernaries'
 import { removeUnusedHooks } from './removeUnusedHooks'
 
@@ -95,8 +96,9 @@ export function createExtractor() {
       /**
        * Step 1: Determine if importing any statically extractable components
        */
-      const isInternalImport = (importStr: string) =>
-        isInsideTamagui(sourcePath) && importStr[0] === '.'
+      const isInternalImport = (importStr: string) => {
+        return isInsideTamagui(sourcePath) && importStr[0] === '.'
+      }
 
       const validComponents: { [key: string]: any } = Object.keys(components)
         // check if uppercase to avoid hitting media query proxy before init
@@ -797,7 +799,7 @@ export function createExtractor() {
 
           // see if we can filter them
           if (shouldPrintDebug) {
-            console.log('  - attrs (before): ', attrs.map(attrStr).join(', '))
+            console.log('  - attrs (before):\n', logLines(attrs.map(attrStr).join(', ')))
           }
 
           // now update to new values
@@ -936,7 +938,7 @@ export function createExtractor() {
           }
 
           if (shouldPrintDebug) {
-            console.log('  - attrs (flattened):  ', attrs.map(attrStr).join(', '))
+            console.log('  - attrs (flattened): \n', logLines(attrs.map(attrStr).join(', ')))
           }
 
           // evaluate away purely style props
@@ -962,7 +964,7 @@ export function createExtractor() {
           }, [])
 
           if (shouldPrintDebug) {
-            console.log('  - attrs (evaluated styles):  ', attrs.map(attrStr).join(', '))
+            console.log('  - attrs (evaluated styles): \n', logLines(attrs.map(attrStr).join(', ')))
           }
 
           // combine styles, leave undefined values
@@ -980,7 +982,7 @@ export function createExtractor() {
           }, [])
 
           if (shouldPrintDebug) {
-            console.log('  - attrs (combined 🔀):  ', attrs.map(attrStr).join(', '))
+            console.log('  - attrs (combined 🔀): \n', logLines(attrs.map(attrStr).join(', ')))
           }
 
           // post process
@@ -995,9 +997,10 @@ export function createExtractor() {
             const out = postProcessStyles(props, staticConfig, defaultTheme)
             const next = out?.style ?? props
             if (shouldPrintDebug) {
-              console.log('    >> getStyles: ', objToStr(props), '==>>', objToStr(next))
-              console.log('    >>     style: ', objToStr(out.style))
-              console.log('    >>     viewp: ', objToStr(out.viewProps))
+              console.log('  getStyles props >>\n', logLines(objToStr(props)))
+              console.log('  getStyles next  >>\n', logLines(objToStr(next)))
+              console.log('  getStyles style >>\n', logLines(objToStr(out.style)))
+              console.log('  getStyles viewp >>\n', logLines(objToStr(out.viewProps)))
             }
             if (staticConfig.validStyles) {
               for (const key in next) {
@@ -1009,10 +1012,6 @@ export function createExtractor() {
             return next
           }
 
-          if (shouldPrintDebug) {
-            console.log('  staticConfig.defaultProps', staticConfig.defaultProps)
-          }
-
           // used to ensure we pass the entire prop bundle to getStyles
           const completeStylesProcessed = getStyles({
             ...staticConfig.defaultProps,
@@ -1041,9 +1040,9 @@ export function createExtractor() {
 
           if (shouldPrintDebug) {
             // prettier-ignore
-            console.log('    completeStaticProps', objToStr(completeStaticProps))
+            console.log('   completeStaticProps\n', logLines(objToStr(completeStaticProps)))
             // prettier-ignore
-            console.log('    completeStylesProcessed', objToStr(completeStylesProcessed))
+            console.log('   completeStylesProcessed\n', logLines(objToStr(completeStylesProcessed)))
           }
 
           for (const attr of attrs) {
@@ -1082,7 +1081,7 @@ export function createExtractor() {
           }
 
           if (shouldPrintDebug) {
-            console.log('  - attrs (after): ', attrs.map(attrStr).join(', '))
+            console.log('  - attrs (after):\n', logLines(attrs.map(attrStr).join(', ')))
           }
 
           if (shouldFlatten) {
@@ -1101,7 +1100,7 @@ export function createExtractor() {
           if (shouldPrintDebug) {
             // prettier-ignore
             console.log('  [❊] inline props ', inlinePropCount, shouldDeopt ? ' deopted' : '', hasSpread ? ' spread' : '', '!flatten', staticConfig.neverFlatten)
-            console.log('  - attrs (end): ', attrs.map(attrStr).join(', '))
+            console.log('  - attrs (end):\n', logLines(attrs.map(attrStr).join(', ')))
           }
 
           res.optimized++

package/src/extractor/extractToClassNames.ts

@@ -18,6 +18,7 @@ import { ensureImportingConcat } from './ensureImportingConcat'
 import { isSimpleSpread } from './extractHelpers'
 import { extractMediaStyle } from './extractMediaStyle'
 import { hoistClassNames } from './hoistClassNames'
+import { logLines } from './logLines'
 
 export const CONCAT_CLASSNAME_IMPORT = 'concatClassName'
 
@@ -136,10 +137,6 @@ export function extractToClassNames({
           case 'style':
             const styles = addStyles(attr.value)
             const newClassNames = concatClassName(styles.map((x) => x.identifier).join(' '))
-            if (shouldPrintDebug) {
-              // console.log('  style', attr.value)
-              console.log('  classnames', newClassNames, finalClassNames)
-            }
             // prettier-ignore
             const existing = finalClassNames.find((x) => x.type == 'StringLiteral') as t.StringLiteral | null
             if (existing) {
@@ -149,7 +146,7 @@ export function extractToClassNames({
             }
             if (shouldPrintDebug) {
               // prettier-ignore
-              console.log('  classnames (after)', finalClassNames.map(x => x['value']).join(' '))
+              console.log('  classnames (after)\n', logLines(finalClassNames.map(x => x['value']).join(' ')))
             }
             break
           case 'attr':

package/src/extractor/logLines.ts

@@ -0,0 +1,11 @@
+export const logLines = (str: string) => {
+  let lines: string[] = ['']
+  const items = str.split(' ')
+  for (const item of items) {
+    if (item.length + lines[lines.length - 1].length > 100) {
+      lines.push('')
+    }
+    lines[lines.length - 1] += item + ' '
+  }
+  return lines.map((line, i) => '           ' + (i == 0 ? '' : ' ') + line.trim()).join('\n')
+}