@tamagui/static 1.132.17 → 1.132.18
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/concatClassName.js +69 -0
- package/dist/extractor/concatClassName.js.map +6 -0
- package/dist/extractor/concatClassName.native.js +69 -0
- package/dist/extractor/concatClassName.native.js.map +6 -0
- package/dist/extractor/extractToClassNames.js +16 -10
- package/dist/extractor/extractToClassNames.js.map +1 -1
- package/dist/extractor/extractToClassNames.native.js +8 -8
- package/dist/extractor/extractToClassNames.native.js.map +2 -2
- package/package.json +15 -15
- package/src/extractor/concatClassName.ts +100 -0
- package/src/extractor/extractToClassNames.ts +33 -16
- package/types/extractor/concatClassName.d.ts +8 -0
- package/types/extractor/concatClassName.d.ts.map +1 -0
- package/types/extractor/extractToClassNames.d.ts.map +1 -1
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: !0 });
|
|
8
|
+
}, __copyProps = (to, from, except, desc) => {
|
|
9
|
+
if (from && typeof from == "object" || typeof from == "function")
|
|
10
|
+
for (let key of __getOwnPropNames(from))
|
|
11
|
+
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
12
|
+
return to;
|
|
13
|
+
};
|
|
14
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
15
|
+
var concatClassName_exports = {};
|
|
16
|
+
__export(concatClassName_exports, {
|
|
17
|
+
concatClassName: () => concatClassName
|
|
18
|
+
});
|
|
19
|
+
module.exports = __toCommonJS(concatClassName_exports);
|
|
20
|
+
function concatClassName(_cn) {
|
|
21
|
+
const args = arguments, usedPrefixes = [];
|
|
22
|
+
let final = "";
|
|
23
|
+
const len = args.length;
|
|
24
|
+
let propObjects = null;
|
|
25
|
+
for (let x = len; x >= 0; x--) {
|
|
26
|
+
const cns = args[x];
|
|
27
|
+
if (!cns) continue;
|
|
28
|
+
if (!Array.isArray(cns) && typeof cns != "string") {
|
|
29
|
+
propObjects = propObjects || [], propObjects.push(cns);
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
const names = Array.isArray(cns) ? cns : cns.split(" "), numNames = names.length;
|
|
33
|
+
for (let i = numNames - 1; i >= 0; i--) {
|
|
34
|
+
const name = names[i];
|
|
35
|
+
if (!name || name === " ") continue;
|
|
36
|
+
if (name[0] !== "_") {
|
|
37
|
+
final = name + " " + final;
|
|
38
|
+
continue;
|
|
39
|
+
}
|
|
40
|
+
const splitIndex = name.indexOf("-");
|
|
41
|
+
if (splitIndex < 1) {
|
|
42
|
+
final = name + " " + final;
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
45
|
+
const isMediaQuery = name[splitIndex + 1] === "_", styleKey = name.slice(1, name.lastIndexOf("-")), mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null, uid = mediaKey ? styleKey + mediaKey : styleKey;
|
|
46
|
+
if (usedPrefixes.indexOf(uid) > -1)
|
|
47
|
+
continue;
|
|
48
|
+
usedPrefixes.push(uid);
|
|
49
|
+
const propName = styleKey;
|
|
50
|
+
propName && propObjects && propObjects.some((po) => {
|
|
51
|
+
if (mediaKey) {
|
|
52
|
+
const propKey = pseudoInvert[mediaKey];
|
|
53
|
+
return po && po[propKey] && propName in po[propKey] && po[propKey] !== null;
|
|
54
|
+
}
|
|
55
|
+
return po && propName in po && po[propName] !== null;
|
|
56
|
+
}) || (final = name + " " + final);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return final;
|
|
60
|
+
}
|
|
61
|
+
const pseudoInvert = {
|
|
62
|
+
hover: "hoverStyle",
|
|
63
|
+
focus: "focusStyle",
|
|
64
|
+
press: "pressStyle",
|
|
65
|
+
focusVisible: "focusVisibleStyle",
|
|
66
|
+
focusWithin: "focusWithinStyle",
|
|
67
|
+
disabled: "disabledStyle"
|
|
68
|
+
};
|
|
69
|
+
//# sourceMappingURL=concatClassName.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../src/extractor/concatClassName.ts"],
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAUO,SAAS,gBAAgB,KAAqD;AACnF,QAAM,OAAO,WACP,eAAyB,CAAC;AAChC,MAAI,QAAQ;AAEZ,QAAM,MAAM,KAAK;AACjB,MAAI,cAAmB;AACvB,WAAS,IAAI,KAAK,KAAK,GAAG,KAAK;AAC7B,UAAM,MAAM,KAAK,CAAC;AAElB,QAAI,CAAC,IAAK;AACV,QAAI,CAAC,MAAM,QAAQ,GAAG,KAAK,OAAO,OAAQ,UAAU;AAElD,oBAAc,eAAe,CAAC,GAC9B,YAAY,KAAK,GAAG;AACpB;AAAA,IACF;AAEA,UAAM,QAAQ,MAAM,QAAQ,GAAG,IAAI,MAAM,IAAI,MAAM,GAAG,GAChD,WAAW,MAAM;AACvB,aAAS,IAAI,WAAW,GAAG,KAAK,GAAG,KAAK;AACtC,YAAM,OAAO,MAAM,CAAC;AAEpB,UAAI,CAAC,QAAQ,SAAS,IAAK;AAC3B,UAAI,KAAK,CAAC,MAAM,KAAK;AAEnB,gBAAQ,OAAO,MAAM;AACrB;AAAA,MACF;AAEA,YAAM,aAAa,KAAK,QAAQ,GAAG;AACnC,UAAI,aAAa,GAAG;AAClB,gBAAQ,OAAO,MAAM;AAErB;AAAA,MACF;AAKA,YAAM,eAHW,KAAK,aAAa,CAAC,MAGF,KAK5B,WAAW,KAAK,MAAM,GAAG,KAAK,YAAY,GAAG,CAAC,GAE9C,WAAW,eAAe,KAAK,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,MACvE,MAAM,WAAW,WAAW,WAAW;AAG7C,UAAI,aAAa,QAAQ,GAAG,IAAI;AAE9B;AAEF,mBAAa,KAAK,GAAG;AAGrB,YAAM,WAAW;AACjB,MAAI,YAAY,eAEZ,YAAY,KAAK,CAAC,OAAO;AACvB,YAAI,UAAU;AACZ,gBAAM,UAAU,aAAa,QAAQ;AACrC,iBAAO,MAAM,GAAG,OAAO,KAAK,YAAY,GAAG,OAAO,KAAK,GAAG,OAAO,MAAM;AAAA,QACzE;AAEA,eADY,MAAM,YAAY,MAAM,GAAG,QAAQ,MAAM;AAAA,MAEvD,CAAC,MAOL,QAAQ,OAAO,MAAM;AAAA,IACvB;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,eAAe;AAAA,EACnB,OAAO;AAAA,EACP,OAAO;AAAA,EACP,OAAO;AAAA,EACP,cAAc;AAAA,EACd,aAAa;AAAA,EACb,UAAU;AACZ;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: !0 });
|
|
9
|
+
}, __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from == "object" || typeof from == "function")
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
13
|
+
return to;
|
|
14
|
+
};
|
|
15
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
16
|
+
var concatClassName_exports = {};
|
|
17
|
+
__export(concatClassName_exports, {
|
|
18
|
+
concatClassName: () => concatClassName
|
|
19
|
+
});
|
|
20
|
+
module.exports = __toCommonJS(concatClassName_exports);
|
|
21
|
+
function concatClassName(_cn) {
|
|
22
|
+
for (var args = arguments, usedPrefixes = [], final = "", len = args.length, propObjects = null, x = len; x >= 0; x--) {
|
|
23
|
+
var _loop = function(i2) {
|
|
24
|
+
var name = names[i2];
|
|
25
|
+
if (!name || name === " ") return "continue";
|
|
26
|
+
if (name[0] !== "_")
|
|
27
|
+
return final = name + " " + final, "continue";
|
|
28
|
+
var splitIndex = name.indexOf("-");
|
|
29
|
+
if (splitIndex < 1)
|
|
30
|
+
return final = name + " " + final, "continue";
|
|
31
|
+
var nextChar = name[splitIndex + 1], isMediaQuery = nextChar === "_", styleKey = name.slice(1, name.lastIndexOf("-")), mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null, uid = mediaKey ? styleKey + mediaKey : styleKey;
|
|
32
|
+
if (usedPrefixes.indexOf(uid) > -1)
|
|
33
|
+
return "continue";
|
|
34
|
+
usedPrefixes.push(uid);
|
|
35
|
+
var propName = styleKey;
|
|
36
|
+
if (propName && propObjects && propObjects.some(function(po) {
|
|
37
|
+
if (mediaKey) {
|
|
38
|
+
var propKey = pseudoInvert[mediaKey];
|
|
39
|
+
return po && po[propKey] && propName in po[propKey] && po[propKey] !== null;
|
|
40
|
+
}
|
|
41
|
+
var res = po && propName in po && po[propName] !== null;
|
|
42
|
+
return res;
|
|
43
|
+
}))
|
|
44
|
+
return "continue";
|
|
45
|
+
final = name + " " + final;
|
|
46
|
+
}, cns = args[x];
|
|
47
|
+
if (cns) {
|
|
48
|
+
if (!Array.isArray(cns) && typeof cns != "string") {
|
|
49
|
+
propObjects = propObjects || [], propObjects.push(cns);
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
for (var names = Array.isArray(cns) ? cns : cns.split(" "), numNames = names.length, i = numNames - 1; i >= 0; i--) _loop(i);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return final;
|
|
56
|
+
}
|
|
57
|
+
var pseudoInvert = {
|
|
58
|
+
hover: "hoverStyle",
|
|
59
|
+
focus: "focusStyle",
|
|
60
|
+
press: "pressStyle",
|
|
61
|
+
focusVisible: "focusVisibleStyle",
|
|
62
|
+
focusWithin: "focusWithinStyle",
|
|
63
|
+
disabled: "disabledStyle"
|
|
64
|
+
};
|
|
65
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
66
|
+
0 && (module.exports = {
|
|
67
|
+
concatClassName
|
|
68
|
+
});
|
|
69
|
+
//# sourceMappingURL=concatClassName.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../src/extractor/concatClassName.ts"],
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAUO,SAASA,gBAAgBC,KAA2C;AAOzE,WANMC,OAAOC,WACPC,eAAyB,CAAA,GAC3BC,QAAQ,IAENC,MAAMJ,KAAKK,QACbC,cAAmB,MACdC,IAAIH,KAAKG,KAAK,GAAGA,KAAK;;AAc3B,UAAMC,OAAOC,MAAMC,EAAAA;AAEnB,UAAI,CAACF,QAAQA,SAAS,IAAK,QAAA;AAC3B,UAAIA,KAAK,CAAA,MAAO;AAEdL,uBAAQK,OAAO,MAAML,OACrB;AAGF,UAAMQ,aAAaH,KAAKI,QAAQ,GAAA;AAChC,UAAID,aAAa;AACfR,uBAAQK,OAAO,MAAML,OAErB;AAGF,UAAMU,WAAWL,KAAKG,aAAa,CAAA,GAG7BG,eAAeD,aAAa,KAK5BE,WAAWP,KAAKQ,MAAM,GAAGR,KAAKS,YAAY,GAAA,CAAA,GAE1CC,WAAWJ,eAAeN,KAAKQ,MAAML,aAAa,GAAGA,aAAa,CAAA,IAAK,MACvEQ,MAAMD,WAAWH,WAAWG,WAAWH;AAG7C,UAAIb,aAAaU,QAAQO,GAAAA,IAAO;AAE9B,eAAA;AAEFjB,mBAAakB,KAAKD,GAAAA;AAGlB,UAAME,WAAWN;AACjB,UAAIM,YAAYf,eAEZA,YAAYgB,KAAK,SAACC,IAAAA;AAChB,YAAIL,UAAU;AACZ,cAAMM,UAAUC,aAAaP,QAAAA;AAC7B,iBAAOK,MAAMA,GAAGC,OAAAA,KAAYH,YAAYE,GAAGC,OAAAA,KAAYD,GAAGC,OAAAA,MAAa;QACzE;AACA,YAAME,MAAMH,MAAMF,YAAYE,MAAMA,GAAGF,QAAAA,MAAc;AACrD,eAAOK;MACT,CAAA;AAGA,eAAA;AAIJvB,cAAQK,OAAO,MAAML;IACvB,GApEMwB,MAAM3B,KAAKO,CAAAA;AAEjB,QAAKoB,KACL;UAAI,CAACC,MAAMC,QAAQF,GAAAA,KAAQ,OAAOA,OAAQ,UAAU;AAElDrB,sBAAcA,eAAe,CAAA,GAC7BA,YAAYc,KAAKO,GAAAA;AACjB;MACF;AAIA,eAFMlB,QAAQmB,MAAMC,QAAQF,GAAAA,IAAOA,MAAMA,IAAIG,MAAM,GAAA,GAC7CC,WAAWtB,MAAMJ,QACdK,IAAIqB,WAAW,GAAGrB,KAAK,GAAGA,IAAAA,OAAAA,CAAAA;;EAyDrC;AAEA,SAAOP;AACT;AAEA,IAAMsB,eAAe;EACnBO,OAAO;EACPC,OAAO;EACPC,OAAO;EACPC,cAAc;EACdC,aAAa;EACbC,UAAU;AACZ;",
|
|
5
|
+
"names": ["concatClassName", "_cn", "args", "arguments", "usedPrefixes", "final", "len", "length", "propObjects", "x", "name", "names", "i", "splitIndex", "indexOf", "nextChar", "isMediaQuery", "styleKey", "slice", "lastIndexOf", "mediaKey", "uid", "push", "propName", "some", "po", "propKey", "pseudoInvert", "res", "cns", "Array", "isArray", "split", "numNames", "hover", "focus", "press", "focusVisible", "focusWithin", "disabled"]
|
|
6
|
+
}
|
|
@@ -25,7 +25,7 @@ __export(extractToClassNames_exports, {
|
|
|
25
25
|
extractToClassNames: () => extractToClassNames
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(extractToClassNames_exports);
|
|
28
|
-
var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), path = __toESM(require("node:path")), util = __toESM(require("node:util")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_babelParse = require("./babelParse"), import_createLogger = require("./createLogger"), import_extractMediaStyle = require("./extractMediaStyle"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_errors = require("./errors");
|
|
28
|
+
var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), path = __toESM(require("node:path")), util = __toESM(require("node:util")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_babelParse = require("./babelParse"), import_createLogger = require("./createLogger"), import_extractMediaStyle = require("./extractMediaStyle"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_errors = require("./errors"), import_concatClassName = require("./concatClassName");
|
|
29
29
|
const remove = () => {
|
|
30
30
|
}, spaceString = t.stringLiteral(" ");
|
|
31
31
|
async function extractToClassNames({
|
|
@@ -155,20 +155,20 @@ async function extractToClassNames({
|
|
|
155
155
|
else
|
|
156
156
|
return [];
|
|
157
157
|
}
|
|
158
|
-
|
|
158
|
+
let mergedAlternate, mergedConsequent;
|
|
159
|
+
return ternary.alternate && Object.keys(ternary.alternate).length && (mergedAlternate = (0, import_web.mergeProps)(
|
|
159
160
|
mergeForwardBaseStyle || {},
|
|
160
161
|
ternary.alternate || {}
|
|
161
|
-
), mergedConsequent = (0, import_web.mergeProps)(
|
|
162
|
+
), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.alternate, mergedAlternate, baseFontFamily)), ternary.consequent && Object.keys(ternary.consequent).length && (mergedConsequent = (0, import_web.mergeProps)(
|
|
162
163
|
mergeForwardBaseStyle || {},
|
|
163
164
|
ternary.consequent || {}
|
|
164
|
-
)
|
|
165
|
-
return (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.alternate, mergedAlternate, baseFontFamily), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.consequent, mergedConsequent, baseFontFamily), {
|
|
165
|
+
), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary.consequent, mergedConsequent, baseFontFamily)), {
|
|
166
166
|
...ternary,
|
|
167
167
|
alternate: mergedAlternate,
|
|
168
168
|
consequent: mergedConsequent
|
|
169
169
|
};
|
|
170
170
|
}), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null;
|
|
171
|
-
let baseClassNameStr =
|
|
171
|
+
let baseClassNameStr = baseClassNames ? baseClassNames.join(" ") : "";
|
|
172
172
|
!hasTernaries && baseFontFamily && (baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`);
|
|
173
173
|
let base = staticConfig.componentName ? t.stringLiteral(
|
|
174
174
|
`is_${staticConfig.componentName}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`
|
|
@@ -243,12 +243,18 @@ async function extractToClassNames({
|
|
|
243
243
|
if (!ternary.consequent) continue;
|
|
244
244
|
const classNames = addStyles(ternary.consequent);
|
|
245
245
|
ternary.fontFamily && classNames.unshift(`font_${ternary.fontFamily}`);
|
|
246
|
-
const baseString = t.isStringLiteral(baseClassNameExpression) ? baseClassNameExpression.value : "", fullClassName = (
|
|
246
|
+
const baseString = t.isStringLiteral(baseClassNameExpression) ? baseClassNameExpression.value : "", fullClassName = (0, import_concatClassName.concatClassName)(
|
|
247
|
+
(baseString ? `${baseString} ` : "") + classNames.join(" ")
|
|
248
|
+
), classNameLiteral = t.stringLiteral(fullClassName);
|
|
247
249
|
ternaryClassNameExpr ? ternaryClassNameExpr = t.conditionalExpression(
|
|
248
250
|
ternary.test,
|
|
249
251
|
classNameLiteral,
|
|
250
252
|
ternaryClassNameExpr
|
|
251
|
-
) : ternaryClassNameExpr =
|
|
253
|
+
) : ternaryClassNameExpr = t.conditionalExpression(
|
|
254
|
+
ternary.test,
|
|
255
|
+
classNameLiteral,
|
|
256
|
+
baseClassNameExpression
|
|
257
|
+
);
|
|
252
258
|
}
|
|
253
259
|
let finalExpression = ternaryClassNameExpr || baseClassNameExpression || null;
|
|
254
260
|
if (finalExpression) {
|
|
@@ -298,9 +304,9 @@ async function extractToClassNames({
|
|
|
298
304
|
function hoistClassNames(path2, expr) {
|
|
299
305
|
if (t.isStringLiteral(expr))
|
|
300
306
|
return hoistClassName(path2, expr.value);
|
|
301
|
-
if (t.
|
|
307
|
+
if (t.isLogicalExpression(expr)) {
|
|
302
308
|
const left = t.isStringLiteral(expr.left) ? hoistClassName(path2, expr.left.value) : expr.left, right = t.isStringLiteral(expr.right) ? hoistClassName(path2, expr.right.value) : hoistClassNames(path2, expr.right);
|
|
303
|
-
return t.
|
|
309
|
+
return t.logicalExpression(expr.operator, left, right);
|
|
304
310
|
}
|
|
305
311
|
if (t.isConditionalExpression(expr)) {
|
|
306
312
|
const cons = t.isStringLiteral(expr.consequent) ? hoistClassName(path2, expr.consequent.value) : hoistClassNames(path2, expr.consequent), alt = t.isStringLiteral(expr.alternate) ? hoistClassName(path2, expr.alternate.value) : hoistClassNames(path2, expr.alternate);
|
|
@@ -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,aAAoE,yBACpE,OAAsB,+BACtB,OAAsB,+BACtB,4BAAmC,0CAEnC,oBAA2B,yBAE3B,sBAA6B,2BAC7B,2BAAkC,gCAClC,4BAAmC,iCACnC,gCAGO,qCACP,eAAsB,oBACtB,gBAAsC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["style", "identifier", "generate", "path"]
|
|
6
6
|
}
|
|
@@ -26,7 +26,7 @@ __export(extractToClassNames_exports, {
|
|
|
26
26
|
extractToClassNames: () => extractToClassNames
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(extractToClassNames_exports);
|
|
29
|
-
var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), path = __toESM(require("node:path")), util = __toESM(require("node:util")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_babelParse = require("./babelParse"), import_createLogger = require("./createLogger"), import_extractMediaStyle = require("./extractMediaStyle"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_errors = require("./errors"), remove = function() {
|
|
29
|
+
var import_generator = __toESM(require("@babel/generator")), t = __toESM(require("@babel/types")), import_web = require("@tamagui/web"), path = __toESM(require("node:path")), util = __toESM(require("node:util")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_babelParse = require("./babelParse"), import_createLogger = require("./createLogger"), import_extractMediaStyle = require("./extractMediaStyle"), import_normalizeTernaries = require("./normalizeTernaries"), import_propsToFontFamilyCache = require("./propsToFontFamilyCache"), import_timer = require("./timer"), import_errors = require("./errors"), import_concatClassName = require("./concatClassName"), remove = function() {
|
|
30
30
|
}, spaceString = t.stringLiteral(" ");
|
|
31
31
|
async function extractToClassNames(param) {
|
|
32
32
|
var { extractor, source, sourcePath = "", options, shouldPrintDebug } = param, tm = (0, import_timer.timer)(), { getCSSStylesAtomic, createMediaStyle } = (0, import_requireTamaguiCore.requireTamaguiCore)("web");
|
|
@@ -138,13 +138,13 @@ async function extractToClassNames(param) {
|
|
|
138
138
|
else
|
|
139
139
|
return [];
|
|
140
140
|
}
|
|
141
|
-
var mergedAlternate
|
|
142
|
-
return (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.alternate, mergedAlternate, baseFontFamily), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.consequent, mergedConsequent, baseFontFamily), {
|
|
141
|
+
var mergedAlternate, mergedConsequent;
|
|
142
|
+
return ternary2.alternate && Object.keys(ternary2.alternate).length && (mergedAlternate = (0, import_web.mergeProps)(mergeForwardBaseStyle || {}, ternary2.alternate || {}), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.alternate, mergedAlternate, baseFontFamily)), ternary2.consequent && Object.keys(ternary2.consequent).length && (mergedConsequent = (0, import_web.mergeProps)(mergeForwardBaseStyle || {}, ternary2.consequent || {}), (0, import_propsToFontFamilyCache.forwardFontFamilyName)(ternary2.consequent, mergedConsequent, baseFontFamily)), {
|
|
143
143
|
...ternary2,
|
|
144
144
|
alternate: mergedAlternate,
|
|
145
145
|
consequent: mergedConsequent
|
|
146
146
|
};
|
|
147
|
-
}), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null, baseClassNameStr =
|
|
147
|
+
}), hasTernaries = !!onlyTernaries.length, baseClassNames = mergeForwardBaseStyle ? addStyles(mergeForwardBaseStyle) : null, baseClassNameStr = baseClassNames ? baseClassNames.join(" ") : "";
|
|
148
148
|
!hasTernaries && baseFontFamily && (baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`);
|
|
149
149
|
var base = staticConfig.componentName ? t.stringLiteral(`is_${staticConfig.componentName}${baseClassNameStr ? ` ${baseClassNameStr}` : ""}`) : t.stringLiteral(baseClassNameStr || "");
|
|
150
150
|
attrClassName = attrClassName;
|
|
@@ -224,8 +224,8 @@ async function extractToClassNames(param) {
|
|
|
224
224
|
if (ternary1.consequent) {
|
|
225
225
|
var classNames = addStyles(ternary1.consequent);
|
|
226
226
|
ternary1.fontFamily && classNames.unshift(`font_${ternary1.fontFamily}`);
|
|
227
|
-
var baseString = t.isStringLiteral(baseClassNameExpression) ? baseClassNameExpression.value : "", fullClassName = (baseString ? `${baseString} ` : "") + classNames.join(" "), classNameLiteral = t.stringLiteral(fullClassName);
|
|
228
|
-
ternaryClassNameExpr ? ternaryClassNameExpr = t.conditionalExpression(ternary1.test, classNameLiteral, ternaryClassNameExpr) : ternaryClassNameExpr = classNameLiteral;
|
|
227
|
+
var baseString = t.isStringLiteral(baseClassNameExpression) ? baseClassNameExpression.value : "", fullClassName = (0, import_concatClassName.concatClassName)((baseString ? `${baseString} ` : "") + classNames.join(" ")), classNameLiteral = t.stringLiteral(fullClassName);
|
|
228
|
+
ternaryClassNameExpr ? ternaryClassNameExpr = t.conditionalExpression(ternary1.test, classNameLiteral, ternaryClassNameExpr) : ternaryClassNameExpr = t.conditionalExpression(ternary1.test, classNameLiteral, baseClassNameExpression);
|
|
229
229
|
}
|
|
230
230
|
}
|
|
231
231
|
} catch (err) {
|
|
@@ -281,9 +281,9 @@ async function extractToClassNames(param) {
|
|
|
281
281
|
function hoistClassNames(path2, expr) {
|
|
282
282
|
if (t.isStringLiteral(expr))
|
|
283
283
|
return hoistClassName(path2, expr.value);
|
|
284
|
-
if (t.
|
|
284
|
+
if (t.isLogicalExpression(expr)) {
|
|
285
285
|
var left = t.isStringLiteral(expr.left) ? hoistClassName(path2, expr.left.value) : expr.left, right = t.isStringLiteral(expr.right) ? hoistClassName(path2, expr.right.value) : hoistClassNames(path2, expr.right);
|
|
286
|
-
return t.
|
|
286
|
+
return t.logicalExpression(expr.operator, left, right);
|
|
287
287
|
}
|
|
288
288
|
if (t.isConditionalExpression(expr)) {
|
|
289
289
|
var cons = t.isStringLiteral(expr.consequent) ? hoistClassName(path2, expr.consequent.value) : hoistClassNames(path2, expr.consequent), alt = t.isStringLiteral(expr.alternate) ? hoistClassName(path2, expr.alternate.value) : hoistClassNames(path2, expr.alternate);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extractor/extractToClassNames.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAAqB,sCAErB,IAAmB,kCACnB,aAAoE,yBACpE,OAAsB,+BACtB,OAAsB,+BACtB,4BAAmC,0CAEnC,oBAA2B,yBAE3B,sBAA6B,2BAC7B,2BAAkC,gCAClC,4BAAmC,iCACnC,gCAGO,qCACP,eAAsB,oBACtB,gBAAsC,
|
|
5
|
-
"names": ["remove", "spaceString", "t", "stringLiteral", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "timer", "getCSSStylesAtomic", "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", "BailOptimizationError", "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", "mergeProps", "getFontFamilyNameFromProps", "ternary", "inlineMediaQuery", "mediaExtraction", "extractMediaStyle", "mediaStyles", "consequent", "ternaryWithoutMedia", "mergedAlternate", "alternate", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["remove", "spaceString", "t", "stringLiteral", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "timer", "getCSSStylesAtomic", "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", "BailOptimizationError", "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", "mergeProps", "getFontFamilyNameFromProps", "ternary", "inlineMediaQuery", "mediaExtraction", "extractMediaStyle", "mediaStyles", "consequent", "ternaryWithoutMedia", "mergedAlternate", "mergedConsequent", "alternate", "Object", "keys", "forwardFontFamilyName", "hasTernaries", "Boolean", "baseClassNames", "baseClassNameStr", "base", "componentName", "baseClassNameExpression", "isStringLiteral", "conditionalExpression", "binaryExpression", "expandedTernaries", "normalizedTernaries", "normalizeTernaries", "expandTernary", "prev", "fontFamily", "logicalExpression", "unaryExpression", "negated", "ternaryClassNameExpr", "unshift", "baseString", "fullClassName", "concatClassName", "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", "isLogicalExpression", "left", "right", "operator", "isConditionalExpression", "cons", "alt", "str", "uid", "scope", "generateUidIdentifier", "parent", "findParent", "isProgram", "variable", "variableDeclaration", "variableDeclarator", "cleanupClassName", "unshiftContainer", "inStr", "out", "Set", "part", "add"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/static",
|
|
3
|
-
"version": "1.132.
|
|
3
|
+
"version": "1.132.18",
|
|
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.
|
|
49
|
-
"@tamagui/config-default": "1.132.
|
|
50
|
-
"@tamagui/core": "1.132.
|
|
51
|
-
"@tamagui/fake-react-native": "1.132.
|
|
52
|
-
"@tamagui/generate-themes": "1.132.
|
|
53
|
-
"@tamagui/helpers": "1.132.
|
|
54
|
-
"@tamagui/helpers-node": "1.132.
|
|
55
|
-
"@tamagui/proxy-worm": "1.132.
|
|
56
|
-
"@tamagui/react-native-web-internals": "1.132.
|
|
57
|
-
"@tamagui/react-native-web-lite": "1.132.
|
|
58
|
-
"@tamagui/shorthands": "1.132.
|
|
59
|
-
"@tamagui/types": "1.132.
|
|
60
|
-
"@tamagui/web": "1.132.
|
|
48
|
+
"@tamagui/cli-color": "1.132.18",
|
|
49
|
+
"@tamagui/config-default": "1.132.18",
|
|
50
|
+
"@tamagui/core": "1.132.18",
|
|
51
|
+
"@tamagui/fake-react-native": "1.132.18",
|
|
52
|
+
"@tamagui/generate-themes": "1.132.18",
|
|
53
|
+
"@tamagui/helpers": "1.132.18",
|
|
54
|
+
"@tamagui/helpers-node": "1.132.18",
|
|
55
|
+
"@tamagui/proxy-worm": "1.132.18",
|
|
56
|
+
"@tamagui/react-native-web-internals": "1.132.18",
|
|
57
|
+
"@tamagui/react-native-web-lite": "1.132.18",
|
|
58
|
+
"@tamagui/shorthands": "1.132.18",
|
|
59
|
+
"@tamagui/types": "1.132.18",
|
|
60
|
+
"@tamagui/web": "1.132.18",
|
|
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.
|
|
77
|
+
"@tamagui/build": "1.132.18",
|
|
78
78
|
"@types/babel__core": "^7.20.5",
|
|
79
79
|
"@types/find-root": "^1.1.2",
|
|
80
80
|
"@types/node": "^22.1.0",
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
// perf sensitive so doing some weird stuff
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* next - take objects:
|
|
5
|
+
*
|
|
6
|
+
* { _shorthand: 'postfix' }
|
|
7
|
+
*
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
export function concatClassName(...args: any[]): any
|
|
11
|
+
export function concatClassName(_cn: Record<string, any> | null | undefined): string {
|
|
12
|
+
const args = arguments
|
|
13
|
+
const usedPrefixes: string[] = []
|
|
14
|
+
let final = ''
|
|
15
|
+
|
|
16
|
+
const len = args.length
|
|
17
|
+
let propObjects: any = null
|
|
18
|
+
for (let x = len; x >= 0; x--) {
|
|
19
|
+
const cns = args[x]
|
|
20
|
+
|
|
21
|
+
if (!cns) continue
|
|
22
|
+
if (!Array.isArray(cns) && typeof cns !== 'string') {
|
|
23
|
+
// is prop object
|
|
24
|
+
propObjects = propObjects || []
|
|
25
|
+
propObjects.push(cns)
|
|
26
|
+
continue
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const names = Array.isArray(cns) ? cns : cns.split(' ')
|
|
30
|
+
const numNames = names.length
|
|
31
|
+
for (let i = numNames - 1; i >= 0; i--) {
|
|
32
|
+
const name = names[i]
|
|
33
|
+
|
|
34
|
+
if (!name || name === ' ') continue
|
|
35
|
+
if (name[0] !== '_') {
|
|
36
|
+
// not snack style (todo slightly stronger heuristic)
|
|
37
|
+
final = name + ' ' + final
|
|
38
|
+
continue
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const splitIndex = name.indexOf('-')
|
|
42
|
+
if (splitIndex < 1) {
|
|
43
|
+
final = name + ' ' + final
|
|
44
|
+
// if (shouldDebug) console.log('debug exclude:', name, final)
|
|
45
|
+
continue
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const nextChar = name[splitIndex + 1]
|
|
49
|
+
// synced to static-ui constants
|
|
50
|
+
// MEDIA_SEP
|
|
51
|
+
const isMediaQuery = nextChar === '_'
|
|
52
|
+
// PSEUDO_SEP
|
|
53
|
+
// commenting out three things to make pseudos override properly
|
|
54
|
+
// (leave in for a bit to see if other bugs pop up later):
|
|
55
|
+
// 1. const isPseudoQuery = nextChar === '0'
|
|
56
|
+
const styleKey = name.slice(1, name.lastIndexOf('-'))
|
|
57
|
+
// 2. isMediaQuery || isPseudoQuery
|
|
58
|
+
const mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null
|
|
59
|
+
const uid = mediaKey ? styleKey + mediaKey : styleKey
|
|
60
|
+
// 3. && !isPseudoQuery
|
|
61
|
+
|
|
62
|
+
if (usedPrefixes.indexOf(uid) > -1) {
|
|
63
|
+
// if (shouldDebug) console.log('debug exclude:', usedPrefixes, name)
|
|
64
|
+
continue
|
|
65
|
+
}
|
|
66
|
+
usedPrefixes.push(uid)
|
|
67
|
+
|
|
68
|
+
// overrides for full safety
|
|
69
|
+
const propName = styleKey
|
|
70
|
+
if (propName && propObjects) {
|
|
71
|
+
if (
|
|
72
|
+
propObjects.some((po) => {
|
|
73
|
+
if (mediaKey) {
|
|
74
|
+
const propKey = pseudoInvert[mediaKey]
|
|
75
|
+
return po && po[propKey] && propName in po[propKey] && po[propKey] !== null
|
|
76
|
+
}
|
|
77
|
+
const res = po && propName in po && po[propName] !== null
|
|
78
|
+
return res
|
|
79
|
+
})
|
|
80
|
+
) {
|
|
81
|
+
// if (shouldDebug) console.log('debug exclude:', name)
|
|
82
|
+
continue
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
final = name + ' ' + final
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
return final
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
const pseudoInvert = {
|
|
94
|
+
hover: 'hoverStyle',
|
|
95
|
+
focus: 'focusStyle',
|
|
96
|
+
press: 'pressStyle',
|
|
97
|
+
focusVisible: 'focusVisibleStyle',
|
|
98
|
+
focusWithin: 'focusWithinStyle',
|
|
99
|
+
disabled: 'disabledStyle',
|
|
100
|
+
}
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
} from './propsToFontFamilyCache'
|
|
18
18
|
import { timer } from './timer'
|
|
19
19
|
import { BailOptimizationError } from './errors'
|
|
20
|
+
import { concatClassName } from './concatClassName'
|
|
20
21
|
|
|
21
22
|
export type ExtractedResponse = {
|
|
22
23
|
js: string | Buffer
|
|
@@ -271,17 +272,24 @@ export async function extractToClassNames({
|
|
|
271
272
|
}
|
|
272
273
|
}
|
|
273
274
|
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
ternary.alternate || {}
|
|
277
|
-
)
|
|
278
|
-
const mergedConsequent = mergeProps(
|
|
279
|
-
mergeForwardBaseStyle || {},
|
|
280
|
-
ternary.consequent || {}
|
|
281
|
-
)
|
|
275
|
+
let mergedAlternate
|
|
276
|
+
let mergedConsequent
|
|
282
277
|
|
|
283
|
-
|
|
284
|
-
|
|
278
|
+
if (ternary.alternate && Object.keys(ternary.alternate).length) {
|
|
279
|
+
mergedAlternate = mergeProps(
|
|
280
|
+
mergeForwardBaseStyle || {},
|
|
281
|
+
ternary.alternate || {}
|
|
282
|
+
)
|
|
283
|
+
forwardFontFamilyName(ternary.alternate, mergedAlternate, baseFontFamily)
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
if (ternary.consequent && Object.keys(ternary.consequent).length) {
|
|
287
|
+
mergedConsequent = mergeProps(
|
|
288
|
+
mergeForwardBaseStyle || {},
|
|
289
|
+
ternary.consequent || {}
|
|
290
|
+
)
|
|
291
|
+
forwardFontFamilyName(ternary.consequent, mergedConsequent, baseFontFamily)
|
|
292
|
+
}
|
|
285
293
|
|
|
286
294
|
// merge the base style forward into both sides
|
|
287
295
|
return {
|
|
@@ -297,8 +305,7 @@ export async function extractToClassNames({
|
|
|
297
305
|
? addStyles(mergeForwardBaseStyle)
|
|
298
306
|
: null
|
|
299
307
|
|
|
300
|
-
let baseClassNameStr =
|
|
301
|
-
hasTernaries || !baseClassNames ? '' : baseClassNames.join(' ')
|
|
308
|
+
let baseClassNameStr = !baseClassNames ? '' : baseClassNames.join(' ')
|
|
302
309
|
|
|
303
310
|
if (!hasTernaries && baseFontFamily) {
|
|
304
311
|
baseClassNameStr = `font_${baseFontFamily}${baseClassNameStr ? ` ${baseClassNameStr}` : ''}`
|
|
@@ -424,12 +431,20 @@ export async function extractToClassNames({
|
|
|
424
431
|
const baseString = t.isStringLiteral(baseClassNameExpression)
|
|
425
432
|
? baseClassNameExpression.value
|
|
426
433
|
: ''
|
|
427
|
-
|
|
434
|
+
|
|
435
|
+
// we concat here as the base could be conditionally overriden by our classNames
|
|
436
|
+
const fullClassName = concatClassName(
|
|
428
437
|
(baseString ? `${baseString} ` : '') + classNames.join(' ')
|
|
438
|
+
)
|
|
439
|
+
|
|
429
440
|
const classNameLiteral = t.stringLiteral(fullClassName)
|
|
430
441
|
|
|
431
442
|
if (!ternaryClassNameExpr) {
|
|
432
|
-
ternaryClassNameExpr =
|
|
443
|
+
ternaryClassNameExpr = t.conditionalExpression(
|
|
444
|
+
ternary.test,
|
|
445
|
+
classNameLiteral,
|
|
446
|
+
baseClassNameExpression
|
|
447
|
+
)
|
|
433
448
|
} else {
|
|
434
449
|
ternaryClassNameExpr = t.conditionalExpression(
|
|
435
450
|
ternary.test,
|
|
@@ -452,6 +467,8 @@ export async function extractToClassNames({
|
|
|
452
467
|
// hoist to global variables
|
|
453
468
|
finalExpression = hoistClassNames(jsxPath, finalExpression)
|
|
454
469
|
|
|
470
|
+
// console.log('finalExpression', finalExpression)
|
|
471
|
+
|
|
455
472
|
const classNameProp = t.jsxAttribute(
|
|
456
473
|
t.jsxIdentifier('className'),
|
|
457
474
|
t.jsxExpressionContainer(finalExpression!)
|
|
@@ -515,14 +532,14 @@ function hoistClassNames(path: NodePath<t.JSXElement>, expr: t.Expression) {
|
|
|
515
532
|
return hoistClassName(path, expr.value)
|
|
516
533
|
}
|
|
517
534
|
|
|
518
|
-
if (t.
|
|
535
|
+
if (t.isLogicalExpression(expr)) {
|
|
519
536
|
const left = t.isStringLiteral(expr.left)
|
|
520
537
|
? hoistClassName(path, expr.left.value)
|
|
521
538
|
: expr.left
|
|
522
539
|
const right = t.isStringLiteral(expr.right)
|
|
523
540
|
? hoistClassName(path, expr.right.value)
|
|
524
541
|
: hoistClassNames(path, expr.right)
|
|
525
|
-
return t.
|
|
542
|
+
return t.logicalExpression(expr.operator, left, right)
|
|
526
543
|
}
|
|
527
544
|
|
|
528
545
|
if (t.isConditionalExpression(expr)) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"concatClassName.d.ts","sourceRoot":"","sources":["../../src/extractor/concatClassName.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH,wBAAgB,eAAe,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA"}
|
|
@@ -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;AAYlD,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,CA8d9D"}
|