@tamagui/static 1.101.0 → 1.101.2
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/cjs/extractor/createExtractor.js +21 -12
- package/dist/cjs/extractor/createExtractor.js.map +1 -1
- package/dist/cjs/extractor/createExtractor.native.js +18 -12
- package/dist/cjs/extractor/createExtractor.native.js.map +2 -2
- package/dist/cjs/extractor/extractMediaStyle.js +2 -2
- package/dist/cjs/extractor/extractMediaStyle.js.map +1 -1
- package/dist/cjs/extractor/extractMediaStyle.native.js +2 -2
- package/dist/cjs/extractor/extractMediaStyle.native.js.map +2 -2
- package/dist/cjs/extractor/extractToClassNames.js +17 -15
- package/dist/cjs/extractor/extractToClassNames.js.map +1 -1
- package/dist/cjs/extractor/extractToClassNames.native.js +12 -14
- package/dist/cjs/extractor/extractToClassNames.native.js.map +2 -2
- package/dist/esm/extractor/createExtractor.js +24 -11
- package/dist/esm/extractor/createExtractor.js.map +1 -1
- package/dist/esm/extractor/createExtractor.mjs +16 -12
- package/dist/esm/extractor/createExtractor.native.js +18 -11
- package/dist/esm/extractor/createExtractor.native.js.map +2 -2
- package/dist/esm/extractor/extractMediaStyle.js +2 -2
- package/dist/esm/extractor/extractMediaStyle.js.map +1 -1
- package/dist/esm/extractor/extractMediaStyle.mjs +2 -2
- package/dist/esm/extractor/extractMediaStyle.native.js +2 -2
- package/dist/esm/extractor/extractMediaStyle.native.js.map +2 -2
- package/dist/esm/extractor/extractToClassNames.js +16 -15
- package/dist/esm/extractor/extractToClassNames.js.map +1 -1
- package/dist/esm/extractor/extractToClassNames.mjs +14 -16
- package/dist/esm/extractor/extractToClassNames.native.js +11 -14
- package/dist/esm/extractor/extractToClassNames.native.js.map +2 -2
- package/package.json +15 -15
- package/src/extractor/createExtractor.ts +23 -22
- package/src/extractor/extractMediaStyle.ts +2 -2
- package/src/extractor/extractToClassNames.ts +30 -16
- package/types/extractor/babelParse.d.ts +0 -1
- package/types/extractor/babelParse.d.ts.map +1 -1
- package/types/extractor/createEvaluator.d.ts.map +1 -1
- package/types/extractor/createExtractor.d.ts.map +1 -1
- package/types/extractor/extractToClassNames.d.ts +0 -1
- package/types/extractor/extractToClassNames.d.ts.map +1 -1
- package/types/extractor/getStaticBindingsForScope.d.ts.map +1 -1
- package/types/extractor/loadTamagui.d.ts.map +1 -1
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/extractor/extractMediaStyle.ts"],
|
4
|
-
"mappings": "AACA,YAAY,OAAO;AAEnB,YAAY,UAAU;AAGtB,SAAS,0BAA0B;AAEnC,SAAS,WAAW,qBAAqB;AAElC,SAAS,kBACd,OACA,SACA,SACA,eACA,YACA,aAAa,GACb,mBAAwC,IACxC;AACA,QAAM,EAAE,iBAAiB,oBAAoB,IAAI,mBAAmB,KAAK,GACnE,KAAK,qBAAqB,OAAO,SAAS,SAAS,UAAU;AACnE,MAAI,CAAC;AACH,WAAO;AAET,QAAM,EAAE,IAAI,IAAI;AAEhB,MAAI,CADO,cAAc,MAAM,GAAG;AAEhC,mBAAQ,MAAM,gBAAgB,GAAG,gBAAgB,OAAO,KAAK,cAAc,KAAK,CAAC,EAAE,GAC5E;AAET,QAAM,cAAc,CAAC,UAA4B,SAAS,OACjD,WAAW,EAAE,UAAU,OAAO,IAAI,MAErC,YAAY;AAAA,IAChB,YAAY,QAAQ,YAAY,EAAK;AAAA,IACrC,YAAY,QAAQ,WAAW,EAAI;AAAA,EACrC,EAAE,OAAO,SAAS;AAClB,MAAI,oBAAoB,CAAC,UAAU;AACjC,mBAAQ,KAAK,2BAA2B,GACjC;AAIT,QAAM,sBADY,OAAO,KAAK,cAAc,KAAK,EACX,OAAO,CAAC,KAAK,KAAK,OACtD,IAAI,GAAG,IAAI,IAAI,MAAM,aAAa,CAAC,EAAE,KAAK,OAAO,EAAE,KAAK,EAAE,GACnD,MACN,CAAC,CAAC;AACL,MAAI,cAA6B,CAAC;AAKlC,aAAW,EAAE,UAAU,OAAO,KAAK,WAAW;AAG5C,UAAM,oBAFS,gBAAgB,QAAe,EAEb,IAAI,CAAC,UAAU;AAC9C,YAAM,aAAa,KAAK;AAAA,QACtB;AAAA,QACA;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,GACM,YAAY,IAAI,WAAW,
|
4
|
+
"mappings": "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",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -27,13 +27,13 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, i
|
|
27
27
|
} of styleOpts) {
|
28
28
|
const singleMediaStyles = getStylesAtomic(styleObj).map(style => {
|
29
29
|
const mediaStyle = core.createMediaStyle(style, key, tamaguiConfig.media, !0, negate),
|
30
|
-
className = `.${mediaStyle.
|
30
|
+
className = `.${mediaStyle[core.StyleObjectIdentifier]}`;
|
31
31
|
return {
|
32
32
|
...mediaStyle,
|
33
33
|
className
|
34
34
|
};
|
35
35
|
});
|
36
|
-
shouldPrintDebug === "verbose" && console.info(" media styles:", importance, styleObj, singleMediaStyles.map(x => x.
|
36
|
+
shouldPrintDebug === "verbose" && console.info(" media styles:", importance, styleObj, singleMediaStyles.map(x => x[core.StyleObjectIdentifier]).join(", ")), mediaStyles = [...mediaStyles, ...singleMediaStyles];
|
37
37
|
}
|
38
38
|
return ternary.remove(), {
|
39
39
|
mediaStyles,
|
@@ -86,13 +86,13 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath) {
|
|
86
86
|
try {
|
87
87
|
for (var _loop = function() {
|
88
88
|
var _step_value = _step.value, styleObj = _step_value.styleObj, negate = _step_value.negate, styles = getStylesAtomic(styleObj), singleMediaStyles = styles.map(function(style) {
|
89
|
-
var mediaStyle = core.createMediaStyle(style, key, tamaguiConfig.media, !0, negate), className = ".".concat(mediaStyle.
|
89
|
+
var mediaStyle = core.createMediaStyle(style, key, tamaguiConfig.media, !0, negate), className = ".".concat(mediaStyle[core.StyleObjectIdentifier]);
|
90
90
|
return _object_spread_props(_object_spread({}, mediaStyle), {
|
91
91
|
className
|
92
92
|
});
|
93
93
|
});
|
94
94
|
shouldPrintDebug === "verbose" && console.info(" media styles:", importance, styleObj, singleMediaStyles.map(function(x) {
|
95
|
-
return x.
|
95
|
+
return x[core.StyleObjectIdentifier];
|
96
96
|
}).join(", ")), mediaStyles = _to_consumable_array(mediaStyles).concat(_to_consumable_array(singleMediaStyles));
|
97
97
|
}, _iterator = styleOpts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
|
98
98
|
} catch (err) {
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/extractor/Users/n8/tamagui/packages/static/src/extractor/extractMediaStyle.ts"],
|
4
|
-
"mappings": "AACA,YAAYA,OAAO;AAEnB,YAAYC,UAAU;AAGtB,SAASC,0BAA0B;AAEnC,SAASC,WAAWC,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,SAASC,kBACdC,OACAC,SACAC,SACAC,eACAC,YAAkB;MAClBC,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAa,GACbC,mBAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAwC,IAESV,sBAAAA,mBAAmB,KAAA,GAA5DW,kBAAyCX,oBAAzCW,iBAAiBC,sBAAwBZ,oBAAxBY,qBACnBC,KAAKC,qBAAqBV,OAAOC,SAASC,SAASE,UAAAA;AACzD,MAAI,CAACK;AACH,WAAO;AAET,MAAQE,MAAQF,GAARE,KACFC,KAAKT,cAAcU,MAAMF,GAAAA;AAC/B,MAAI,CAACC;AACHE,mBAAQC,MAAO,gBAAkCC,OAAnBL,KAAI,eAAA,EAAgD,OAAjCK,OAAOC,KAAKd,cAAcU,KAAK,CAAA,CAAA,GACzE;AAET,MAAMK,cAAc,SAACC,UAAAA;QAA4BC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS;AACxD,WAAOD,WAAW;MAAEA;MAAUC;IAAO,IAAI;EAC3C,GACMC,YAAY;IAChBH,YAAYjB,QAAQqB,YAAY,EAAA;IAChCJ,YAAYjB,QAAQsB,WAAW,EAAA;IAC/BC,OAAO3B,SAAAA;AACT,MAAIS,oBAAoB,CAACe,UAAUI;AACjCX,mBAAQY,KAAK,2BAAA,GACN;AAGT,MAAMC,YAAYX,OAAOC,KAAKd,cAAcU,KAAK,GAC3Ce,sBAAsBD,UAAUE,OAAO,SAACC,KAAKC,KAAKC,GAAAA;AACtDF,eAAIC,GAAAA,IAAO,IAAIE,MAAM5B,aAAa,CAAA,EAAG6B,KAAK,OAAA,EAASC,KAAK,EAAA,GACjDL;EACT,GAAG,CAAC,CAAA,GACAM,cAA6B,CAAA,GAK5B,4BAAA,IAAA,oBAAA,IAAA,iBAAA;;AAAL;AAAK,UAAA,cAAA,MAAA,OAAQjB,WAAAA,YAAAA,UAAUC,SAAAA,YAAAA,QACfiB,SAAS9B,gBAAgBY,QAAAA,GAEzBmB,oBAAoBD,OAAOE,IAAI,SAACC,OAAAA;AACpC,YAAMC,aAAa9C,KAAK+C,iBACtBF,OACA7B,KACAR,cAAcU,OACd,IACAO,MAAAA,GAEIuB,YAAa,
|
5
|
-
"names": ["t", "core", "requireTamaguiCore", "isPresent", "isValidImport", "extractMediaStyle", "props", "ternary", "jsxPath", "tamaguiConfig", "sourcePath", "importance", "shouldPrintDebug", "getStylesAtomic", "mediaObjectToString", "mt", "getMediaQueryTernary", "key", "mq", "media", "console", "error", "Object", "keys", "getStyleObj", "styleObj", "negate", "styleOpts", "consequent", "alternate", "filter", "length", "info", "mediaKeys", "mediaKeyPrecendence", "reduce", "acc", "cur", "i", "Array", "fill", "join", "mediaStyles", "styles", "singleMediaStyles", "map", "style", "mediaStyle", "createMediaStyle", "className", "
|
4
|
+
"mappings": "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",
|
5
|
+
"names": ["t", "core", "requireTamaguiCore", "isPresent", "isValidImport", "extractMediaStyle", "props", "ternary", "jsxPath", "tamaguiConfig", "sourcePath", "importance", "shouldPrintDebug", "getStylesAtomic", "mediaObjectToString", "mt", "getMediaQueryTernary", "key", "mq", "media", "console", "error", "Object", "keys", "getStyleObj", "styleObj", "negate", "styleOpts", "consequent", "alternate", "filter", "length", "info", "mediaKeys", "mediaKeyPrecendence", "reduce", "acc", "cur", "i", "Array", "fill", "join", "mediaStyles", "styles", "singleMediaStyles", "map", "style", "mediaStyle", "createMediaStyle", "className", "StyleObjectIdentifier", "x", "remove", "ternaryWithoutMedia", "isLogicalExpression", "test", "operator", "mediaLeft", "getMediaInfoFromExpression", "left", "inlineMediaQuery", "right", "result", "bindingName", "isMemberExpression", "isIdentifier", "object", "property", "binding", "name", "bindings", "scope", "getAllBindings", "bindingNode", "path", "node", "isVariableDeclarator", "init", "isValidMediaCall", "getBinding", "isCallExpression", "callee", "mediaBinding", "useMediaImport", "parent", "isImportDeclaration"]
|
6
6
|
}
|
@@ -10,7 +10,6 @@ import { ensureImportingConcat } from "./ensureImportingConcat";
|
|
10
10
|
import { isSimpleSpread } from "./extractHelpers";
|
11
11
|
import { extractMediaStyle } from "./extractMediaStyle";
|
12
12
|
import { hoistClassNames } from "./hoistClassNames";
|
13
|
-
import { logLines } from "./logLines";
|
14
13
|
import { getFontFamilyClassNameFromProps } from "./propsToFontFamilyCache";
|
15
14
|
import { timer } from "./timer";
|
16
15
|
import { createLogger } from "./createLogger";
|
@@ -104,7 +103,7 @@ async function extractToClassNames({
|
|
104
103
|
case "style": {
|
105
104
|
if (isFlattened) {
|
106
105
|
const styles2 = addStyles(attr.value), newFontFamily = getFontFamilyClassNameFromProps(attr.value) || "", newClassNames = helpers.concatClassName(
|
107
|
-
styles2.map((x) => x.
|
106
|
+
styles2.map((x) => x[helpers.StyleObjectIdentifier]).join(" ") + newFontFamily
|
108
107
|
), existing = finalClassNames.find(
|
109
108
|
(x) => x.type == "StringLiteral"
|
110
109
|
);
|
@@ -117,9 +116,12 @@ async function extractToClassNames({
|
|
117
116
|
const styles2 = getStylesAtomic(attr.value);
|
118
117
|
finalStyles = [...finalStyles, ...styles2];
|
119
118
|
for (const style of styles2) {
|
120
|
-
const prop = style.
|
119
|
+
const prop = style[helpers.StyleObjectPseudo] ? `${style[helpers.StyleObjectProperty]}-${style[helpers.StyleObjectPseudo]}` : style[helpers.StyleObjectProperty];
|
121
120
|
finalAttrs.push(
|
122
|
-
t.jsxAttribute(
|
121
|
+
t.jsxAttribute(
|
122
|
+
t.jsxIdentifier(prop),
|
123
|
+
t.stringLiteral(style[helpers.StyleObjectIdentifier])
|
124
|
+
)
|
123
125
|
);
|
124
126
|
}
|
125
127
|
}
|
@@ -162,9 +164,9 @@ async function extractToClassNames({
|
|
162
164
|
if (shouldPrintDebug && mediaExtraction && console.info(
|
163
165
|
"ternary (mediaStyles)",
|
164
166
|
mediaExtraction.ternaryWithoutMedia?.inlineMediaQuery ?? "",
|
165
|
-
mediaExtraction.mediaStyles.map((x) => x.
|
167
|
+
mediaExtraction.mediaStyles.map((x) => x[helpers.StyleObjectIdentifier]).join(".")
|
166
168
|
), !mediaExtraction) {
|
167
|
-
addTernaryStyle(
|
169
|
+
shouldPrintDebug && mediaExtraction && console.info("add ternary"), addTernaryStyle(
|
168
170
|
attr.value,
|
169
171
|
addStyles(attr.value.consequent),
|
170
172
|
addStyles(attr.value.alternate)
|
@@ -177,13 +179,15 @@ async function extractToClassNames({
|
|
177
179
|
[]
|
178
180
|
) : finalClassNames = [
|
179
181
|
...finalClassNames,
|
180
|
-
...mediaExtraction.mediaStyles.map(
|
182
|
+
...mediaExtraction.mediaStyles.map(
|
183
|
+
(x) => t.stringLiteral(x[helpers.StyleObjectIdentifier])
|
184
|
+
)
|
181
185
|
];
|
182
186
|
break;
|
183
187
|
}
|
184
188
|
}
|
185
189
|
function addTernaryStyle(ternary, a, b) {
|
186
|
-
const cCN = a.map((x) => x.
|
190
|
+
const cCN = a.map((x) => x[helpers.StyleObjectIdentifier]).join(" "), aCN = b.map((x) => x[helpers.StyleObjectIdentifier]).join(" ");
|
187
191
|
a.length && b.length ? finalClassNames.push(
|
188
192
|
t.conditionalExpression(
|
189
193
|
ternary.test,
|
@@ -198,11 +202,8 @@ async function extractToClassNames({
|
|
198
202
|
)
|
199
203
|
);
|
200
204
|
}
|
201
|
-
if (shouldPrintDebug && console.info(
|
202
|
-
|
203
|
-
`,
|
204
|
-
logLines(finalClassNames.map((x) => x.value).join(" "))
|
205
|
-
), node.attributes = finalAttrs, finalClassNames.length) {
|
205
|
+
if (shouldPrintDebug === "verbose" && console.info(` finalClassNames AST
|
206
|
+
`, JSON.stringify(finalClassNames, null, 2)), node.attributes = finalAttrs, finalClassNames.length) {
|
206
207
|
const extraClassNames = (() => {
|
207
208
|
let value = "";
|
208
209
|
return isFlattened && (process.env.TAMAGUI_DEBUG_OPTIMIZATIONS && (value += "is_tamagui_flattened"), staticConfig.componentName && (value += ` is_${staticConfig.componentName}`)), value;
|
@@ -226,8 +227,8 @@ async function extractToClassNames({
|
|
226
227
|
lineNumbers,
|
227
228
|
originalNodeName
|
228
229
|
);
|
229
|
-
for (const
|
230
|
-
const className = `.${identifier}`;
|
230
|
+
for (const styleObject of finalStyles) {
|
231
|
+
const identifier = styleObject[helpers.StyleObjectIdentifier], rules = styleObject[helpers.StyleObjectRules], className = `.${identifier}`;
|
231
232
|
if (cssMap.has(className)) {
|
232
233
|
if (comment) {
|
233
234
|
const val = cssMap.get(className);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/extractor/extractToClassNames.ts"],
|
4
|
-
"mappings": "AAAA,YAAY,UAAU;AACtB,YAAY,UAAU;AAEtB,OAAO,cAAc;AACrB,YAAY,OAAO;AACnB,YAAY,aAAa;AAGzB,SAAS,0BAA0B;AAEnC,SAAS,kBAAkB;AAC3B,SAAS,sBAAsB;AAE/B,SAAS,6BAA6B;AACtC,SAAS,sBAAsB;AAC/B,SAAS,yBAAyB;AAClC,SAAS,uBAAuB;
|
4
|
+
"mappings": "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",
|
5
5
|
"names": ["res", "styles"]
|
6
6
|
}
|
@@ -10,7 +10,6 @@ import { ensureImportingConcat } from "./ensureImportingConcat.mjs";
|
|
10
10
|
import { isSimpleSpread } from "./extractHelpers.mjs";
|
11
11
|
import { extractMediaStyle } from "./extractMediaStyle.mjs";
|
12
12
|
import { hoistClassNames } from "./hoistClassNames.mjs";
|
13
|
-
import { logLines } from "./logLines.mjs";
|
14
13
|
import { getFontFamilyClassNameFromProps } from "./propsToFontFamilyCache.mjs";
|
15
14
|
import { timer } from "./timer.mjs";
|
16
15
|
import { createLogger } from "./createLogger.mjs";
|
@@ -109,7 +108,7 @@ async function extractToClassNames({
|
|
109
108
|
if (isFlattened) {
|
110
109
|
const styles2 = addStyles(attr.value),
|
111
110
|
newFontFamily = getFontFamilyClassNameFromProps(attr.value) || "",
|
112
|
-
newClassNames = helpers.concatClassName(styles2.map(x => x.
|
111
|
+
newClassNames = helpers.concatClassName(styles2.map(x => x[helpers.StyleObjectIdentifier]).join(" ") + newFontFamily),
|
113
112
|
existing = finalClassNames.find(x => x.type == "StringLiteral");
|
114
113
|
if (existing) {
|
115
114
|
let previous = existing.value;
|
@@ -119,8 +118,8 @@ async function extractToClassNames({
|
|
119
118
|
const styles2 = getStylesAtomic(attr.value);
|
120
119
|
finalStyles = [...finalStyles, ...styles2];
|
121
120
|
for (const style of styles2) {
|
122
|
-
const prop = style.
|
123
|
-
finalAttrs.push(t.jsxAttribute(t.jsxIdentifier(prop), t.stringLiteral(style.
|
121
|
+
const prop = style[helpers.StyleObjectPseudo] ? `${style[helpers.StyleObjectProperty]}-${style[helpers.StyleObjectPseudo]}` : style[helpers.StyleObjectProperty];
|
122
|
+
finalAttrs.push(t.jsxAttribute(t.jsxIdentifier(prop), t.stringLiteral(style[helpers.StyleObjectIdentifier])));
|
124
123
|
}
|
125
124
|
}
|
126
125
|
break;
|
@@ -144,21 +143,21 @@ async function extractToClassNames({
|
|
144
143
|
case "ternary":
|
145
144
|
{
|
146
145
|
const mediaExtraction = extractMediaStyle(parserProps, attr.value, jsxPath, extractor.getTamagui(), sourcePath || "", lastMediaImportance, shouldPrintDebug);
|
147
|
-
if (shouldPrintDebug && mediaExtraction && console.info("ternary (mediaStyles)", mediaExtraction.ternaryWithoutMedia?.inlineMediaQuery ?? "", mediaExtraction.mediaStyles.map(x => x.
|
148
|
-
addTernaryStyle(attr.value, addStyles(attr.value.consequent), addStyles(attr.value.alternate));
|
146
|
+
if (shouldPrintDebug && mediaExtraction && console.info("ternary (mediaStyles)", mediaExtraction.ternaryWithoutMedia?.inlineMediaQuery ?? "", mediaExtraction.mediaStyles.map(x => x[helpers.StyleObjectIdentifier]).join(".")), !mediaExtraction) {
|
147
|
+
shouldPrintDebug && mediaExtraction && console.info("add ternary"), addTernaryStyle(attr.value, addStyles(attr.value.consequent), addStyles(attr.value.alternate));
|
149
148
|
continue;
|
150
149
|
}
|
151
|
-
lastMediaImportance++, mediaExtraction.mediaStyles && (finalStyles = [...finalStyles, ...mediaExtraction.mediaStyles]), mediaExtraction.ternaryWithoutMedia ? addTernaryStyle(mediaExtraction.ternaryWithoutMedia, mediaExtraction.mediaStyles, []) : finalClassNames = [...finalClassNames, ...mediaExtraction.mediaStyles.map(x => t.stringLiteral(x.
|
150
|
+
lastMediaImportance++, mediaExtraction.mediaStyles && (finalStyles = [...finalStyles, ...mediaExtraction.mediaStyles]), mediaExtraction.ternaryWithoutMedia ? addTernaryStyle(mediaExtraction.ternaryWithoutMedia, mediaExtraction.mediaStyles, []) : finalClassNames = [...finalClassNames, ...mediaExtraction.mediaStyles.map(x => t.stringLiteral(x[helpers.StyleObjectIdentifier]))];
|
152
151
|
break;
|
153
152
|
}
|
154
153
|
}
|
155
154
|
function addTernaryStyle(ternary, a, b) {
|
156
|
-
const cCN = a.map(x => x.
|
157
|
-
aCN = b.map(x => x.
|
155
|
+
const cCN = a.map(x => x[helpers.StyleObjectIdentifier]).join(" "),
|
156
|
+
aCN = b.map(x => x[helpers.StyleObjectIdentifier]).join(" ");
|
158
157
|
a.length && b.length ? finalClassNames.push(t.conditionalExpression(ternary.test, t.stringLiteral(cCN), t.stringLiteral(aCN))) : finalClassNames.push(t.conditionalExpression(ternary.test, t.stringLiteral(" " + cCN), t.stringLiteral(" " + aCN)));
|
159
158
|
}
|
160
|
-
if (shouldPrintDebug && console.info(` finalClassNames
|
161
|
-
`,
|
159
|
+
if (shouldPrintDebug === "verbose" && console.info(` finalClassNames AST
|
160
|
+
`, JSON.stringify(finalClassNames, null, 2)), node.attributes = finalAttrs, finalClassNames.length) {
|
162
161
|
const extraClassNames = (() => {
|
163
162
|
let value = "";
|
164
163
|
return isFlattened && (process.env.TAMAGUI_DEBUG_OPTIMIZATIONS && (value += "is_tamagui_flattened"), staticConfig.componentName && (value += ` is_${staticConfig.componentName}`)), value;
|
@@ -174,11 +173,10 @@ async function extractToClassNames({
|
|
174
173
|
node.attributes.push(t.jsxAttribute(t.jsxIdentifier("className"), t.jsxExpressionContainer(expr)));
|
175
174
|
}
|
176
175
|
const comment = util.format("/* %s:%s (%s) */", filePath, lineNumbers, originalNodeName);
|
177
|
-
for (const {
|
178
|
-
identifier,
|
179
|
-
|
180
|
-
|
181
|
-
const className = `.${identifier}`;
|
176
|
+
for (const styleObject of finalStyles) {
|
177
|
+
const identifier = styleObject[helpers.StyleObjectIdentifier],
|
178
|
+
rules = styleObject[helpers.StyleObjectRules],
|
179
|
+
className = `.${identifier}`;
|
182
180
|
if (cssMap.has(className)) {
|
183
181
|
if (comment) {
|
184
182
|
const val = cssMap.get(className);
|
@@ -10,7 +10,6 @@ import { ensureImportingConcat } from "./ensureImportingConcat";
|
|
10
10
|
import { isSimpleSpread } from "./extractHelpers";
|
11
11
|
import { extractMediaStyle } from "./extractMediaStyle";
|
12
12
|
import { hoistClassNames } from "./hoistClassNames";
|
13
|
-
import { logLines } from "./logLines";
|
14
13
|
import { getFontFamilyClassNameFromProps } from "./propsToFontFamilyCache";
|
15
14
|
import { timer } from "./timer";
|
16
15
|
import { createLogger } from "./createLogger";
|
@@ -247,9 +246,9 @@ function _extractToClassNames() {
|
|
247
246
|
onExtractTag: function(param2) {
|
248
247
|
var parserProps = param2.parserProps, attrs = param2.attrs, node = param2.node, attemptEval = param2.attemptEval, jsxPath = param2.jsxPath, originalNodeName = param2.originalNodeName, filePath = param2.filePath, lineNumbers = param2.lineNumbers, programPath = param2.programPath, isFlattened = param2.isFlattened, staticConfig = param2.staticConfig, addTernaryStyle = function(ternary, a, b) {
|
249
248
|
var cCN = a.map(function(x) {
|
250
|
-
return x.
|
249
|
+
return x[helpers.StyleObjectIdentifier];
|
251
250
|
}).join(" "), aCN = b.map(function(x) {
|
252
|
-
return x.
|
251
|
+
return x[helpers.StyleObjectIdentifier];
|
253
252
|
}).join(" ");
|
254
253
|
a.length && b.length ? finalClassNames.push(t.conditionalExpression(ternary.test, t.stringLiteral(cCN), t.stringLiteral(aCN))) : finalClassNames.push(t.conditionalExpression(ternary.test, t.stringLiteral(" " + cCN), t.stringLiteral(" " + aCN)));
|
255
254
|
};
|
@@ -299,7 +298,7 @@ function _extractToClassNames() {
|
|
299
298
|
case "style": {
|
300
299
|
if (isFlattened) {
|
301
300
|
var styles1 = addStyles(attr1.value), newFontFamily = getFontFamilyClassNameFromProps(attr1.value) || "", newClassNames = helpers.concatClassName(styles1.map(function(x) {
|
302
|
-
return x.
|
301
|
+
return x[helpers.StyleObjectIdentifier];
|
303
302
|
}).join(" ") + newFontFamily), existing = finalClassNames.find(function(x) {
|
304
303
|
return x.type == "StringLiteral";
|
305
304
|
});
|
@@ -316,8 +315,8 @@ function _extractToClassNames() {
|
|
316
315
|
var _iteratorNormalCompletion2 = !0, _didIteratorError2 = !1, _iteratorError2 = void 0;
|
317
316
|
try {
|
318
317
|
for (var _iterator2 = styles2[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
|
319
|
-
var style = _step2.value, prop = style.
|
320
|
-
finalAttrs.push(t.jsxAttribute(t.jsxIdentifier(prop), t.stringLiteral(style.
|
318
|
+
var style = _step2.value, prop = style[helpers.StyleObjectPseudo] ? "".concat(style[helpers.StyleObjectProperty], "-").concat(style[helpers.StyleObjectPseudo]) : style[helpers.StyleObjectProperty];
|
319
|
+
finalAttrs.push(t.jsxAttribute(t.jsxIdentifier(prop), t.stringLiteral(style[helpers.StyleObjectIdentifier])));
|
321
320
|
}
|
322
321
|
} catch (err) {
|
323
322
|
_didIteratorError2 = !0, _iteratorError2 = err;
|
@@ -355,15 +354,15 @@ function _extractToClassNames() {
|
|
355
354
|
if (shouldPrintDebug && mediaExtraction) {
|
356
355
|
var _mediaExtraction_ternaryWithoutMedia, _mediaExtraction_ternaryWithoutMedia_inlineMediaQuery;
|
357
356
|
console.info("ternary (mediaStyles)", (_mediaExtraction_ternaryWithoutMedia_inlineMediaQuery = (_mediaExtraction_ternaryWithoutMedia = mediaExtraction.ternaryWithoutMedia) === null || _mediaExtraction_ternaryWithoutMedia === void 0 ? void 0 : _mediaExtraction_ternaryWithoutMedia.inlineMediaQuery) !== null && _mediaExtraction_ternaryWithoutMedia_inlineMediaQuery !== void 0 ? _mediaExtraction_ternaryWithoutMedia_inlineMediaQuery : "", mediaExtraction.mediaStyles.map(function(x) {
|
358
|
-
return x.
|
357
|
+
return x[helpers.StyleObjectIdentifier];
|
359
358
|
}).join("."));
|
360
359
|
}
|
361
360
|
if (!mediaExtraction) {
|
362
|
-
addTernaryStyle(attr1.value, addStyles(attr1.value.consequent), addStyles(attr1.value.alternate));
|
361
|
+
shouldPrintDebug && mediaExtraction && console.info("add ternary"), addTernaryStyle(attr1.value, addStyles(attr1.value.consequent), addStyles(attr1.value.alternate));
|
363
362
|
continue;
|
364
363
|
}
|
365
364
|
lastMediaImportance++, mediaExtraction.mediaStyles && (finalStyles = _to_consumable_array(finalStyles).concat(_to_consumable_array(mediaExtraction.mediaStyles))), mediaExtraction.ternaryWithoutMedia ? addTernaryStyle(mediaExtraction.ternaryWithoutMedia, mediaExtraction.mediaStyles, []) : finalClassNames = _to_consumable_array(finalClassNames).concat(_to_consumable_array(mediaExtraction.mediaStyles.map(function(x) {
|
366
|
-
return t.stringLiteral(x.
|
365
|
+
return t.stringLiteral(x[helpers.StyleObjectIdentifier]);
|
367
366
|
})));
|
368
367
|
break;
|
369
368
|
}
|
@@ -379,10 +378,8 @@ function _extractToClassNames() {
|
|
379
378
|
throw _iteratorError1;
|
380
379
|
}
|
381
380
|
}
|
382
|
-
if (shouldPrintDebug && console.info(` finalClassNames
|
383
|
-
`,
|
384
|
-
return x.value;
|
385
|
-
}).join(" "))), node.attributes = finalAttrs, finalClassNames.length) {
|
381
|
+
if (shouldPrintDebug === "verbose" && console.info(` finalClassNames AST
|
382
|
+
`, JSON.stringify(finalClassNames, null, 2)), node.attributes = finalAttrs, finalClassNames.length) {
|
386
383
|
var extraClassNames = function() {
|
387
384
|
var value2 = "";
|
388
385
|
return isFlattened && (process.env.TAMAGUI_DEBUG_OPTIMIZATIONS && (value2 += "is_tamagui_flattened"), staticConfig.componentName && (value2 += " is_".concat(staticConfig.componentName))), value2;
|
@@ -403,7 +400,7 @@ function _extractToClassNames() {
|
|
403
400
|
var comment = util.format("/* %s:%s (%s) */", filePath, lineNumbers, originalNodeName), _iteratorNormalCompletion3 = !0, _didIteratorError3 = !1, _iteratorError3 = void 0;
|
404
401
|
try {
|
405
402
|
for (var _iterator3 = finalStyles[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) {
|
406
|
-
var
|
403
|
+
var styleObject = _step3.value, identifier = styleObject[helpers.StyleObjectIdentifier], rules = styleObject[helpers.StyleObjectRules], className = ".".concat(identifier);
|
407
404
|
if (cssMap.has(className)) {
|
408
405
|
if (comment) {
|
409
406
|
var val1 = cssMap.get(className);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/extractor/Users/n8/tamagui/packages/static/src/extractor/extractToClassNames.ts"],
|
4
|
-
"mappings": "AAAA,YAAYA,UAAU;AACtB,YAAYC,UAAU;AAEtB,OAAOC,cAAc;AACrB,YAAYC,OAAO;AACnB,YAAYC,aAAa;AAGzB,SAASC,0BAA0B;AAEnC,SAASC,kBAAkB;AAC3B,SAASC,sBAAsB;AAE/B,SAASC,6BAA6B;AACtC,SAASC,sBAAsB;AAC/B,SAASC,yBAAyB;AAClC,SAASC,uBAAuB;
|
5
|
-
"names": ["path", "util", "generate", "t", "helpers", "requireTamaguiCore", "babelParse", "buildClassName", "ensureImportingConcat", "isSimpleSpread", "extractMediaStyle", "hoistClassNames", "
|
4
|
+
"mappings": "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",
|
5
|
+
"names": ["path", "util", "generate", "t", "helpers", "requireTamaguiCore", "babelParse", "buildClassName", "ensureImportingConcat", "isSimpleSpread", "extractMediaStyle", "hoistClassNames", "getFontFamilyClassNameFromProps", "timer", "createLogger", "mergeStyleGroups", "shadowOpacity", "shadowRadius", "shadowColor", "shadowOffset", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "getStylesAtomic", "printLog", "ast", "cssMap", "existingHoists", "hasFlattened", "res", "styles", "result", "includes", "console", "warn", "Error", "isAbsolute", "test", "slice", "disableExtraction", "loadTamagui", "err", "error", "mark", "Map", "parse", "platform", "extractStyledDefinitions", "onStyleRule", "identifier", "rules", "css", "join", "info", "set", "commentTexts", "getFlattenedNode", "param", "tag", "onExtractTag", "parserProps", "attrs", "node", "attemptEval", "jsxPath", "originalNodeName", "filePath", "lineNumbers", "programPath", "isFlattened", "staticConfig", "addTernaryStyle", "ternary", "a", "b", "cCN", "map", "x", "StyleObjectIdentifier", "aCN", "length", "finalClassNames", "push", "conditionalExpression", "stringLiteral", "acceptsClassName", "didFlattenThisTag", "finalAttrs", "finalStyles", "viewStyles", "attr", "type", "value", "ensureNeededPrevStyle", "style", "keys", "Object", "some", "key", "k", "addStyles", "styleWithPrev", "lastMediaImportance", "newFontFamily", "newClassNames", "concatClassName", "existing", "find", "previous", "replace", "prop", "StyleObjectPseudo", "StyleObjectProperty", "jsxAttribute", "jsxIdentifier", "val", "isJSXSpreadAttribute", "logicalExpression", "argument", "memberExpression", "name", "evaluatedValue", "mediaExtraction", "getTamagui", "ternaryWithoutMedia", "inlineMediaQuery", "mediaStyles", "consequent", "alternate", "JSON", "stringify", "attributes", "extraClassNames", "process", "env", "TAMAGUI_DEBUG_OPTIMIZATIONS", "componentName", "names", "nameExpr", "expr", "isIdentifier", "simpleSpreads", "filter", "callExpression", "jsxExpressionContainer", "comment", "format", "styleObject", "StyleObjectRules", "className", "has", "get", "modified", "optimized", "flattened", "styled", "Array", "from", "values", "trim", "concise", "filename", "retainLines", "sourceFileName", "sourceMaps", "code", "split", "startsWith", "js"]
|
6
6
|
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@tamagui/static",
|
3
|
-
"version": "1.101.
|
3
|
+
"version": "1.101.2",
|
4
4
|
"source": "src/index.ts",
|
5
5
|
"types": "./types/index.d.ts",
|
6
6
|
"main": "dist/cjs/index.js",
|
@@ -43,17 +43,17 @@
|
|
43
43
|
"@babel/runtime": "^7.23.2",
|
44
44
|
"@babel/traverse": "^7.23.3",
|
45
45
|
"@babel/types": "^7.23.3",
|
46
|
-
"@tamagui/build": "1.101.
|
47
|
-
"@tamagui/cli-color": "1.101.
|
48
|
-
"@tamagui/config-default": "1.101.
|
49
|
-
"@tamagui/core": "1.101.
|
50
|
-
"@tamagui/fake-react-native": "1.101.
|
51
|
-
"@tamagui/generate-themes": "1.101.
|
52
|
-
"@tamagui/helpers": "1.101.
|
53
|
-
"@tamagui/helpers-node": "1.101.
|
54
|
-
"@tamagui/proxy-worm": "1.101.
|
55
|
-
"@tamagui/shorthands": "1.101.
|
56
|
-
"@tamagui/types": "1.101.
|
46
|
+
"@tamagui/build": "1.101.2",
|
47
|
+
"@tamagui/cli-color": "1.101.2",
|
48
|
+
"@tamagui/config-default": "1.101.2",
|
49
|
+
"@tamagui/core": "1.101.2",
|
50
|
+
"@tamagui/fake-react-native": "1.101.2",
|
51
|
+
"@tamagui/generate-themes": "1.101.2",
|
52
|
+
"@tamagui/helpers": "1.101.2",
|
53
|
+
"@tamagui/helpers-node": "1.101.2",
|
54
|
+
"@tamagui/proxy-worm": "1.101.2",
|
55
|
+
"@tamagui/shorthands": "1.101.2",
|
56
|
+
"@tamagui/types": "1.101.2",
|
57
57
|
"babel-literal-to-ast": "^2.1.0",
|
58
58
|
"browserslist": "^4.22.2",
|
59
59
|
"check-dependency-version-consistency": "^4.1.0",
|
@@ -66,8 +66,8 @@
|
|
66
66
|
"lodash": "^4.17.21",
|
67
67
|
"react-dom": "^18.2.0",
|
68
68
|
"react-native-web": "^0.19.12",
|
69
|
-
"react-native-web-internals": "1.101.
|
70
|
-
"react-native-web-lite": "1.101.
|
69
|
+
"react-native-web-internals": "1.101.2",
|
70
|
+
"react-native-web-lite": "1.101.2"
|
71
71
|
},
|
72
72
|
"devDependencies": {
|
73
73
|
"@babel/plugin-syntax-typescript": "^7.23.3",
|
@@ -80,7 +80,7 @@
|
|
80
80
|
"esbuild-loader": "^3.0.1",
|
81
81
|
"null-loader": "^4.0.1",
|
82
82
|
"react": "^18.2.0",
|
83
|
-
"typescript": "^5.
|
83
|
+
"typescript": "^5.5.2"
|
84
84
|
},
|
85
85
|
"gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14"
|
86
86
|
}
|
@@ -5,12 +5,14 @@ import type { NodePath, TraverseOptions } from '@babel/traverse'
|
|
5
5
|
import traverse from '@babel/traverse'
|
6
6
|
import * as t from '@babel/types'
|
7
7
|
import { Color, colorLog } from '@tamagui/cli-color'
|
8
|
-
import
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
8
|
+
import {
|
9
|
+
StyleObjectIdentifier,
|
10
|
+
StyleObjectRules,
|
11
|
+
type GetStyleState,
|
12
|
+
type PseudoStyles,
|
13
|
+
type SplitStyleProps,
|
14
|
+
type StaticConfig,
|
15
|
+
type TamaguiComponentState,
|
14
16
|
} from '@tamagui/web'
|
15
17
|
import type { ViewStyle } from 'react-native'
|
16
18
|
import * as reactNativeWebInternals from 'react-native-web-internals'
|
@@ -299,10 +301,10 @@ export function createExtractor(
|
|
299
301
|
const firstTheme = tamaguiConfig?.themes[firstThemeName] || {}
|
300
302
|
|
301
303
|
if (!firstTheme || typeof firstTheme !== 'object') {
|
302
|
-
|
303
|
-
console.info(`Got config:`, tamaguiConfig)
|
304
|
+
const err = `Missing theme ${firstThemeName}, an error occurred when importing your config`
|
305
|
+
console.info(err, `Got config:`, tamaguiConfig)
|
304
306
|
console.info(`Looking for theme:`, firstThemeName)
|
305
|
-
|
307
|
+
throw new Error(err)
|
306
308
|
}
|
307
309
|
|
308
310
|
const proxiedTheme = proxyThemeVariables(firstTheme)
|
@@ -649,7 +651,9 @@ export function createExtractor(
|
|
649
651
|
'\n classNames:',
|
650
652
|
JSON.stringify(classNames, null, 2),
|
651
653
|
'\n rulesToInsert:',
|
652
|
-
out.rulesToInsert
|
654
|
+
out.rulesToInsert
|
655
|
+
.flatMap((styleObject) => styleObject[StyleObjectRules])
|
656
|
+
.join('\n'),
|
653
657
|
].join(' ')
|
654
658
|
)
|
655
659
|
}
|
@@ -673,8 +677,11 @@ export function createExtractor(
|
|
673
677
|
})
|
674
678
|
|
675
679
|
if (out.rulesToInsert) {
|
676
|
-
for (const
|
677
|
-
onStyleRule?.(
|
680
|
+
for (const styleObject of out.rulesToInsert) {
|
681
|
+
onStyleRule?.(
|
682
|
+
styleObject[StyleObjectIdentifier],
|
683
|
+
styleObject[StyleObjectRules]
|
684
|
+
)
|
678
685
|
}
|
679
686
|
}
|
680
687
|
|
@@ -693,10 +700,6 @@ export function createExtractor(
|
|
693
700
|
const componentName = findComponentName(traversePath.scope)
|
694
701
|
const closingElement = traversePath.node.closingElement
|
695
702
|
|
696
|
-
if (shouldPrintDebug) {
|
697
|
-
logger.info(` start ${node.name}`)
|
698
|
-
}
|
699
|
-
|
700
703
|
// skip non-identifier opening elements (member expressions, etc.)
|
701
704
|
if (
|
702
705
|
(closingElement && t.isJSXMemberExpression(closingElement?.name)) ||
|
@@ -719,7 +722,7 @@ export function createExtractor(
|
|
719
722
|
if (!isValidImport(propsWithFileInfo, moduleName, binding.identifier.name)) {
|
720
723
|
if (shouldPrintDebug) {
|
721
724
|
logger.info(
|
722
|
-
` - Binding
|
725
|
+
` - Binding in component ${componentName} not valid import: "${binding.identifier.name}" isn't in ${moduleName}\n`
|
723
726
|
)
|
724
727
|
}
|
725
728
|
return
|
@@ -730,7 +733,7 @@ export function createExtractor(
|
|
730
733
|
const component = getValidComponent(propsWithFileInfo, moduleName, node.name.name)
|
731
734
|
if (!component || !component.staticConfig) {
|
732
735
|
if (shouldPrintDebug) {
|
733
|
-
logger.info(
|
736
|
+
logger.info(`\n - No Tamagui conf for: ${node.name.name}\n`)
|
734
737
|
}
|
735
738
|
return
|
736
739
|
}
|
@@ -766,10 +769,8 @@ export function createExtractor(
|
|
766
769
|
}
|
767
770
|
|
768
771
|
if (shouldPrintDebug) {
|
769
|
-
logger.info('\n')
|
770
772
|
logger.info(
|
771
|
-
`\x1b[33m
|
772
|
-
`${componentName} | ${codePosition} -------------------`
|
773
|
+
`\x1b[33m\x1b[0m ` + `${componentName} | ${codePosition} -------------------`
|
773
774
|
)
|
774
775
|
// prettier-ignore
|
775
776
|
logger.info(
|
@@ -804,7 +805,7 @@ export function createExtractor(
|
|
804
805
|
|
805
806
|
if (shouldDisableExtraction) {
|
806
807
|
if (shouldPrintDebug === 'verbose') {
|
807
|
-
|
808
|
+
logger.info(` ❌ Extraction disabled: ${JSON.stringify(disableExtraction)}\n`)
|
808
809
|
}
|
809
810
|
return
|
810
811
|
}
|