@tamagui/static 1.0.1-beta.133 → 1.0.1-beta.134

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.133",
+  "version": "1.0.1-beta.134",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -34,14 +34,14 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.133",
-    "@tamagui/config-default-node": "^1.0.1-beta.133",
-    "@tamagui/core-node": "^1.0.1-beta.133",
-    "@tamagui/fake-react-native": "^1.0.1-beta.133",
-    "@tamagui/helpers": "^1.0.1-beta.133",
-    "@tamagui/patch-rnw": "^1.0.1-beta.133",
-    "@tamagui/proxy-worm": "^1.0.1-beta.133",
-    "@tamagui/shorthands": "^1.0.1-beta.133",
+    "@tamagui/build": "^1.0.1-beta.134",
+    "@tamagui/config-default-node": "^1.0.1-beta.134",
+    "@tamagui/core-node": "^1.0.1-beta.134",
+    "@tamagui/fake-react-native": "^1.0.1-beta.134",
+    "@tamagui/helpers": "^1.0.1-beta.134",
+    "@tamagui/patch-rnw": "^1.0.1-beta.134",
+    "@tamagui/proxy-worm": "^1.0.1-beta.134",
+    "@tamagui/shorthands": "^1.0.1-beta.134",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.49",
     "esbuild-register": "^3.3.3",
@@ -49,7 +49,7 @@
     "fs-extra": "^10.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.1-beta.133"
+    "tamagui": "^1.0.1-beta.134"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",
@@ -69,7 +69,7 @@
     "react-test-renderer": "^18.2.0",
     "style-loader": "^3.3.1",
     "typescript": "^4.7.4",
-    "vitest": "^0.19.1",
+    "vitest": "^0.20.3",
     "webpack": "^5.73.0"
   },
   "peerDependencies": {

package/src/extractor/createExtractor.ts

@@ -1,4 +1,4 @@
-import { relative } from 'path'
+import { basename, relative } from 'path'
 
 import traverse, { NodePath, Visitor } from '@babel/traverse'
 import * as t from '@babel/types'
@@ -446,9 +446,8 @@ export function createExtractor() {
             ? node.loc.start.line +
               (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : '')
             : ''
-          const tagId = [componentName, `${node.name.name}`, `${filePath}:${lineNumbers}`].filter(
-            Boolean
-          )
+
+          const codePosition = `${filePath}:${lineNumbers}`
 
           // debug just one
           const debugPropValue = node.attributes
@@ -465,41 +464,53 @@ export function createExtractor() {
             shouldPrintDebug = debugPropValue
           }
 
-          try {
-            node.attributes.find(
-              (n) =>
-                t.isJSXAttribute(n) &&
-                t.isJSXIdentifier(n.name) &&
-                n.name.name === 'debug' &&
-                n.value === null
+          if (shouldPrintDebug) {
+            console.log('\n')
+            console.log(
+              '\x1b[33m%s\x1b[0m',
+              `${componentName} | ${codePosition} -------------------`
             )
+            console.log(
+              '\x1b[1m',
+              '\x1b[32m',
+              `<${originalNodeName} />`,
+              disableDebugAttr ? '' : '🐛'
+            )
+          }
 
-            if (shouldPrintDebug) {
-              console.log('\n')
-              console.log('\x1b[33m%s\x1b[0m', `${tagId[0]} | ${tagId[2]} -------------------`)
-              console.log('\x1b[1m', '\x1b[32m', `<${originalNodeName} />`)
-            }
-
-            // add data-is
-            if (shouldAddDebugProp && !disableDebugAttr) {
-              res.modified++
+          // add data-* debug attributes
+          if (shouldAddDebugProp && !disableDebugAttr) {
+            res.modified++
+            node.attributes.unshift(
+              t.jsxAttribute(t.jsxIdentifier('data-is'), t.stringLiteral(node.name.name))
+            )
+            if (componentName) {
               node.attributes.unshift(
-                t.jsxAttribute(t.jsxIdentifier('data-is'), t.stringLiteral(tagId.join(' ')))
+                t.jsxAttribute(t.jsxIdentifier('data-in'), t.stringLiteral(componentName))
               )
             }
 
-            const shouldLog = !hasLogged
-            if (shouldLog) {
-              console.log(`  1️⃣  Inline optimized  2️⃣  Inline flattened  3️⃣  styled() extracted`)
-              const prefix = '      |'
-              // prettier-ignore
-              console.log(prefixLogs || prefix, '                         total ·  1️⃣  ·  2️⃣  ·  3️⃣')
-              hasLogged = true
-            }
-            if (disableExtraction) {
-              return
-            }
+            node.attributes.unshift(
+              t.jsxAttribute(
+                t.jsxIdentifier('data-at'),
+                t.stringLiteral(`${basename(filePath)}:${lineNumbers}`)
+              )
+            )
+          }
 
+          const shouldLog = !hasLogged
+          if (shouldLog) {
+            console.log(`  1️⃣  Inline optimized  2️⃣  Inline flattened  3️⃣  styled() extracted`)
+            const prefix = '      |'
+            // prettier-ignore
+            console.log(prefixLogs || prefix, '                         total ·  1️⃣  ·  2️⃣  ·  3️⃣')
+            hasLogged = true
+          }
+          if (disableExtraction) {
+            return
+          }
+
+          try {
             const { staticConfig } = component
             const variants = staticConfig.variants || {}
             const isTextView = staticConfig.isText || false