@tamagui/static 1.132.16-1754534218765 → 1.132.16-1754855349219
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/extractor/extractToClassNames.js +43 -28
- package/dist/extractor/extractToClassNames.js.map +1 -1
- package/dist/extractor/extractToClassNames.native.js +31 -24
- package/dist/extractor/extractToClassNames.native.js.map +2 -2
- package/dist/extractor/normalizeTernaries.js +5 -6
- package/dist/extractor/normalizeTernaries.js.map +1 -1
- package/dist/extractor/normalizeTernaries.native.js +5 -3
- package/dist/extractor/normalizeTernaries.native.js.map +2 -2
- package/dist/extractor/propsToFontFamilyCache.js +7 -8
- package/dist/extractor/propsToFontFamilyCache.js.map +1 -1
- package/dist/extractor/propsToFontFamilyCache.native.js +9 -10
- package/dist/extractor/propsToFontFamilyCache.native.js.map +2 -2
- package/package.json +15 -15
- package/src/extractor/extractToClassNames.ts +34 -11
- package/src/extractor/normalizeTernaries.ts +8 -5
- package/src/extractor/propsToFontFamilyCache.ts +5 -5
- package/types/extractor/extractToClassNames.d.ts.map +1 -1
- package/types/extractor/normalizeTernaries.d.ts.map +1 -1
- package/types/extractor/propsToFontFamilyCache.d.ts +2 -2
- package/types/extractor/propsToFontFamilyCache.d.ts.map +1 -1
|
@@ -137,7 +137,7 @@ async function extractToClassNames({
|
|
|
137
137
|
return finalAttrs.push(value), [];
|
|
138
138
|
}
|
|
139
139
|
if (attr.type === "style")
|
|
140
|
-
return mergeForwardBaseStyle = mergeProps(mergeForwardBaseStyle || {}, attr.value), baseFontFamily = (0, import_propsToFontFamilyCache.
|
|
140
|
+
return mergeForwardBaseStyle = mergeProps(mergeForwardBaseStyle || {}, attr.value), baseFontFamily = (0, import_propsToFontFamilyCache.getFontFamilyNameFromProps)(attr.value) || "", [];
|
|
141
141
|
let ternary = attr.value;
|
|
142
142
|
if (ternary.inlineMediaQuery) {
|
|
143
143
|
const mediaExtraction = (0, import_extractMediaStyle.extractMediaStyle)(
|
|
@@ -157,16 +157,24 @@ async function extractToClassNames({
|
|
|
157
157
|
else
|
|
158
158
|
return [];
|
|
159
159
|
}
|
|
160
|
-
|
|
160
|
+
const mergedAlternate = mergeProps(
|
|
161
|
+
mergeForwardBaseStyle || {},
|
|
162
|
+
ternary.alternate || {}
|
|
163
|
+
), mergedConsequent = mergeProps(
|
|
164
|
+
mergeForwardBaseStyle || {},
|
|
165
|
+
ternary.consequent || {}
|
|
166
|
+
);
|
|
167
|
+
return (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.alternate, mergedAlternate), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.consequent, mergedConsequent), {
|
|
161
168
|
...ternary,
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
consequent: mergeProps(mergeForwardBaseStyle || {}, ternary.consequent || {})
|
|
169
|
+
alternate: mergedAlternate,
|
|
170
|
+
consequent: mergedConsequent
|
|
165
171
|
};
|
|
166
172
|
}), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null;
|
|
167
|
-
let baseClassNameStr = hasTernaries || !baseClassNames ? "" :
|
|
168
|
-
!hasTernaries && baseFontFamily && (baseClassNameStr = `font_${baseFontFamily} ${baseClassNameStr}`);
|
|
169
|
-
let base = staticConfig.componentName ? t.stringLiteral(
|
|
173
|
+
let baseClassNameStr = hasTernaries || !baseClassNames ? "" : baseClassNames.join(" ");
|
|
174
|
+
!hasTernaries && baseFontFamily && (baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`);
|
|
175
|
+
let base = staticConfig.componentName ? t.stringLiteral(
|
|
176
|
+
`is_${staticConfig.componentName}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`
|
|
177
|
+
) : t.stringLiteral(baseClassNameStr || "");
|
|
170
178
|
attrClassName = attrClassName;
|
|
171
179
|
const baseClassNameExpression = attrClassName ? t.isStringLiteral(attrClassName) ? t.stringLiteral(
|
|
172
180
|
base.value ? `${base.value} ${attrClassName.value}` : attrClassName.value
|
|
@@ -187,32 +195,39 @@ async function extractToClassNames({
|
|
|
187
195
|
}
|
|
188
196
|
}
|
|
189
197
|
function expandTernary(ternary, prev) {
|
|
190
|
-
if (ternary.consequent && Object.keys(ternary.consequent).length
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
198
|
+
if (ternary.consequent && Object.keys(ternary.consequent).length) {
|
|
199
|
+
const fontFamily = (0, import_propsToFontFamilyCache.getFontFamilyNameFromProps)(ternary.consequent);
|
|
200
|
+
expandedTernaries.push({
|
|
201
|
+
fontFamily,
|
|
202
|
+
// prevTest && test: merge consequent
|
|
203
|
+
test: prev ? t.logicalExpression("&&", prev.test, ternary.test) : ternary.test,
|
|
204
|
+
consequent: prev ? mergeProps(prev.consequent, ternary.consequent) : ternary.consequent,
|
|
205
|
+
remove,
|
|
206
|
+
alternate: null
|
|
207
|
+
}), prev && expandedTernaries.push({
|
|
208
|
+
fontFamily,
|
|
209
|
+
// !prevTest && test: just consequent
|
|
210
|
+
test: t.logicalExpression(
|
|
211
|
+
"&&",
|
|
212
|
+
t.unaryExpression("!", prev.test),
|
|
213
|
+
ternary.test
|
|
214
|
+
),
|
|
215
|
+
consequent: ternary.consequent,
|
|
216
|
+
alternate: null,
|
|
217
|
+
remove
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
if (ternary.alternate && Object.keys(ternary.alternate).length) {
|
|
221
|
+
const fontFamily = (0, import_propsToFontFamilyCache.getFontFamilyNameFromProps)(ternary.alternate), negated = t.unaryExpression("!", ternary.test);
|
|
208
222
|
expandedTernaries.push({
|
|
223
|
+
fontFamily,
|
|
209
224
|
// prevTest && !test: merge alternate
|
|
210
225
|
test: prev ? t.logicalExpression("&&", prev.test, negated) : negated,
|
|
211
|
-
consequent: prev ? mergeProps(prev.
|
|
226
|
+
consequent: prev ? mergeProps(prev.alternate, ternary.alternate) : ternary.alternate,
|
|
212
227
|
remove,
|
|
213
228
|
alternate: null
|
|
214
229
|
}), prev && expandedTernaries.push({
|
|
215
|
-
|
|
230
|
+
fontFamily,
|
|
216
231
|
test: t.logicalExpression(
|
|
217
232
|
"&&",
|
|
218
233
|
t.unaryExpression("!", prev.test),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extractor/extractToClassNames.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sCAErB,IAAmB,kCACnB,aAAwD,yBACxD,OAAsB,+BACtB,OAAsB,+BACtB,4BAAmC,0CAEnC,oBAA2B,yBAE3B,sBAA6B,2BAC7B,2BAAkC,gCAClC,4BAAmC,iCACnC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["style", "identifier", "generate", "path"]
|
|
6
6
|
}
|
|
@@ -128,7 +128,7 @@ async function extractToClassNames(param) {
|
|
|
128
128
|
return finalAttrs.push(value), [];
|
|
129
129
|
}
|
|
130
130
|
if (attr.type === "style")
|
|
131
|
-
return mergeForwardBaseStyle = mergeProps(mergeForwardBaseStyle || {}, attr.value), baseFontFamily = (0, import_propsToFontFamilyCache.
|
|
131
|
+
return mergeForwardBaseStyle = mergeProps(mergeForwardBaseStyle || {}, attr.value), baseFontFamily = (0, import_propsToFontFamilyCache.getFontFamilyNameFromProps)(attr.value) || "", [];
|
|
132
132
|
var ternary2 = attr.value;
|
|
133
133
|
if (ternary2.inlineMediaQuery) {
|
|
134
134
|
var mediaExtraction = (0, import_extractMediaStyle.extractMediaStyle)(parserProps, attr.value, jsxPath, extractor.getTamagui(), sourcePath || "", mediaStylesSeen++, shouldPrintDebug);
|
|
@@ -140,15 +140,15 @@ async function extractToClassNames(param) {
|
|
|
140
140
|
else
|
|
141
141
|
return [];
|
|
142
142
|
}
|
|
143
|
-
|
|
143
|
+
var mergedAlternate = mergeProps(mergeForwardBaseStyle || {}, ternary2.alternate || {}), mergedConsequent = mergeProps(mergeForwardBaseStyle || {}, ternary2.consequent || {});
|
|
144
|
+
return (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.alternate, mergedAlternate), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.consequent, mergedConsequent), {
|
|
144
145
|
...ternary2,
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
consequent: mergeProps(mergeForwardBaseStyle || {}, ternary2.consequent || {})
|
|
146
|
+
alternate: mergedAlternate,
|
|
147
|
+
consequent: mergedConsequent
|
|
148
148
|
};
|
|
149
|
-
}), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null, baseClassNameStr = hasTernaries || !baseClassNames ? "" :
|
|
150
|
-
!hasTernaries && baseFontFamily && (baseClassNameStr = `font_${baseFontFamily} ${baseClassNameStr}`);
|
|
151
|
-
var base = staticConfig.componentName ? t.stringLiteral(`is_${staticConfig.componentName}${baseClassNameStr}`) : t.stringLiteral(baseClassNameStr || "
|
|
149
|
+
}), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null, baseClassNameStr = hasTernaries || !baseClassNames ? "" : baseClassNames.join(" ");
|
|
150
|
+
!hasTernaries && baseFontFamily && (baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`);
|
|
151
|
+
var base = staticConfig.componentName ? t.stringLiteral(`is_${staticConfig.componentName}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`) : t.stringLiteral(baseClassNameStr || "");
|
|
152
152
|
attrClassName = attrClassName;
|
|
153
153
|
var baseClassNameExpression = function() {
|
|
154
154
|
return attrClassName ? t.isStringLiteral(attrClassName) ? t.stringLiteral(base.value ? `${base.value} ${attrClassName.value}` : attrClassName.value) : t.conditionalExpression(attrClassName, t.binaryExpression("+", attrClassName, spaceString), base) : base;
|
|
@@ -181,28 +181,35 @@ async function extractToClassNames(param) {
|
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
183
|
function expandTernary(ternary2, prev2) {
|
|
184
|
-
if (ternary2.consequent && Object.keys(ternary2.consequent).length
|
|
185
|
-
|
|
186
|
-
test: prev2 ? t.logicalExpression("&&", prev2.test, ternary2.test) : ternary2.test,
|
|
187
|
-
consequent: prev2 ? mergeProps(prev2.consequent, ternary2.consequent) : ternary2.consequent,
|
|
188
|
-
remove,
|
|
189
|
-
alternate: null
|
|
190
|
-
}), prev2 && expandedTernaries.push({
|
|
191
|
-
// !prevTest && test: just consequent
|
|
192
|
-
test: t.logicalExpression("&&", t.unaryExpression("!", prev2.test), ternary2.test),
|
|
193
|
-
consequent: ternary2.consequent,
|
|
194
|
-
alternate: null,
|
|
195
|
-
remove
|
|
196
|
-
})), ternary2.alternate && Object.keys(ternary2.alternate).length) {
|
|
197
|
-
var negated = t.unaryExpression("!", ternary2.test);
|
|
184
|
+
if (ternary2.consequent && Object.keys(ternary2.consequent).length) {
|
|
185
|
+
var fontFamily = (0, import_propsToFontFamilyCache.getFontFamilyNameFromProps)(ternary2.consequent);
|
|
198
186
|
expandedTernaries.push({
|
|
187
|
+
fontFamily,
|
|
188
|
+
// prevTest && test: merge consequent
|
|
189
|
+
test: prev2 ? t.logicalExpression("&&", prev2.test, ternary2.test) : ternary2.test,
|
|
190
|
+
consequent: prev2 ? mergeProps(prev2.consequent, ternary2.consequent) : ternary2.consequent,
|
|
191
|
+
remove,
|
|
192
|
+
alternate: null
|
|
193
|
+
}), prev2 && expandedTernaries.push({
|
|
194
|
+
fontFamily,
|
|
195
|
+
// !prevTest && test: just consequent
|
|
196
|
+
test: t.logicalExpression("&&", t.unaryExpression("!", prev2.test), ternary2.test),
|
|
197
|
+
consequent: ternary2.consequent,
|
|
198
|
+
alternate: null,
|
|
199
|
+
remove
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
if (ternary2.alternate && Object.keys(ternary2.alternate).length) {
|
|
203
|
+
var fontFamily1 = (0, import_propsToFontFamilyCache.getFontFamilyNameFromProps)(ternary2.alternate), negated = t.unaryExpression("!", ternary2.test);
|
|
204
|
+
expandedTernaries.push({
|
|
205
|
+
fontFamily: fontFamily1,
|
|
199
206
|
// prevTest && !test: merge alternate
|
|
200
207
|
test: prev2 ? t.logicalExpression("&&", prev2.test, negated) : negated,
|
|
201
|
-
consequent: prev2 ? mergeProps(prev2.
|
|
208
|
+
consequent: prev2 ? mergeProps(prev2.alternate, ternary2.alternate) : ternary2.alternate,
|
|
202
209
|
remove,
|
|
203
210
|
alternate: null
|
|
204
211
|
}), prev2 && expandedTernaries.push({
|
|
205
|
-
|
|
212
|
+
fontFamily: fontFamily1,
|
|
206
213
|
test: t.logicalExpression("&&", t.unaryExpression("!", prev2.test), ternary2.test),
|
|
207
214
|
consequent: ternary2.alternate,
|
|
208
215
|
remove,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extractor/extractToClassNames.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAAqB,sCAErB,IAAmB,kCACnB,aAAwD,yBACxD,OAAsB,+BACtB,OAAsB,+BACtB,4BAAmC,0CAEnC,oBAA2B,yBAE3B,sBAA6B,2BAC7B,2BAAkC,gCAClC,4BAAmC,iCACnC,
|
|
5
|
-
"names": ["remove", "spaceString", "t", "stringLiteral", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "timer", "getCSSStylesAtomic", "mergeProps", "createMediaStyle", "requireTamaguiCore", "includes", "console", "warn", "Error", "path", "isAbsolute", "test", "slice", "disableExtraction", "loadTamagui", "printLog", "createLogger", "ast", "babelParse", "err", "error", "mark", "cssMap", "Map", "tamaguiConfig", "getTamagui", "res", "parse", "platform", "extractStyledDefinitions", "onStyledDefinitionRule", "identifier", "rules", "css", "join", "info", "set", "commentTexts", "getFlattenedNode", "param", "tag", "onExtractTag", "parserProps", "attrs", "node", "attemptEval", "jsxPath", "originalNodeName", "filePath", "lineNumbers", "staticConfig", "acceptsClassName", "finalAttrs", "mergeForwardBaseStyle", "attrClassName", "baseFontFamily", "mediaStylesSeen", "comment", "util", "format", "addStyle", "style", "StyleObjectIdentifier", "StyleObjectRules", "selector", "has", "val", "get", "push", "length", "addStyles", "cssStyles", "classNames", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "mediaName", "media", "mediaStyle", "onlyTernaries", "flatMap", "attr", "type", "value", "isJSXSpreadAttribute", "name", "inner", "isJSXExpressionContainer", "expression", "evaluatedValue", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["remove", "spaceString", "t", "stringLiteral", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "timer", "getCSSStylesAtomic", "mergeProps", "createMediaStyle", "requireTamaguiCore", "includes", "console", "warn", "Error", "path", "isAbsolute", "test", "slice", "disableExtraction", "loadTamagui", "printLog", "createLogger", "ast", "babelParse", "err", "error", "mark", "cssMap", "Map", "tamaguiConfig", "getTamagui", "res", "parse", "platform", "extractStyledDefinitions", "onStyledDefinitionRule", "identifier", "rules", "css", "join", "info", "set", "commentTexts", "getFlattenedNode", "param", "tag", "onExtractTag", "parserProps", "attrs", "node", "attemptEval", "jsxPath", "originalNodeName", "filePath", "lineNumbers", "staticConfig", "acceptsClassName", "finalAttrs", "mergeForwardBaseStyle", "attrClassName", "baseFontFamily", "mediaStylesSeen", "comment", "util", "format", "addStyle", "style", "StyleObjectIdentifier", "StyleObjectRules", "selector", "has", "val", "get", "push", "length", "addStyles", "cssStyles", "classNames", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "mediaName", "media", "mediaStyle", "onlyTernaries", "flatMap", "attr", "type", "value", "isJSXSpreadAttribute", "name", "inner", "isJSXExpressionContainer", "expression", "evaluatedValue", "getFontFamilyNameFromProps", "ternary", "inlineMediaQuery", "mediaExtraction", "extractMediaStyle", "mediaStyles", "consequent", "ternaryWithoutMedia", "mergedAlternate", "alternate", "mergedConsequent", "forwardFontFamilyName", "hasTernaries", "Boolean", "baseClassNames", "baseClassNameStr", "base", "componentName", "baseClassNameExpression", "isStringLiteral", "conditionalExpression", "binaryExpression", "expandedTernaries", "normalizedTernaries", "normalizeTernaries", "expandTernary", "prev", "Object", "keys", "fontFamily", "logicalExpression", "unaryExpression", "negated", "ternaryClassNameExpr", "unshift", "baseString", "fullClassName", "classNameLiteral", "finalExpression", "hoistClassNames", "classNameProp", "jsxAttribute", "jsxIdentifier", "jsxExpressionContainer", "attributes", "modified", "optimized", "flattened", "styled", "styles", "Array", "from", "values", "map", "x", "trim", "result", "generate", "concise", "filename", "retainLines", "sourceFileName", "sourceMaps", "code", "split", "filter", "startsWith", "js", "expr", "hoistClassName", "isBinaryExpression", "left", "right", "operator", "isConditionalExpression", "cons", "alt", "str", "uid", "scope", "generateUidIdentifier", "parent", "findParent", "isProgram", "variable", "variableDeclaration", "variableDeclarator", "unshiftContainer"]
|
|
6
6
|
}
|
|
@@ -25,7 +25,7 @@ __export(normalizeTernaries_exports, {
|
|
|
25
25
|
normalizeTernaries: () => normalizeTernaries
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(normalizeTernaries_exports);
|
|
28
|
-
var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), import_invariant = __toESM(require("invariant"));
|
|
28
|
+
var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), import_invariant = __toESM(require("invariant")), import_propsToFontFamilyCache = require("./propsToFontFamilyCache");
|
|
29
29
|
function normalizeTernaries(ternaries) {
|
|
30
30
|
if ((0, import_invariant.default)(
|
|
31
31
|
Array.isArray(ternaries),
|
|
@@ -51,11 +51,10 @@ function normalizeTernaries(ternaries) {
|
|
|
51
51
|
test: ternaryTest,
|
|
52
52
|
remove
|
|
53
53
|
});
|
|
54
|
-
const altStyle = (shouldSwap ? consequent : alternate) ?? {}, consStyle = (shouldSwap ? alternate : consequent) ?? {};
|
|
55
|
-
ternariesByKey[key].alternate = (0, import_web.mergeProps)(altStyle,
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
);
|
|
54
|
+
const altStyle = (shouldSwap ? consequent : alternate) ?? {}, consStyle = (shouldSwap ? alternate : consequent) ?? {}, nextAlt = ternariesByKey[key].alternate;
|
|
55
|
+
ternariesByKey[key].alternate = (0, import_web.mergeProps)(altStyle, nextAlt), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(altStyle, ternariesByKey[key].alternate);
|
|
56
|
+
const nextCons = ternariesByKey[key].consequent;
|
|
57
|
+
ternariesByKey[key].consequent = (0, import_web.mergeProps)(consStyle, nextCons), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(consStyle, ternariesByKey[key].consequent);
|
|
59
58
|
}
|
|
60
59
|
return Object.keys(ternariesByKey).map((key) => ternariesByKey[key]);
|
|
61
60
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extractor/normalizeTernaries.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sCACrB,IAAmB,kCACnB,aAA2B,yBAC3B,mBAAsB;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sCACrB,IAAmB,kCACnB,aAA2B,yBAC3B,mBAAsB,+BAEtB,gCAAsC;AAE/B,SAAS,mBAAmB,WAAsB;AAMvD,UALA,iBAAAA;AAAA,IACE,MAAM,QAAQ,SAAS;AAAA,IACvB;AAAA,EACF,GAEI,UAAU,WAAW;AACvB,WAAO,CAAC;AAGV,QAAM,iBAA6C,CAAC;AAEpD,WAAS,MAAM,IAAI,MAAM,UAAU,QAAQ,EAAE,MAAM,OAAO;AACxD,UAAM,EAAE,MAAM,YAAY,WAAW,QAAQ,GAAG,KAAK,IAAI,UAAU,GAAG;AAEtE,QAAI,cAAc;AAGlB,IAAI,EAAE,sBAAsB,IAAI,MAC9B,cAAe,KAAa;AAI9B,QAAI,aAAa;AACjB,IAAI,EAAE,kBAAkB,IAAI,KAAK,KAAK,aAAa,OACjD,cAAc,KAAK,UACnB,aAAa,MACJ,EAAE,mBAAmB,IAAI,MAC9B,KAAK,aAAa,SAAS,KAAK,aAAa,UAC/C,cAAc,EAAE;AAAA,MACd,KAAK,SAAS,QAAQ,KAAK,GAAG;AAAA,MAC9B,KAAK;AAAA,MACL,KAAK;AAAA,IACP,GACA,aAAa;AAKjB,UAAM,UAAM,iBAAAC,SAAS,WAAkB,EAAE;AAEzC,IAAK,eAAe,GAAG,MACrB,eAAe,GAAG,IAAI;AAAA,MACpB,GAAG;AAAA,MACH,WAAW,CAAC;AAAA,MACZ,YAAY,CAAC;AAAA,MACb,MAAM;AAAA,MACN;AAAA,IACF;AAEF,UAAM,YAAY,aAAa,aAAa,cAAc,CAAC,GACrD,aAAa,aAAa,YAAY,eAAe,CAAC,GAEtD,UAAU,eAAe,GAAG,EAAE;AACpC,mBAAe,GAAG,EAAE,gBAAY,uBAAW,UAAU,OAAO,OAC5D,qDAAsB,UAAU,eAAe,GAAG,EAAE,SAAS;AAE7D,UAAM,WAAW,eAAe,GAAG,EAAE;AACrC,mBAAe,GAAG,EAAE,iBAAa,uBAAW,WAAW,QAAQ,OAC/D,qDAAsB,WAAW,eAAe,GAAG,EAAE,UAAU;AAAA,EACjE;AAMA,SAJ0B,OAAO,KAAK,cAAc,EAAE,IAAI,CAAC,QAClD,eAAe,GAAG,CAC1B;AAGH;",
|
|
5
5
|
"names": ["invariant", "generate"]
|
|
6
6
|
}
|
|
@@ -26,7 +26,7 @@ __export(normalizeTernaries_exports, {
|
|
|
26
26
|
normalizeTernaries: () => normalizeTernaries
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(normalizeTernaries_exports);
|
|
29
|
-
var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), import_invariant = __toESM(require("invariant"));
|
|
29
|
+
var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), import_invariant = __toESM(require("invariant")), import_propsToFontFamilyCache = require("./propsToFontFamilyCache");
|
|
30
30
|
function normalizeTernaries(ternaries) {
|
|
31
31
|
if ((0, import_invariant.default)(Array.isArray(ternaries), "extractStaticTernaries expects param 1 to be an array of ternaries"), ternaries.length === 0)
|
|
32
32
|
return [];
|
|
@@ -43,8 +43,10 @@ function normalizeTernaries(ternaries) {
|
|
|
43
43
|
test: ternaryTest,
|
|
44
44
|
remove
|
|
45
45
|
});
|
|
46
|
-
var _ref, altStyle = (_ref = shouldSwap ? consequent : alternate) !== null && _ref !== void 0 ? _ref : {}, _ref1, consStyle = (_ref1 = shouldSwap ? alternate : consequent) !== null && _ref1 !== void 0 ? _ref1 : {};
|
|
47
|
-
ternariesByKey[key].alternate = (0, import_web.mergeProps)(altStyle,
|
|
46
|
+
var _ref, altStyle = (_ref = shouldSwap ? consequent : alternate) !== null && _ref !== void 0 ? _ref : {}, _ref1, consStyle = (_ref1 = shouldSwap ? alternate : consequent) !== null && _ref1 !== void 0 ? _ref1 : {}, nextAlt = ternariesByKey[key].alternate;
|
|
47
|
+
ternariesByKey[key].alternate = (0, import_web.mergeProps)(altStyle, nextAlt), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(altStyle, ternariesByKey[key].alternate);
|
|
48
|
+
var nextCons = ternariesByKey[key].consequent;
|
|
49
|
+
ternariesByKey[key].consequent = (0, import_web.mergeProps)(consStyle, nextCons), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(consStyle, ternariesByKey[key].consequent);
|
|
48
50
|
}
|
|
49
51
|
var ternaryExpression = Object.keys(ternariesByKey).map(function(key2) {
|
|
50
52
|
return ternariesByKey[key2];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extractor/normalizeTernaries.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAAqB,sCACrB,IAAmB,kCACnB,aAA2B,yBAC3B,mBAAsB;
|
|
5
|
-
"names": ["normalizeTernaries", "ternaries", "invariant", "Array", "isArray", "length", "ternariesByKey", "idx", "len", "test", "consequent", "alternate", "remove", "rest", "ternaryTest", "t", "isExpressionStatement", "expression", "shouldSwap", "isUnaryExpression", "operator", "argument", "isBinaryExpression", "binaryExpression", "replace", "left", "right", "key", "generate", "code", "altStyle", "consStyle", "mergeProps", "ternaryExpression", "Object", "keys", "map"]
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAAqB,sCACrB,IAAmB,kCACnB,aAA2B,yBAC3B,mBAAsB,+BAEtB,gCAAsC;AAE/B,SAASA,mBAAmBC,WAAoB;AAMrD,UALAC,iBAAAA,SACEC,MAAMC,QAAQH,SAAAA,GACd,oEAAA,GAGEA,UAAUI,WAAW;AACvB,WAAO,CAAA;AAKT,WAFMC,iBAA6C,CAAC,GAE3CC,MAAM,IAAIC,MAAMP,UAAUI,QAAQ,EAAEE,MAAMC,OAAO;AACxD,QAAM,EAAEC,MAAMC,YAAYC,WAAWC,QAAQ,GAAGC,KAAAA,IAASZ,UAAUM,GAAAA,GAE/DO,cAAcL;AAGlB,IAAIM,EAAEC,sBAAsBP,IAAAA,MAC1BK,cAAeL,KAAaQ;AAI9B,QAAIC,aAAa;AACjB,IAAIH,EAAEI,kBAAkBV,IAAAA,KAASA,KAAKW,aAAa,OACjDN,cAAcL,KAAKY,UACnBH,aAAa,MACJH,EAAEO,mBAAmBb,IAAAA,MAC1BA,KAAKW,aAAa,SAASX,KAAKW,aAAa,UAC/CN,cAAcC,EAAEQ,iBACdd,KAAKW,SAASI,QAAQ,KAAK,GAAA,GAC3Bf,KAAKgB,MACLhB,KAAKiB,KAAK,GAEZR,aAAa;AAKjB,QAAMS,UAAMC,iBAAAA,SAASd,WAAAA,EAAoBe;AAEzC,IAAKvB,eAAeqB,GAAAA,MAClBrB,eAAeqB,GAAAA,IAAO;MACpB,GAAGd;MACHF,WAAW,CAAC;MACZD,YAAY,CAAC;MACbD,MAAMK;MACNF;IACF;QAEgBM,MAAZY,YAAYZ,OAAAA,aAAaR,aAAaC,eAAAA,QAA1BO,SAAAA,SAAAA,OAAwC,CAAC,GACxCA,OAAba,aAAab,QAAAA,aAAaP,YAAYD,gBAAAA,QAAzBQ,UAAAA,SAAAA,QAAwC,CAAC,GAEtDc,UAAU1B,eAAeqB,GAAAA,EAAKhB;AACpCL,mBAAeqB,GAAAA,EAAKhB,gBAAYsB,uBAAWH,UAAUE,OAAAA,OACrDE,qDAAsBJ,UAAUxB,eAAeqB,GAAAA,EAAKhB,SAAS;AAE7D,QAAMwB,WAAW7B,eAAeqB,GAAAA,EAAKjB;AACrCJ,mBAAeqB,GAAAA,EAAKjB,iBAAauB,uBAAWF,WAAWI,QAAAA,OACvDD,qDAAsBH,WAAWzB,eAAeqB,GAAAA,EAAKjB,UAAU;EACjE;AAEA,MAAM0B,oBAAoBC,OAAOC,KAAKhC,cAAAA,EAAgBiC,IAAI,SAACZ,MAAAA;AACzD,WAAOrB,eAAeqB,IAAAA;EACxB,CAAA;AAEA,SAAOS;AACT;",
|
|
5
|
+
"names": ["normalizeTernaries", "ternaries", "invariant", "Array", "isArray", "length", "ternariesByKey", "idx", "len", "test", "consequent", "alternate", "remove", "rest", "ternaryTest", "t", "isExpressionStatement", "expression", "shouldSwap", "isUnaryExpression", "operator", "argument", "isBinaryExpression", "binaryExpression", "replace", "left", "right", "key", "generate", "code", "altStyle", "consStyle", "nextAlt", "mergeProps", "forwardFontFamilyName", "nextCons", "ternaryExpression", "Object", "keys", "map"]
|
|
6
6
|
}
|
|
@@ -14,21 +14,20 @@ var __export = (target, all) => {
|
|
|
14
14
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
15
15
|
var propsToFontFamilyCache_exports = {};
|
|
16
16
|
__export(propsToFontFamilyCache_exports, {
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
forwardFontFamilyName: () => forwardFontFamilyName,
|
|
18
|
+
getFontFamilyNameFromProps: () => getFontFamilyNameFromProps,
|
|
19
19
|
setPropsToFontFamily: () => setPropsToFontFamily
|
|
20
20
|
});
|
|
21
21
|
module.exports = __toCommonJS(propsToFontFamilyCache_exports);
|
|
22
22
|
const cache = /* @__PURE__ */ new WeakMap();
|
|
23
23
|
function setPropsToFontFamily(props, ff) {
|
|
24
|
-
cache.set(props, ff);
|
|
24
|
+
cache.set(props, ff.replace("$", "").trim());
|
|
25
25
|
}
|
|
26
|
-
function
|
|
26
|
+
function getFontFamilyNameFromProps(props) {
|
|
27
27
|
return cache.get(props);
|
|
28
28
|
}
|
|
29
|
-
function
|
|
30
|
-
const ff =
|
|
31
|
-
|
|
32
|
-
return ` font_${ff.replace("$", "")}`;
|
|
29
|
+
function forwardFontFamilyName(prev, next) {
|
|
30
|
+
const ff = getFontFamilyNameFromProps(prev);
|
|
31
|
+
ff && setPropsToFontFamily(next, ff);
|
|
33
32
|
}
|
|
34
33
|
//# sourceMappingURL=propsToFontFamilyCache.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extractor/propsToFontFamilyCache.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,MAAM,QAAQ,oBAAI,QAAqB;AAEhC,SAAS,qBAAqB,OAAY,IAAY;AAC3D,QAAM,IAAI,OAAO,EAAE;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,MAAM,QAAQ,oBAAI,QAAqB;AAEhC,SAAS,qBAAqB,OAAY,IAAY;AAC3D,QAAM,IAAI,OAAO,GAAG,QAAQ,KAAK,EAAE,EAAE,KAAK,CAAC;AAC7C;AAEO,SAAS,2BAA2B,OAAY;AACrD,SAAO,MAAM,IAAI,KAAK;AACxB;AAEO,SAAS,sBAAsB,MAAW,MAAW;AAC1D,QAAM,KAAK,2BAA2B,IAAI;AAC1C,EAAI,MACF,qBAAqB,MAAM,EAAE;AAEjC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -15,27 +15,26 @@ var __export = (target, all) => {
|
|
|
15
15
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
16
16
|
var propsToFontFamilyCache_exports = {};
|
|
17
17
|
__export(propsToFontFamilyCache_exports, {
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
forwardFontFamilyName: () => forwardFontFamilyName,
|
|
19
|
+
getFontFamilyNameFromProps: () => getFontFamilyNameFromProps,
|
|
20
20
|
setPropsToFontFamily: () => setPropsToFontFamily
|
|
21
21
|
});
|
|
22
22
|
module.exports = __toCommonJS(propsToFontFamilyCache_exports);
|
|
23
23
|
var cache = /* @__PURE__ */ new WeakMap();
|
|
24
24
|
function setPropsToFontFamily(props, ff) {
|
|
25
|
-
cache.set(props, ff);
|
|
25
|
+
cache.set(props, ff.replace("$", "").trim());
|
|
26
26
|
}
|
|
27
|
-
function
|
|
27
|
+
function getFontFamilyNameFromProps(props) {
|
|
28
28
|
return cache.get(props);
|
|
29
29
|
}
|
|
30
|
-
function
|
|
31
|
-
var ff =
|
|
32
|
-
|
|
33
|
-
return ` font_${ff.replace("$", "")}`;
|
|
30
|
+
function forwardFontFamilyName(prev, next) {
|
|
31
|
+
var ff = getFontFamilyNameFromProps(prev);
|
|
32
|
+
ff && setPropsToFontFamily(next, ff);
|
|
34
33
|
}
|
|
35
34
|
// Annotate the CommonJS export names for ESM import in node:
|
|
36
35
|
0 && (module.exports = {
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
forwardFontFamilyName,
|
|
37
|
+
getFontFamilyNameFromProps,
|
|
39
38
|
setPropsToFontFamily
|
|
40
39
|
});
|
|
41
40
|
//# sourceMappingURL=propsToFontFamilyCache.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extractor/propsToFontFamilyCache.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;AAEA,IAAMA,QAAQ,oBAAIC,QAAAA;AAEX,SAASC,qBAAqBC,OAAYC,IAAU;AACzDJ,QAAMK,IAAIF,OAAOC,
|
|
5
|
-
"names": ["cache", "WeakMap", "setPropsToFontFamily", "props", "ff", "set", "
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;AAEA,IAAMA,QAAQ,oBAAIC,QAAAA;AAEX,SAASC,qBAAqBC,OAAYC,IAAU;AACzDJ,QAAMK,IAAIF,OAAOC,GAAGE,QAAQ,KAAK,EAAA,EAAIC,KAAI,CAAA;AAC3C;AAEO,SAASC,2BAA2BL,OAAU;AACnD,SAAOH,MAAMS,IAAIN,KAAAA;AACnB;AAEO,SAASO,sBAAsBC,MAAWC,MAAS;AACxD,MAAMR,KAAKI,2BAA2BG,IAAAA;AACtC,EAAIP,MACFF,qBAAqBU,MAAMR,EAAAA;AAE/B;",
|
|
5
|
+
"names": ["cache", "WeakMap", "setPropsToFontFamily", "props", "ff", "set", "replace", "trim", "getFontFamilyNameFromProps", "get", "forwardFontFamilyName", "prev", "next"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/static",
|
|
3
|
-
"version": "1.132.16-
|
|
3
|
+
"version": "1.132.16-1754855349219",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"types": "./types/index.d.ts",
|
|
6
6
|
"type": "commonjs",
|
|
@@ -45,19 +45,19 @@
|
|
|
45
45
|
"@babel/template": "^7.25.0",
|
|
46
46
|
"@babel/traverse": "^7.25.4",
|
|
47
47
|
"@babel/types": "^7.25.4",
|
|
48
|
-
"@tamagui/cli-color": "1.132.16-
|
|
49
|
-
"@tamagui/config-default": "1.132.16-
|
|
50
|
-
"@tamagui/core": "1.132.16-
|
|
51
|
-
"@tamagui/fake-react-native": "1.132.16-
|
|
52
|
-
"@tamagui/generate-themes": "1.132.16-
|
|
53
|
-
"@tamagui/helpers": "1.132.16-
|
|
54
|
-
"@tamagui/helpers-node": "1.132.16-
|
|
55
|
-
"@tamagui/proxy-worm": "1.132.16-
|
|
56
|
-
"@tamagui/react-native-web-internals": "1.132.16-
|
|
57
|
-
"@tamagui/react-native-web-lite": "1.132.16-
|
|
58
|
-
"@tamagui/shorthands": "1.132.16-
|
|
59
|
-
"@tamagui/types": "1.132.16-
|
|
60
|
-
"@tamagui/web": "1.132.16-
|
|
48
|
+
"@tamagui/cli-color": "1.132.16-1754855349219",
|
|
49
|
+
"@tamagui/config-default": "1.132.16-1754855349219",
|
|
50
|
+
"@tamagui/core": "1.132.16-1754855349219",
|
|
51
|
+
"@tamagui/fake-react-native": "1.132.16-1754855349219",
|
|
52
|
+
"@tamagui/generate-themes": "1.132.16-1754855349219",
|
|
53
|
+
"@tamagui/helpers": "1.132.16-1754855349219",
|
|
54
|
+
"@tamagui/helpers-node": "1.132.16-1754855349219",
|
|
55
|
+
"@tamagui/proxy-worm": "1.132.16-1754855349219",
|
|
56
|
+
"@tamagui/react-native-web-internals": "1.132.16-1754855349219",
|
|
57
|
+
"@tamagui/react-native-web-lite": "1.132.16-1754855349219",
|
|
58
|
+
"@tamagui/shorthands": "1.132.16-1754855349219",
|
|
59
|
+
"@tamagui/types": "1.132.16-1754855349219",
|
|
60
|
+
"@tamagui/web": "1.132.16-1754855349219",
|
|
61
61
|
"babel-literal-to-ast": "^2.1.0",
|
|
62
62
|
"browserslist": "^4.22.2",
|
|
63
63
|
"check-dependency-version-consistency": "^4.1.0",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"devDependencies": {
|
|
75
75
|
"@babel/plugin-syntax-typescript": "^7.25.4",
|
|
76
76
|
"@expo/match-media": "^0.4.0",
|
|
77
|
-
"@tamagui/build": "1.132.16-
|
|
77
|
+
"@tamagui/build": "1.132.16-1754855349219",
|
|
78
78
|
"@types/babel__core": "^7.20.5",
|
|
79
79
|
"@types/find-root": "^1.1.2",
|
|
80
80
|
"@types/node": "^22.1.0",
|
|
@@ -11,7 +11,10 @@ import type { Extractor } from './createExtractor'
|
|
|
11
11
|
import { createLogger } from './createLogger'
|
|
12
12
|
import { extractMediaStyle } from './extractMediaStyle'
|
|
13
13
|
import { normalizeTernaries } from './normalizeTernaries'
|
|
14
|
-
import {
|
|
14
|
+
import {
|
|
15
|
+
forwardFontFamilyName,
|
|
16
|
+
getFontFamilyNameFromProps,
|
|
17
|
+
} from './propsToFontFamilyCache'
|
|
15
18
|
import { timer } from './timer'
|
|
16
19
|
|
|
17
20
|
export type ExtractedResponse = {
|
|
@@ -239,7 +242,7 @@ export async function extractToClassNames({
|
|
|
239
242
|
|
|
240
243
|
if (attr.type === 'style') {
|
|
241
244
|
mergeForwardBaseStyle = mergeProps(mergeForwardBaseStyle || {}, attr.value)
|
|
242
|
-
baseFontFamily =
|
|
245
|
+
baseFontFamily = getFontFamilyNameFromProps(attr.value) || ''
|
|
243
246
|
return []
|
|
244
247
|
}
|
|
245
248
|
|
|
@@ -270,12 +273,23 @@ export async function extractToClassNames({
|
|
|
270
273
|
}
|
|
271
274
|
}
|
|
272
275
|
|
|
276
|
+
const mergedAlternate = mergeProps(
|
|
277
|
+
mergeForwardBaseStyle || {},
|
|
278
|
+
ternary.alternate || {}
|
|
279
|
+
)
|
|
280
|
+
const mergedConsequent = mergeProps(
|
|
281
|
+
mergeForwardBaseStyle || {},
|
|
282
|
+
ternary.consequent || {}
|
|
283
|
+
)
|
|
284
|
+
|
|
285
|
+
forwardFontFamilyName(ternary.alternate, mergedAlternate)
|
|
286
|
+
forwardFontFamilyName(ternary.consequent, mergedConsequent)
|
|
287
|
+
|
|
273
288
|
// merge the base style forward into both sides
|
|
274
289
|
return {
|
|
275
290
|
...ternary,
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
consequent: mergeProps(mergeForwardBaseStyle || {}, ternary.consequent || {}),
|
|
291
|
+
alternate: mergedAlternate,
|
|
292
|
+
consequent: mergedConsequent,
|
|
279
293
|
}
|
|
280
294
|
})
|
|
281
295
|
|
|
@@ -286,15 +300,17 @@ export async function extractToClassNames({
|
|
|
286
300
|
: null
|
|
287
301
|
|
|
288
302
|
let baseClassNameStr =
|
|
289
|
-
hasTernaries || !baseClassNames ? '' :
|
|
303
|
+
hasTernaries || !baseClassNames ? '' : baseClassNames.join(' ')
|
|
290
304
|
|
|
291
305
|
if (!hasTernaries && baseFontFamily) {
|
|
292
|
-
baseClassNameStr = `font_${baseFontFamily} ${baseClassNameStr}`
|
|
306
|
+
baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ''}`
|
|
293
307
|
}
|
|
294
308
|
|
|
295
309
|
let base = staticConfig.componentName
|
|
296
|
-
? t.stringLiteral(
|
|
297
|
-
|
|
310
|
+
? t.stringLiteral(
|
|
311
|
+
`is_${staticConfig.componentName}${baseClassNameStr ? ` ${baseClassNameStr}` : ''}`
|
|
312
|
+
)
|
|
313
|
+
: t.stringLiteral(baseClassNameStr || '')
|
|
298
314
|
|
|
299
315
|
attrClassName = attrClassName as t.Expression | null // actual typescript bug, flatMap doesn't update from never
|
|
300
316
|
|
|
@@ -336,7 +352,10 @@ export async function extractToClassNames({
|
|
|
336
352
|
function expandTernary(ternary: Ternary, prev?: Ternary) {
|
|
337
353
|
// need to diverge into two (or four if alternate)
|
|
338
354
|
if (ternary.consequent && Object.keys(ternary.consequent).length) {
|
|
355
|
+
const fontFamily = getFontFamilyNameFromProps(ternary.consequent)
|
|
356
|
+
|
|
339
357
|
expandedTernaries.push({
|
|
358
|
+
fontFamily,
|
|
340
359
|
// prevTest && test: merge consequent
|
|
341
360
|
test: prev
|
|
342
361
|
? t.logicalExpression('&&', prev.test, ternary.test)
|
|
@@ -350,6 +369,7 @@ export async function extractToClassNames({
|
|
|
350
369
|
|
|
351
370
|
if (prev) {
|
|
352
371
|
expandedTernaries.push({
|
|
372
|
+
fontFamily,
|
|
353
373
|
// !prevTest && test: just consequent
|
|
354
374
|
test: t.logicalExpression(
|
|
355
375
|
'&&',
|
|
@@ -364,12 +384,14 @@ export async function extractToClassNames({
|
|
|
364
384
|
}
|
|
365
385
|
|
|
366
386
|
if (ternary.alternate && Object.keys(ternary.alternate).length) {
|
|
387
|
+
const fontFamily = getFontFamilyNameFromProps(ternary.alternate)
|
|
367
388
|
const negated = t.unaryExpression('!', ternary.test)
|
|
368
389
|
expandedTernaries.push({
|
|
390
|
+
fontFamily,
|
|
369
391
|
// prevTest && !test: merge alternate
|
|
370
392
|
test: prev ? t.logicalExpression('&&', prev.test, negated) : negated,
|
|
371
393
|
consequent: prev
|
|
372
|
-
? mergeProps(prev.
|
|
394
|
+
? mergeProps(prev.alternate!, ternary.alternate)
|
|
373
395
|
: ternary.alternate,
|
|
374
396
|
remove,
|
|
375
397
|
alternate: null,
|
|
@@ -377,7 +399,7 @@ export async function extractToClassNames({
|
|
|
377
399
|
|
|
378
400
|
if (prev) {
|
|
379
401
|
expandedTernaries.push({
|
|
380
|
-
|
|
402
|
+
fontFamily,
|
|
381
403
|
test: t.logicalExpression(
|
|
382
404
|
'&&',
|
|
383
405
|
t.unaryExpression('!', prev.test),
|
|
@@ -435,6 +457,7 @@ export async function extractToClassNames({
|
|
|
435
457
|
// console.info('attrs', JSON.stringify(attrs, null, 2))
|
|
436
458
|
// console.info('expandedTernaries', JSON.stringify(expandedTernaries, null, 2))
|
|
437
459
|
// console.info('finalExpression', JSON.stringify(finalExpression, null, 2))
|
|
460
|
+
// console.info({ baseClassNameExpression })
|
|
438
461
|
|
|
439
462
|
if (finalExpression) {
|
|
440
463
|
// hoist to global variables
|
|
@@ -3,6 +3,7 @@ import * as t from '@babel/types'
|
|
|
3
3
|
import { mergeProps } from '@tamagui/web'
|
|
4
4
|
import invariant from 'invariant'
|
|
5
5
|
import type { Ternary } from '../types'
|
|
6
|
+
import { forwardFontFamilyName } from './propsToFontFamilyCache'
|
|
6
7
|
|
|
7
8
|
export function normalizeTernaries(ternaries: Ternary[]) {
|
|
8
9
|
invariant(
|
|
@@ -57,11 +58,13 @@ export function normalizeTernaries(ternaries: Ternary[]) {
|
|
|
57
58
|
const altStyle = (shouldSwap ? consequent : alternate) ?? {}
|
|
58
59
|
const consStyle = (shouldSwap ? alternate : consequent) ?? {}
|
|
59
60
|
|
|
60
|
-
|
|
61
|
-
ternariesByKey[key].
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
const nextAlt = ternariesByKey[key].alternate!
|
|
62
|
+
ternariesByKey[key].alternate = mergeProps(altStyle, nextAlt)
|
|
63
|
+
forwardFontFamilyName(altStyle, ternariesByKey[key].alternate)
|
|
64
|
+
|
|
65
|
+
const nextCons = ternariesByKey[key].consequent!
|
|
66
|
+
ternariesByKey[key].consequent = mergeProps(consStyle, nextCons)
|
|
67
|
+
forwardFontFamilyName(consStyle, ternariesByKey[key].consequent)
|
|
65
68
|
}
|
|
66
69
|
|
|
67
70
|
const ternaryExpression = Object.keys(ternariesByKey).map((key) => {
|
|
@@ -3,16 +3,16 @@
|
|
|
3
3
|
const cache = new WeakMap<any, string>()
|
|
4
4
|
|
|
5
5
|
export function setPropsToFontFamily(props: any, ff: string) {
|
|
6
|
-
cache.set(props, ff)
|
|
6
|
+
cache.set(props, ff.replace('$', '').trim())
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
-
export function
|
|
9
|
+
export function getFontFamilyNameFromProps(props: any) {
|
|
10
10
|
return cache.get(props)
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
export function
|
|
14
|
-
const ff =
|
|
13
|
+
export function forwardFontFamilyName(prev: any, next: any) {
|
|
14
|
+
const ff = getFontFamilyNameFromProps(prev)
|
|
15
15
|
if (ff) {
|
|
16
|
-
|
|
16
|
+
setPropsToFontFamily(next, ff)
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,KAAK,EAAe,cAAc,EAAW,MAAM,UAAU,CAAA;AAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,KAAK,EAAe,cAAc,EAAW,MAAM,UAAU,CAAA;AAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAUlD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,CAAA;AAQD,wBAAsB,mBAAmB,CAAC,EACxC,SAAS,EACT,MAAM,EACN,UAAe,EACf,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA0d9D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeTernaries.d.ts","sourceRoot":"","sources":["../../src/extractor/normalizeTernaries.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"normalizeTernaries.d.ts","sourceRoot":"","sources":["../../src/extractor/normalizeTernaries.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAGvC,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,aAmEtD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare function setPropsToFontFamily(props: any, ff: string): void;
|
|
2
|
-
export declare function
|
|
3
|
-
export declare function
|
|
2
|
+
export declare function getFontFamilyNameFromProps(props: any): string | undefined;
|
|
3
|
+
export declare function forwardFontFamilyName(prev: any, next: any): void;
|
|
4
4
|
//# sourceMappingURL=propsToFontFamilyCache.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"propsToFontFamilyCache.d.ts","sourceRoot":"","sources":["../../src/extractor/propsToFontFamilyCache.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,QAE1D;AAED,wBAAgB,
|
|
1
|
+
{"version":3,"file":"propsToFontFamilyCache.d.ts","sourceRoot":"","sources":["../../src/extractor/propsToFontFamilyCache.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,QAE1D;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,sBAEpD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,QAKzD"}
|