@betty-blocks/cli 25.38.2 → 25.38.3
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.
|
@@ -142,6 +142,14 @@ const componentSchema = (componentStyleMap, styleType, prefabType) => {
|
|
|
142
142
|
})),
|
|
143
143
|
});
|
|
144
144
|
};
|
|
145
|
+
const findCategoryMemberDuplicates = (optionCategories, componentType) => {
|
|
146
|
+
const memberKeys = optionCategories.reduce((acc, { members }) => {
|
|
147
|
+
return [...acc, ...members];
|
|
148
|
+
}, []);
|
|
149
|
+
if (memberKeys.length !== new Set(memberKeys).size) {
|
|
150
|
+
throw new Error(chalk_1.default.red(`\nBuild error in component ${componentType}: optionCategory members are required to be unique \n`));
|
|
151
|
+
}
|
|
152
|
+
};
|
|
145
153
|
exports.validateComponent = (componentStyleMap, prefabType) => (component) => {
|
|
146
154
|
if (component.type === 'PARTIAL') {
|
|
147
155
|
if (prefabType === 'partial') {
|
|
@@ -156,18 +164,22 @@ exports.validateComponent = (componentStyleMap, prefabType) => (component) => {
|
|
|
156
164
|
}
|
|
157
165
|
else if (component.type === 'WRAPPER') {
|
|
158
166
|
const { error } = wrapperSchema(componentStyleMap, prefabType).validate(component);
|
|
167
|
+
const { optionCategories = [], options } = component;
|
|
168
|
+
validation_1.findDuplicates(options, 'option key', 'key');
|
|
169
|
+
findCategoryMemberDuplicates(optionCategories, 'WRAPPER');
|
|
159
170
|
if (typeof error !== 'undefined') {
|
|
160
171
|
const { message } = error;
|
|
161
172
|
throw new Error(chalk_1.default.red(`\nBuild error in component WRAPPER: ${message}\n`));
|
|
162
173
|
}
|
|
163
174
|
}
|
|
164
175
|
else {
|
|
165
|
-
const { name, options } = component;
|
|
176
|
+
const { name, optionCategories = [], options, type } = component;
|
|
166
177
|
const styleType = componentStyleMap &&
|
|
167
178
|
componentStyleMap[name] &&
|
|
168
179
|
componentStyleMap[name].styleType;
|
|
169
180
|
const { error } = componentSchema(componentStyleMap, styleType, prefabType).validate(component);
|
|
170
181
|
validation_1.findDuplicates(options, 'option key', 'key');
|
|
182
|
+
findCategoryMemberDuplicates(optionCategories, 'component');
|
|
171
183
|
if (typeof error !== 'undefined') {
|
|
172
184
|
const { message } = error;
|
|
173
185
|
throw new Error(chalk_1.default.red(`\nBuild error in component ${name}: ${message}\n`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/validations/prefab/component.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,4DAA4D;;;;;AAE5D,kDAA0B;AAC1B,8CAAsB;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/validations/prefab/component.ts"],"names":[],"mappings":"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"}
|