@tamagui/theme-builder 1.89.28 → 1.89.30
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/cjs/ThemeBuilder.js +2 -1
- package/dist/cjs/ThemeBuilder.js.map +1 -1
- package/dist/cjs/ThemeBuilder.native.js +42 -13
- package/dist/cjs/ThemeBuilder.native.js.map +1 -1
- package/dist/esm/ThemeBuilder.js +2 -1
- package/dist/esm/ThemeBuilder.js.map +1 -1
- package/dist/esm/ThemeBuilder.mjs +3 -1
- package/dist/esm/ThemeBuilder.native.js +42 -13
- package/dist/esm/ThemeBuilder.native.js.map +1 -1
- package/package.json +3 -3
- package/src/ThemeBuilder.ts +5 -1
- package/types/ThemeBuilder.d.ts.map +1 -1
package/dist/cjs/ThemeBuilder.js
CHANGED
|
@@ -119,7 +119,8 @@ class ThemeBuilder {
|
|
|
119
119
|
Potential: (${Object.keys(this.state.palettes).join(", ")})` : "";
|
|
120
120
|
throw new Error(`No palette for theme${msg}`);
|
|
121
121
|
}
|
|
122
|
-
const template = this.state.templates?.[templateName]
|
|
122
|
+
const template = this.state.templates?.[templateName] ?? // fall back to finding the scheme specific on if it exists
|
|
123
|
+
this.state.templates?.[`${nameParts[0]}_${templateName}`];
|
|
123
124
|
if (!template)
|
|
124
125
|
throw new Error(`No template for theme ${themeName}: ${templateName}`);
|
|
125
126
|
out[themeName] = (0, import_create_theme.createThemeWithPalettes)(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/ThemeBuilder.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["mask"]
|
|
6
6
|
}
|
|
@@ -127,25 +127,40 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
127
127
|
{
|
|
128
128
|
key: "addPalettes",
|
|
129
129
|
value: function(palettes) {
|
|
130
|
-
return this.state.palettes = _object_spread(
|
|
130
|
+
return this.state.palettes = _object_spread(
|
|
131
|
+
{},
|
|
132
|
+
// as {} prevents generic string key merge messing up types
|
|
133
|
+
this.state.palettes,
|
|
134
|
+
palettes
|
|
135
|
+
), this;
|
|
131
136
|
}
|
|
132
137
|
},
|
|
133
138
|
{
|
|
134
139
|
key: "addTemplates",
|
|
135
140
|
value: function(templates) {
|
|
136
|
-
return this.state.templates = _object_spread(
|
|
141
|
+
return this.state.templates = _object_spread(
|
|
142
|
+
{},
|
|
143
|
+
// as {} prevents generic string key merge messing up types
|
|
144
|
+
this.state.templates,
|
|
145
|
+
templates
|
|
146
|
+
), this;
|
|
137
147
|
}
|
|
138
148
|
},
|
|
139
149
|
{
|
|
140
150
|
key: "addMasks",
|
|
141
151
|
value: function(masks) {
|
|
142
|
-
return this.state.masks = _object_spread(
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
152
|
+
return this.state.masks = _object_spread(
|
|
153
|
+
{},
|
|
154
|
+
// as {} prevents generic string key merge messing up types
|
|
155
|
+
this.state.masks,
|
|
156
|
+
(0, import_create_theme.objectFromEntries)((0, import_create_theme.objectEntries)(masks).map(function(param) {
|
|
157
|
+
var _param = _sliced_to_array(param, 2), key = _param[0], val = _param[1];
|
|
158
|
+
return [
|
|
159
|
+
key,
|
|
160
|
+
(0, import_create_theme.createMask)(val)
|
|
161
|
+
];
|
|
162
|
+
}))
|
|
163
|
+
), this;
|
|
149
164
|
}
|
|
150
165
|
},
|
|
151
166
|
{
|
|
@@ -156,10 +171,19 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
156
171
|
args: [
|
|
157
172
|
themes
|
|
158
173
|
]
|
|
159
|
-
}), this.state.themes = _object_spread(
|
|
174
|
+
}), this.state.themes = _object_spread(
|
|
175
|
+
{},
|
|
176
|
+
// as {} prevents generic string key merge messing up types
|
|
177
|
+
this.state.themes,
|
|
178
|
+
themes
|
|
179
|
+
), this;
|
|
160
180
|
}
|
|
161
181
|
},
|
|
162
182
|
{
|
|
183
|
+
// lets infer template themes directly onto here to avoid some type nesting issues later one
|
|
184
|
+
// themes: {
|
|
185
|
+
// [Key in keyof T]: TemplateToTheme<T[Key]>
|
|
186
|
+
// } & State['themes']
|
|
163
187
|
// these wont be typed to save some complexity and because they don't need to be typed!
|
|
164
188
|
key: "addComponentThemes",
|
|
165
189
|
value: function(childThemeDefinition, options) {
|
|
@@ -197,7 +221,12 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
197
221
|
definition
|
|
198
222
|
];
|
|
199
223
|
}).filter(Boolean);
|
|
200
|
-
}), childThemes = Object.fromEntries(namesWithDefinitions), next = _object_spread(
|
|
224
|
+
}), childThemes = Object.fromEntries(namesWithDefinitions), next = _object_spread(
|
|
225
|
+
{},
|
|
226
|
+
// as {} prevents generic string key merge messing up types
|
|
227
|
+
this.state.themes,
|
|
228
|
+
childThemes
|
|
229
|
+
);
|
|
201
230
|
return this.state.themes = next, this;
|
|
202
231
|
}
|
|
203
232
|
},
|
|
@@ -225,7 +254,7 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
225
254
|
mask: themeDefinition
|
|
226
255
|
});
|
|
227
256
|
else {
|
|
228
|
-
var _this_state_templates, tmp = themeDefinition.palette, paletteName = tmp === void 0 ? "" : tmp, templateName = themeDefinition.template, options2 = _object_without_properties(themeDefinition, [
|
|
257
|
+
var _this_state_templates, _this_state_templates1, tmp = themeDefinition.palette, paletteName = tmp === void 0 ? "" : tmp, templateName = themeDefinition.template, options2 = _object_without_properties(themeDefinition, [
|
|
229
258
|
"palette",
|
|
230
259
|
"template"
|
|
231
260
|
]), parentDefinition = _this.state.themes[parentName2];
|
|
@@ -240,7 +269,7 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
240
269
|
Potential: (`).concat(Object.keys(_this.state.palettes).join(", "), ")") : "";
|
|
241
270
|
throw new Error("No palette for theme".concat(msg));
|
|
242
271
|
}
|
|
243
|
-
var template = (_this_state_templates = _this.state.templates) === null || _this_state_templates === void 0 ? void 0 : _this_state_templates[templateName];
|
|
272
|
+
var _this_state_templates_templateName, template = (_this_state_templates_templateName = (_this_state_templates = _this.state.templates) === null || _this_state_templates === void 0 ? void 0 : _this_state_templates[templateName]) !== null && _this_state_templates_templateName !== void 0 ? _this_state_templates_templateName : (_this_state_templates1 = _this.state.templates) === null || _this_state_templates1 === void 0 ? void 0 : _this_state_templates1["".concat(nameParts[0], "_").concat(templateName)];
|
|
244
273
|
if (!template)
|
|
245
274
|
throw new Error("No template for theme ".concat(themeName2, ": ").concat(templateName));
|
|
246
275
|
out[themeName2] = (0, import_create_theme.createThemeWithPalettes)(_this.state.palettes, paletteName, template, options2, themeName2, !0);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/tamagui/packages/theme-builder/src/ThemeBuilder.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;AAOA,0BAMO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDA,IAAMA,eAAN,2BAAA;;WAAMA,cAGQC,OAAY;4BAHpBD,aAAAA,4CA+CXE,iBAAAA,MAAAA,gBAAAA,MAAAA,QA5CmBD,QAAAA,YA4CnBC,eAAgE,CAAA;;uBA/CrDF,eAAAA;;MAKXG,KAAAA;aAAAA,SAAgDC,UAAW;AACzD,oBAAKH,MAAMG,WAAW,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["ThemeBuilder", "state", "_addedThemes", "addPalettes", "palettes", "addTemplates", "templates", "addMasks", "masks", "objectFromEntries", "objectEntries", "map", "key", "val", "createMask", "addThemes", "themes", "push", "type", "args", "addComponentThemes", "childThemeDefinition", "options", "addChildThemes", "currentThemes", "Error", "currentThemeNames", "Object", "keys", "incomingThemeNames", "namesWithDefinitions", "flatMap", "prefix", "avoidNestingWithin", "some", "avoidName", "startsWith", "endsWith", "subName", "fullName", "definition", "avoidNest", "name", "filter", "Boolean", "childThemes", "fromEntries", "next", "build", "themeName", "nameParts", "split", "parentName", "slice", "length", "join", "definitions", "themeDefinition", "Array", "isArray", "found", "find", "d", "parent", "out", "theme", "maskedThemes", "mask", "paletteName", "palette", "templateName", "template", "parentDefinition", "attemptParentName", "msg", "process", "env", "NODE_ENV", "JSON", "stringify", "createThemeWithPalettes", "maskName", "maskFunction", "parentTheme", "childOptions", "childOpts", "assign", "applyMask", "createThemeBuilder"]
|
|
6
6
|
}
|
package/dist/esm/ThemeBuilder.js
CHANGED
|
@@ -105,7 +105,8 @@ class ThemeBuilder {
|
|
|
105
105
|
Potential: (${Object.keys(this.state.palettes).join(", ")})` : "";
|
|
106
106
|
throw new Error(`No palette for theme${msg}`);
|
|
107
107
|
}
|
|
108
|
-
const template = this.state.templates?.[templateName]
|
|
108
|
+
const template = this.state.templates?.[templateName] ?? // fall back to finding the scheme specific on if it exists
|
|
109
|
+
this.state.templates?.[`${nameParts[0]}_${templateName}`];
|
|
109
110
|
if (!template)
|
|
110
111
|
throw new Error(`No template for theme ${themeName}: ${templateName}`);
|
|
111
112
|
out[themeName] = createThemeWithPalettes(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/ThemeBuilder.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["mask"]
|
|
6
6
|
}
|
|
@@ -101,7 +101,9 @@ class ThemeBuilder {
|
|
|
101
101
|
Potential: (${Object.keys(this.state.palettes).join(", ")})` : "";
|
|
102
102
|
throw new Error(`No palette for theme${msg}`);
|
|
103
103
|
}
|
|
104
|
-
const template = this.state.templates?.[templateName]
|
|
104
|
+
const template = this.state.templates?.[templateName] ??
|
|
105
|
+
// fall back to finding the scheme specific on if it exists
|
|
106
|
+
this.state.templates?.[`${nameParts[0]}_${templateName}`];
|
|
105
107
|
if (!template) throw new Error(`No template for theme ${themeName}: ${templateName}`);
|
|
106
108
|
out[themeName] = createThemeWithPalettes(this.state.palettes, paletteName, template, options, themeName, !0);
|
|
107
109
|
}
|
|
@@ -106,25 +106,40 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
106
106
|
{
|
|
107
107
|
key: "addPalettes",
|
|
108
108
|
value: function(palettes) {
|
|
109
|
-
return this.state.palettes = _object_spread(
|
|
109
|
+
return this.state.palettes = _object_spread(
|
|
110
|
+
{},
|
|
111
|
+
// as {} prevents generic string key merge messing up types
|
|
112
|
+
this.state.palettes,
|
|
113
|
+
palettes
|
|
114
|
+
), this;
|
|
110
115
|
}
|
|
111
116
|
},
|
|
112
117
|
{
|
|
113
118
|
key: "addTemplates",
|
|
114
119
|
value: function(templates) {
|
|
115
|
-
return this.state.templates = _object_spread(
|
|
120
|
+
return this.state.templates = _object_spread(
|
|
121
|
+
{},
|
|
122
|
+
// as {} prevents generic string key merge messing up types
|
|
123
|
+
this.state.templates,
|
|
124
|
+
templates
|
|
125
|
+
), this;
|
|
116
126
|
}
|
|
117
127
|
},
|
|
118
128
|
{
|
|
119
129
|
key: "addMasks",
|
|
120
130
|
value: function(masks) {
|
|
121
|
-
return this.state.masks = _object_spread(
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
131
|
+
return this.state.masks = _object_spread(
|
|
132
|
+
{},
|
|
133
|
+
// as {} prevents generic string key merge messing up types
|
|
134
|
+
this.state.masks,
|
|
135
|
+
objectFromEntries(objectEntries(masks).map(function(param) {
|
|
136
|
+
var _param = _sliced_to_array(param, 2), key = _param[0], val = _param[1];
|
|
137
|
+
return [
|
|
138
|
+
key,
|
|
139
|
+
createMask(val)
|
|
140
|
+
];
|
|
141
|
+
}))
|
|
142
|
+
), this;
|
|
128
143
|
}
|
|
129
144
|
},
|
|
130
145
|
{
|
|
@@ -135,10 +150,19 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
135
150
|
args: [
|
|
136
151
|
themes
|
|
137
152
|
]
|
|
138
|
-
}), this.state.themes = _object_spread(
|
|
153
|
+
}), this.state.themes = _object_spread(
|
|
154
|
+
{},
|
|
155
|
+
// as {} prevents generic string key merge messing up types
|
|
156
|
+
this.state.themes,
|
|
157
|
+
themes
|
|
158
|
+
), this;
|
|
139
159
|
}
|
|
140
160
|
},
|
|
141
161
|
{
|
|
162
|
+
// lets infer template themes directly onto here to avoid some type nesting issues later one
|
|
163
|
+
// themes: {
|
|
164
|
+
// [Key in keyof T]: TemplateToTheme<T[Key]>
|
|
165
|
+
// } & State['themes']
|
|
142
166
|
// these wont be typed to save some complexity and because they don't need to be typed!
|
|
143
167
|
key: "addComponentThemes",
|
|
144
168
|
value: function(childThemeDefinition, options) {
|
|
@@ -176,7 +200,12 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
176
200
|
definition
|
|
177
201
|
];
|
|
178
202
|
}).filter(Boolean);
|
|
179
|
-
}), childThemes = Object.fromEntries(namesWithDefinitions), next = _object_spread(
|
|
203
|
+
}), childThemes = Object.fromEntries(namesWithDefinitions), next = _object_spread(
|
|
204
|
+
{},
|
|
205
|
+
// as {} prevents generic string key merge messing up types
|
|
206
|
+
this.state.themes,
|
|
207
|
+
childThemes
|
|
208
|
+
);
|
|
180
209
|
return this.state.themes = next, this;
|
|
181
210
|
}
|
|
182
211
|
},
|
|
@@ -204,7 +233,7 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
204
233
|
mask: themeDefinition
|
|
205
234
|
});
|
|
206
235
|
else {
|
|
207
|
-
var _this_state_templates, tmp = themeDefinition.palette, paletteName = tmp === void 0 ? "" : tmp, templateName = themeDefinition.template, options2 = _object_without_properties(themeDefinition, [
|
|
236
|
+
var _this_state_templates, _this_state_templates1, tmp = themeDefinition.palette, paletteName = tmp === void 0 ? "" : tmp, templateName = themeDefinition.template, options2 = _object_without_properties(themeDefinition, [
|
|
208
237
|
"palette",
|
|
209
238
|
"template"
|
|
210
239
|
]), parentDefinition = _this.state.themes[parentName2];
|
|
@@ -219,7 +248,7 @@ var ThemeBuilder = /* @__PURE__ */ function() {
|
|
|
219
248
|
Potential: (`).concat(Object.keys(_this.state.palettes).join(", "), ")") : "";
|
|
220
249
|
throw new Error("No palette for theme".concat(msg));
|
|
221
250
|
}
|
|
222
|
-
var template = (_this_state_templates = _this.state.templates) === null || _this_state_templates === void 0 ? void 0 : _this_state_templates[templateName];
|
|
251
|
+
var _this_state_templates_templateName, template = (_this_state_templates_templateName = (_this_state_templates = _this.state.templates) === null || _this_state_templates === void 0 ? void 0 : _this_state_templates[templateName]) !== null && _this_state_templates_templateName !== void 0 ? _this_state_templates_templateName : (_this_state_templates1 = _this.state.templates) === null || _this_state_templates1 === void 0 ? void 0 : _this_state_templates1["".concat(nameParts[0], "_").concat(templateName)];
|
|
223
252
|
if (!template)
|
|
224
253
|
throw new Error("No template for theme ".concat(themeName2, ": ").concat(templateName));
|
|
225
254
|
out[themeName2] = createThemeWithPalettes(_this.state.palettes, paletteName, template, options2, themeName2, !0);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/tamagui/packages/theme-builder/src/ThemeBuilder.ts"],
|
|
4
|
-
"mappings": "AAOA,SACEA,WACAC,YACAC,yBACAC,eACAC,yBACK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDA,IAAMC,eAAN,2BAAA;;WAAMA,cAGQC,OAAY;4BAHpBD,aAAAA,4CA+CXE,iBAAAA,MAAAA,gBAAAA,MAAAA,QA5CmBD,QAAAA,YA4CnBC,eAAgE,CAAA;;uBA/CrDF,eAAAA;;MAKXG,KAAAA;aAAAA,SAAgDC,UAAW;AACzD,oBAAKH,MAAMG,WAAW,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["applyMask", "createMask", "createThemeWithPalettes", "objectEntries", "objectFromEntries", "ThemeBuilder", "state", "_addedThemes", "addPalettes", "palettes", "addTemplates", "templates", "addMasks", "masks", "map", "key", "val", "addThemes", "themes", "push", "type", "args", "addComponentThemes", "childThemeDefinition", "options", "addChildThemes", "currentThemes", "Error", "currentThemeNames", "Object", "keys", "incomingThemeNames", "namesWithDefinitions", "flatMap", "prefix", "avoidNestingWithin", "some", "avoidName", "startsWith", "endsWith", "subName", "fullName", "definition", "avoidNest", "name", "filter", "Boolean", "childThemes", "fromEntries", "next", "build", "themeName", "nameParts", "split", "parentName", "slice", "length", "join", "definitions", "themeDefinition", "Array", "isArray", "found", "find", "d", "parent", "out", "theme", "maskedThemes", "mask", "paletteName", "palette", "templateName", "template", "parentDefinition", "attemptParentName", "msg", "process", "env", "NODE_ENV", "JSON", "stringify", "maskName", "maskFunction", "parentTheme", "childOptions", "childOpts", "assign", "createThemeBuilder"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/theme-builder",
|
|
3
|
-
"version": "1.89.
|
|
3
|
+
"version": "1.89.30",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"types": "./types/index.d.ts",
|
|
6
6
|
"main": "dist/cjs",
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@tamagui/create-theme": "1.89.
|
|
31
|
+
"@tamagui/create-theme": "1.89.30",
|
|
32
32
|
"color2k": "^2.0.2"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@tamagui/build": "1.89.
|
|
35
|
+
"@tamagui/build": "1.89.30"
|
|
36
36
|
},
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
package/src/ThemeBuilder.ts
CHANGED
|
@@ -320,7 +320,11 @@ export class ThemeBuilder<
|
|
|
320
320
|
throw new Error(`No palette for theme${msg}`)
|
|
321
321
|
}
|
|
322
322
|
|
|
323
|
-
const template =
|
|
323
|
+
const template =
|
|
324
|
+
this.state.templates?.[templateName] ??
|
|
325
|
+
// fall back to finding the scheme specific on if it exists
|
|
326
|
+
this.state.templates?.[`${nameParts[0]}_${templateName}`]
|
|
327
|
+
|
|
324
328
|
if (!template) {
|
|
325
329
|
throw new Error(`No template for theme ${themeName}: ${templateName}`)
|
|
326
330
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThemeBuilder.d.ts","sourceRoot":"","sources":["../src/ThemeBuilder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ThemeBuilder.d.ts","sourceRoot":"","sources":["../src/ThemeBuilder.ts"],"names":[],"mappings":"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"}
|