@arbor-css/classes 0.0.15 → 0.0.17
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/_test.d.ts +12 -0
- package/dist/_test.d.ts.map +1 -1
- package/dist/root.test.d.ts +2 -0
- package/dist/root.test.d.ts.map +1 -0
- package/dist/root.test.js +19 -0
- package/dist/root.test.js.map +1 -0
- package/dist/rules/border.js +1 -1
- package/dist/rules/border.js.map +1 -1
- package/dist/rules/border.test.js +5 -0
- package/dist/rules/border.test.js.map +1 -1
- package/dist/theme/index.d.ts.map +1 -1
- package/dist/theme/index.js +28 -6
- package/dist/theme/index.js.map +1 -1
- package/dist/util/themeOrLiteral.d.ts.map +1 -1
- package/dist/util/themeOrLiteral.js +12 -1
- package/dist/util/themeOrLiteral.js.map +1 -1
- package/dist/util/themeOrLiteral.test.d.ts +2 -0
- package/dist/util/themeOrLiteral.test.d.ts.map +1 -0
- package/dist/util/themeOrLiteral.test.js +14 -0
- package/dist/util/themeOrLiteral.test.js.map +1 -0
- package/package.json +6 -6
package/dist/_test.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export declare const testArbor: import("@arbor-css/preset").ArborPresetInstance<
|
|
|
5
5
|
}, Record<string, never>, Record<string, import("@arbor-css/core").PartialModeInstance<{
|
|
6
6
|
colors: {
|
|
7
7
|
main: {
|
|
8
|
+
$root: "color";
|
|
8
9
|
paper: "color";
|
|
9
10
|
wash: "color";
|
|
10
11
|
lighter: "color";
|
|
@@ -15,6 +16,7 @@ export declare const testArbor: import("@arbor-css/preset").ArborPresetInstance<
|
|
|
15
16
|
ink: "color";
|
|
16
17
|
};
|
|
17
18
|
neutral: {
|
|
19
|
+
$root: "color";
|
|
18
20
|
paper: "color";
|
|
19
21
|
wash: "color";
|
|
20
22
|
lighter: "color";
|
|
@@ -86,6 +88,7 @@ export declare const testArbor: import("@arbor-css/preset").ArborPresetInstance<
|
|
|
86
88
|
};
|
|
87
89
|
density: "other";
|
|
88
90
|
spacing: {
|
|
91
|
+
$root: "spacing";
|
|
89
92
|
xs: "spacing";
|
|
90
93
|
sm: "spacing";
|
|
91
94
|
md: "spacing";
|
|
@@ -93,16 +96,19 @@ export declare const testArbor: import("@arbor-css/preset").ArborPresetInstance<
|
|
|
93
96
|
xl: "spacing";
|
|
94
97
|
};
|
|
95
98
|
borderWidth: {
|
|
99
|
+
$root: "border-width";
|
|
96
100
|
sm: "border-width";
|
|
97
101
|
md: "border-width";
|
|
98
102
|
lg: "border-width";
|
|
99
103
|
};
|
|
100
104
|
borderRadius: {
|
|
105
|
+
$root: "border-radius";
|
|
101
106
|
sm: "border-radius";
|
|
102
107
|
md: "border-radius";
|
|
103
108
|
lg: "border-radius";
|
|
104
109
|
};
|
|
105
110
|
shadow: {
|
|
111
|
+
$root: "shadow";
|
|
106
112
|
color: "color";
|
|
107
113
|
sm: {
|
|
108
114
|
x: "shadow-x";
|
|
@@ -141,6 +147,7 @@ export declare const testArbor: import("@arbor-css/preset").ArborPresetInstance<
|
|
|
141
147
|
export declare const testBaseMode: import("@arbor-css/core").ModeInstance<{
|
|
142
148
|
colors: {
|
|
143
149
|
main: {
|
|
150
|
+
$root: "color";
|
|
144
151
|
paper: "color";
|
|
145
152
|
wash: "color";
|
|
146
153
|
lighter: "color";
|
|
@@ -151,6 +158,7 @@ export declare const testBaseMode: import("@arbor-css/core").ModeInstance<{
|
|
|
151
158
|
ink: "color";
|
|
152
159
|
};
|
|
153
160
|
neutral: {
|
|
161
|
+
$root: "color";
|
|
154
162
|
paper: "color";
|
|
155
163
|
wash: "color";
|
|
156
164
|
lighter: "color";
|
|
@@ -222,6 +230,7 @@ export declare const testBaseMode: import("@arbor-css/core").ModeInstance<{
|
|
|
222
230
|
};
|
|
223
231
|
density: "other";
|
|
224
232
|
spacing: {
|
|
233
|
+
$root: "spacing";
|
|
225
234
|
xs: "spacing";
|
|
226
235
|
sm: "spacing";
|
|
227
236
|
md: "spacing";
|
|
@@ -229,16 +238,19 @@ export declare const testBaseMode: import("@arbor-css/core").ModeInstance<{
|
|
|
229
238
|
xl: "spacing";
|
|
230
239
|
};
|
|
231
240
|
borderWidth: {
|
|
241
|
+
$root: "border-width";
|
|
232
242
|
sm: "border-width";
|
|
233
243
|
md: "border-width";
|
|
234
244
|
lg: "border-width";
|
|
235
245
|
};
|
|
236
246
|
borderRadius: {
|
|
247
|
+
$root: "border-radius";
|
|
237
248
|
sm: "border-radius";
|
|
238
249
|
md: "border-radius";
|
|
239
250
|
lg: "border-radius";
|
|
240
251
|
};
|
|
241
252
|
shadow: {
|
|
253
|
+
$root: "shadow";
|
|
242
254
|
color: "color";
|
|
243
255
|
sm: {
|
|
244
256
|
x: "shadow-x";
|
package/dist/_test.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_test.d.ts","sourceRoot":"","sources":["../src/_test.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS
|
|
1
|
+
{"version":3,"file":"_test.d.ts","sourceRoot":"","sources":["../src/_test.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IASpB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAuB,CAAC;AAEjD,eAAO,MAAM,SAAS,4BAAyB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"root.test.d.ts","sourceRoot":"","sources":["../src/root.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { modeToCss } from '@arbor-css/core';
|
|
2
|
+
import { describe, expect, it } from 'vitest';
|
|
3
|
+
import { testArbor, testBaseMode } from './_test.js';
|
|
4
|
+
describe('preset $root mappings', () => {
|
|
5
|
+
it('maps mode color $root to mid by default', () => {
|
|
6
|
+
expect(testArbor.primitives.colors.light.colors.brand.$root).toBe(testArbor.primitives.colors.light.colors.brand.mid);
|
|
7
|
+
expect(testArbor.primitives.colors.light.colors.brand.$neutral.$root).toBe(testArbor.primitives.colors.light.colors.brand.$neutral.mid);
|
|
8
|
+
expect(testBaseMode.values.colors.main.$root).toBe(testArbor.primitives.$tokens.colors.brand.$root);
|
|
9
|
+
expect(testBaseMode.values.colors.neutral.$root).toBe(testArbor.primitives.$tokens.colors.brand.$neutral.$root);
|
|
10
|
+
});
|
|
11
|
+
it('maps default scale values to mode $root tokens', () => {
|
|
12
|
+
expect(testArbor.primitives.spacing.levels.$root).toBe(testArbor.primitives.spacing.levels[testArbor.primitives.spacing.defaultLevel]);
|
|
13
|
+
expect(testArbor.primitives.typography.levels.$root).toEqual(testArbor.primitives.typography.levels[testArbor.primitives.typography.defaultLevel]);
|
|
14
|
+
expect(testArbor.primitives.shadows.levels.$root).toEqual(testArbor.primitives.shadows.levels[testArbor.primitives.shadows.defaultLevel]);
|
|
15
|
+
const css = modeToCss(testBaseMode, testBaseMode);
|
|
16
|
+
expect(css).toContain(`--Ⓜ️-spacing: calc(${testArbor.primitives.$tokens.spacing.$root.var} / var(--Ⓜ️-density));`);
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
//# sourceMappingURL=root.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"root.test.js","sourceRoot":"","sources":["../src/root.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAErD,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAChE,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAClD,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CACzE,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAC3D,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CACjD,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAC/C,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CACpD,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CACxD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACzD,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CACrD,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAC9E,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAC3D,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CACrC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAC5C,CACD,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CACxD,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAC9E,CAAC;QAEF,MAAM,GAAG,GAAG,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CACpB,sBAAsB,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,wBAAwB,CAC5F,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
package/dist/rules/border.js
CHANGED
|
@@ -42,7 +42,7 @@ const borderWidthRules = directionMapEntries.flatMap(([dirSuffix, dirs]) => {
|
|
|
42
42
|
];
|
|
43
43
|
});
|
|
44
44
|
const borderRadiusRules = directionMapEntries.flatMap(([dirSuffix, dirs]) => {
|
|
45
|
-
const pattern = `^(?:rounded|rd)${dirRegex(dirSuffix)}
|
|
45
|
+
const pattern = `^(?:rounded|rd)${dirRegex(dirSuffix)}(?:-(.+))?$`;
|
|
46
46
|
return [
|
|
47
47
|
[
|
|
48
48
|
new RegExp(pattern),
|
package/dist/rules/border.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"border.js","sourceRoot":"","sources":["../../src/rules/border.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,MAAM,YAAY,GAAG;IACpB,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,OAAO;IACP,OAAO;IACP,QAAQ;IACR,GAAG,cAAc;CACjB,CAAC;AAEF,MAAM,gBAAgB,GAAkB,mBAAmB,CAAC,OAAO,CAClE,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;IACrB,MAAM,OAAO,GAAG,gBAAgB,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;IAC5D,OAAO;QACN;YACC,IAAI,MAAM,CAAC,OAAO,CAAC;YACnB,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;gBACvB,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE;oBACvD,SAAS,EAAE,cAAc;oBACzB,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC;iBAC3B,CAAC,CAAC;gBACH,IAAI,CAAC,KAAK;oBAAE,OAAO;gBACnB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC1B,6CAA6C;oBAC7C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;wBACvC,OAAO;oBACR,CAAC;gBACF,CAAC;gBACD,OAAO,MAAM,CAAC,WAAW,CACxB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAChE,CAAC;YACH,CAAC;SACqB;KACvB,CAAC;AACH,CAAC,CACD,CAAC;AAEF,MAAM,iBAAiB,GAAkB,mBAAmB,CAAC,OAAO,CACnE,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;IACrB,MAAM,OAAO,GAAG,kBAAkB,QAAQ,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"border.js","sourceRoot":"","sources":["../../src/rules/border.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,5 +100,10 @@ describe('border radius', () => {
|
|
|
100
100
|
'border-radius': testBaseMode.schema.$tokens.borderRadius.md.var,
|
|
101
101
|
});
|
|
102
102
|
});
|
|
103
|
+
it('matches default radius', async () => {
|
|
104
|
+
await testRules(borderRules, 'rd', {
|
|
105
|
+
'border-radius': testBaseMode.schema.$tokens.borderRadius.$root.var,
|
|
106
|
+
});
|
|
107
|
+
});
|
|
103
108
|
});
|
|
104
109
|
//# sourceMappingURL=border.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"border.test.js","sourceRoot":"","sources":["../../src/rules/border.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"border.test.js","sourceRoot":"","sources":["../../src/rules/border.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/theme/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/theme/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAA6B,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AA2CnC,MAAM,WAAW,WAAW;IAC3B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,eAAO,MAAM,kBAAkB,EAAE,WAahC,CAAC;AAiFF,wBAAgB,WAAW,CAC1B,KAAK,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAC5B,gBAAgB,GAAE,WAAgC,GAuC7C,KAAK,CACV"}
|
package/dist/theme/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { isToken } from '@arbor-css/core';
|
|
2
2
|
import { toFlatKeys } from '@arbor-css/util';
|
|
3
|
+
import { theme } from '@unocss/preset-mini';
|
|
3
4
|
const extraWords = [
|
|
4
5
|
'colors',
|
|
5
6
|
'color',
|
|
@@ -26,12 +27,13 @@ const extraWords = [
|
|
|
26
27
|
'blur',
|
|
27
28
|
'spread',
|
|
28
29
|
];
|
|
29
|
-
function
|
|
30
|
+
function processKey(key, extraWords) {
|
|
30
31
|
for (const word of extraWords) {
|
|
31
32
|
key = key.replaceAll(new RegExp(`-${word}-`, 'g'), '-');
|
|
32
33
|
key = key.replaceAll(new RegExp(`^${word}-`, 'g'), '');
|
|
33
34
|
key = key.replaceAll(new RegExp(`-${word}$`, 'g'), '');
|
|
34
35
|
}
|
|
36
|
+
key = key.replaceAll('$root', '');
|
|
35
37
|
key = key
|
|
36
38
|
.replaceAll(/^-+/g, '')
|
|
37
39
|
.replaceAll(/-+$/g, '')
|
|
@@ -54,6 +56,9 @@ export const defaultThemeConfig = {
|
|
|
54
56
|
};
|
|
55
57
|
// keep preset-mini happy with an empty theme shape since we rely on lots of their rules still
|
|
56
58
|
const emptyMini = {
|
|
59
|
+
// these are actually useful
|
|
60
|
+
transitionProperty: theme.transitionProperty,
|
|
61
|
+
easing: theme.easing,
|
|
57
62
|
accentColor: {},
|
|
58
63
|
animation: {},
|
|
59
64
|
aria: {},
|
|
@@ -70,7 +75,6 @@ const emptyMini = {
|
|
|
70
75
|
data: {},
|
|
71
76
|
dropShadow: {},
|
|
72
77
|
duration: {},
|
|
73
|
-
easing: {},
|
|
74
78
|
fontFamily: {},
|
|
75
79
|
fontSize: {},
|
|
76
80
|
fontWeight: {},
|
|
@@ -94,7 +98,6 @@ const emptyMini = {
|
|
|
94
98
|
ringWidth: {},
|
|
95
99
|
shadowColor: {},
|
|
96
100
|
textColor: {},
|
|
97
|
-
transitionProperty: {},
|
|
98
101
|
width: {},
|
|
99
102
|
zIndex: {},
|
|
100
103
|
verticalBreakpoints: {},
|
|
@@ -109,14 +112,33 @@ const emptyMini = {
|
|
|
109
112
|
textStrokeWidth: {},
|
|
110
113
|
wordSpacing: {},
|
|
111
114
|
};
|
|
115
|
+
const baseValues = {
|
|
116
|
+
spacing: {
|
|
117
|
+
none: '0',
|
|
118
|
+
},
|
|
119
|
+
'border-radius': {
|
|
120
|
+
none: '0',
|
|
121
|
+
},
|
|
122
|
+
'border-width': {
|
|
123
|
+
none: '0',
|
|
124
|
+
},
|
|
125
|
+
'line-height': {
|
|
126
|
+
none: '0',
|
|
127
|
+
normal: 'normal',
|
|
128
|
+
},
|
|
129
|
+
size: {
|
|
130
|
+
none: '0',
|
|
131
|
+
full: '100%',
|
|
132
|
+
},
|
|
133
|
+
};
|
|
112
134
|
export function createTheme(arbor, breakpointConfig = defaultThemeConfig) {
|
|
113
135
|
const flatPrimitiveTokens = toFlatKeys(arbor.primitives.$tokens, isToken, { separator: '-' });
|
|
114
136
|
const flatModeTokens = toFlatKeys(arbor.modes.base.schema.$tokens, isToken, { separator: '-' });
|
|
115
137
|
// split into theme categories
|
|
116
|
-
const theme = {};
|
|
138
|
+
const theme = { ...baseValues };
|
|
117
139
|
for (const rawKey in flatPrimitiveTokens) {
|
|
118
140
|
const token = flatPrimitiveTokens[rawKey];
|
|
119
|
-
const key = `_${
|
|
141
|
+
const key = `_${processKey(rawKey, extraWords)}`;
|
|
120
142
|
const themeCategory = token.purpose;
|
|
121
143
|
if (!theme[themeCategory]) {
|
|
122
144
|
theme[themeCategory] = {};
|
|
@@ -125,7 +147,7 @@ export function createTheme(arbor, breakpointConfig = defaultThemeConfig) {
|
|
|
125
147
|
}
|
|
126
148
|
for (const rawKey in flatModeTokens) {
|
|
127
149
|
const token = flatModeTokens[rawKey];
|
|
128
|
-
const key =
|
|
150
|
+
const key = processKey(rawKey, extraWords);
|
|
129
151
|
const themeCategory = token.purpose;
|
|
130
152
|
if (!theme[themeCategory]) {
|
|
131
153
|
theme[themeCategory] = {};
|
package/dist/theme/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/theme/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,OAAO,EAAS,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/theme/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themeOrLiteral.d.ts","sourceRoot":"","sources":["../../src/util/themeOrLiteral.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAI1C,wBAAgB,YAAY,CAC3B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,KAAK,EACZ,EACC,SAAS,EACT,WAAW,GACX,EAAE;IACF,SAAS,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,
|
|
1
|
+
{"version":3,"file":"themeOrLiteral.d.ts","sourceRoot":"","sources":["../../src/util/themeOrLiteral.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAI1C,wBAAgB,YAAY,CAC3B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,KAAK,EACZ,EACC,SAAS,EACT,WAAW,GACX,EAAE;IACF,SAAS,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,OAkBD;AAED,wBAAgB,cAAc,CAC7B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,KAAK,EACZ,EACC,SAAS,EACT,WAAW,GACX,EAAE;IACF,SAAS,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,GACC;IACF,MAAM,GAAG,SAAS;IAClB;QAAE,MAAM,EAAE,OAAO,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAA;KAAE;CACxD,CAeA"}
|
|
@@ -7,11 +7,22 @@ export function getFromTheme(value, theme, { startFrom, trySuffixes, }) {
|
|
|
7
7
|
const lookFor = dashConcat(startFrom, value, suffix);
|
|
8
8
|
const themeValue = getByConcatKey(theme, lookFor, '-');
|
|
9
9
|
if (themeValue) {
|
|
10
|
-
|
|
10
|
+
if (typeof themeValue === 'object' && !!themeValue) {
|
|
11
|
+
if ('' in themeValue) {
|
|
12
|
+
return themeValue[''];
|
|
13
|
+
}
|
|
14
|
+
if ('$root' in themeValue) {
|
|
15
|
+
return themeValue.$root;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
return themeValue;
|
|
20
|
+
}
|
|
11
21
|
}
|
|
12
22
|
}
|
|
13
23
|
}
|
|
14
24
|
export function themeOrLiteral(value, theme, { startFrom, trySuffixes, }) {
|
|
25
|
+
value ?? (value = '');
|
|
15
26
|
const bracketedValue = h.bracket.bracketOfColor(value);
|
|
16
27
|
if (bracketedValue) {
|
|
17
28
|
return [bracketedValue, { source: 'bracket' }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themeOrLiteral.js","sourceRoot":"","sources":["../../src/util/themeOrLiteral.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,MAAM,UAAU,YAAY,CAC3B,KAAa,EACb,KAAY,EACZ,EACC,SAAS,EACT,WAAW,GAIX;IAED,KAAK,MAAM,MAAM,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QACnD,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACvD,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"themeOrLiteral.js","sourceRoot":"","sources":["../../src/util/themeOrLiteral.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,MAAM,UAAU,YAAY,CAC3B,KAAa,EACb,KAAY,EACZ,EACC,SAAS,EACT,WAAW,GAIX;IAED,KAAK,MAAM,MAAM,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QACnD,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACvD,IAAI,UAAU,EAAE,CAAC;YAChB,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;gBACpD,IAAI,EAAE,IAAI,UAAU,EAAE,CAAC;oBACtB,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC;gBACvB,CAAC;gBACD,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;oBAC3B,OAAO,UAAU,CAAC,KAAK,CAAC;gBACzB,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,OAAO,UAAU,CAAC;YACnB,CAAC;QACF,CAAC;IACF,CAAC;AACF,CAAC;AAED,MAAM,UAAU,cAAc,CAC7B,KAAa,EACb,KAAY,EACZ,EACC,SAAS,EACT,WAAW,GAIX;IAKD,KAAK,KAAL,KAAK,GAAK,EAAE,EAAC;IACb,MAAM,cAAc,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,cAAc,EAAE,CAAC;QACpB,OAAO,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;QAC/D,OAAO,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;IACzE,IAAI,SAAS,EAAE,CAAC;QACf,OAAO,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"themeOrLiteral.test.d.ts","sourceRoot":"","sources":["../../src/util/themeOrLiteral.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { getFromTheme } from './themeOrLiteral.js';
|
|
3
|
+
describe('getFromTheme', () => {
|
|
4
|
+
it('handles empty string root keys', () => {
|
|
5
|
+
const theme = {
|
|
6
|
+
foo: {
|
|
7
|
+
'': 'root value',
|
|
8
|
+
},
|
|
9
|
+
};
|
|
10
|
+
const result = getFromTheme('foo', theme, { startFrom: 'foo' });
|
|
11
|
+
expect(result).toBe('root value');
|
|
12
|
+
});
|
|
13
|
+
});
|
|
14
|
+
//# sourceMappingURL=themeOrLiteral.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"themeOrLiteral.test.js","sourceRoot":"","sources":["../../src/util/themeOrLiteral.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACzC,MAAM,KAAK,GAAG;YACb,GAAG,EAAE;gBACJ,EAAE,EAAE,YAAY;aAChB;SACD,CAAC;QACF,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,KAAY,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arbor-css/classes",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.17",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@unocss/preset-mini": "^66.6.8",
|
|
30
30
|
"@unocss/rule-utils": "^66.6.8",
|
|
31
31
|
"unocss": "^66.6.8",
|
|
32
|
-
"@arbor-css/util": "0.0.
|
|
32
|
+
"@arbor-css/util": "0.0.17"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@base-ui/react": "^1.4.1",
|
|
@@ -43,10 +43,10 @@
|
|
|
43
43
|
"typescript": "^6.0.3",
|
|
44
44
|
"vite": "^8.0.10",
|
|
45
45
|
"vitest": "^4.1.5",
|
|
46
|
-
"@arbor-css/
|
|
47
|
-
"@arbor-css/
|
|
48
|
-
"@arbor-css/preset": "0.0.
|
|
49
|
-
"@arbor-css/
|
|
46
|
+
"@arbor-css/colors": "0.0.17",
|
|
47
|
+
"@arbor-css/globals": "0.0.17",
|
|
48
|
+
"@arbor-css/preset": "0.0.17",
|
|
49
|
+
"@arbor-css/core": "0.0.17"
|
|
50
50
|
},
|
|
51
51
|
"scripts": {
|
|
52
52
|
"build": "tsc",
|