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

package/dist/jsx/extractor/createExtractor.js

@@ -1,4 +1,4 @@
-import { relative } from "path";
+import { basename, relative } from "path";
 import traverse from "@babel/traverse";
 import * as t from "@babel/types";
 import {
@@ -305,7 +305,7 @@ function createExtractor() {
           res.found++;
           const filePath = `./${relative(process.cwd(), sourcePath)}`;
           const lineNumbers = node.loc ? 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}`;
           const debugPropValue = node.attributes.filter((n) => t.isJSXAttribute(n) && t.isJSXIdentifier(n.name) && n.name.name === "debug").map((n) => {
             if (n.value === null)
               return true;
@@ -316,6 +316,29 @@ function createExtractor() {
           if (debugPropValue) {
             shouldPrintDebug = debugPropValue;
           }
+          if (shouldPrintDebug) {
+            console.log("\n");
+            console.log("\x1B[33m%s\x1B[0m", `${componentName} | ${codePosition} -------------------`);
+            console.log("\x1B[1m", "\x1B[32m", `<${originalNodeName} />`, disableDebugAttr ? "" : "\u{1F41B}");
+          }
+          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-in"), t.stringLiteral(componentName)));
+            }
+            node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-at"), t.stringLiteral(`${basename(filePath)}:${lineNumbers}`)));
+          }
+          const shouldLog = !hasLogged;
+          if (shouldLog) {
+            console.log(`  1\uFE0F\u20E3  Inline optimized  2\uFE0F\u20E3  Inline flattened  3\uFE0F\u20E3  styled() extracted`);
+            const prefix = "      |";
+            console.log(prefixLogs || prefix, "                         total \xB7  1\uFE0F\u20E3  \xB7  2\uFE0F\u20E3  \xB7  3\uFE0F\u20E3");
+            hasLogged = true;
+          }
+          if (disableExtraction) {
+            return;
+          }
           try {
             let evaluateAttribute2 = function(path) {
               const attribute = path.node;
@@ -750,26 +773,6 @@ function createExtractor() {
               }
             };
             var evaluateAttribute = evaluateAttribute2, isExtractable = isExtractable2, createTernariesFromObjectProperties = createTernariesFromObjectProperties2, splitVariants = splitVariants2, expandStylesWithoutVariants = expandStylesWithoutVariants2, mergeStyles = mergeStyles2;
-            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", `${tagId[0]} | ${tagId[2]} -------------------`);
-              console.log("\x1B[1m", "\x1B[32m", `<${originalNodeName} />`);
-            }
-            if (shouldAddDebugProp && !disableDebugAttr) {
-              res.modified++;
-              node.attributes.unshift(t.jsxAttribute(t.jsxIdentifier("data-is"), t.stringLiteral(tagId.join(" "))));
-            }
-            const shouldLog = !hasLogged;
-            if (shouldLog) {
-              console.log(`  1\uFE0F\u20E3  Inline optimized  2\uFE0F\u20E3  Inline flattened  3\uFE0F\u20E3  styled() extracted`);
-              const prefix = "      |";
-              console.log(prefixLogs || prefix, "                         total \xB7  1\uFE0F\u20E3  \xB7  2\uFE0F\u20E3  \xB7  3\uFE0F\u20E3");
-              hasLogged = true;
-            }
-            if (disableExtraction) {
-              return;
-            }
             const { staticConfig } = component;
             const variants = staticConfig.variants || {};
             const isTextView = staticConfig.isText || false;