@developer_tribe/react-builder 0.1.32 → 1.0.2

package/scripts/prebuild/utils/validateAllComponentsOrThrow.js

@@ -120,7 +120,13 @@ async function validatePatternJson(componentDir, componentName) {
   }
 
   // Helpers for validating custom types
-  const isPrimitive = t => t === 'string' || t === 'number' || t === 'boolean';
+  const isPrimitive = t =>
+    t === 'string' ||
+    t === 'number' ||
+    t === 'boolean' ||
+    t === 'color' ||
+    t === 'size';
+  const isNeverType = t => t === 'never';
   const hasCustomTypes = typeof data.types === 'object' && data.types != null;
   const isCustomType = t =>
     hasCustomTypes &&
@@ -140,14 +146,25 @@ async function validatePatternJson(componentDir, componentName) {
     return isCustomType(t);
   };
 
+  const isPlainObject = value =>
+    typeof value === 'object' && value != null && !Array.isArray(value);
+
+  const buildDefaultsBlock = source => ({
+    ...(isPlainObject(source?.pattern?.defaults)
+      ? source.pattern.defaults
+      : {}),
+    ...(isPlainObject(source?.defaults) ? source.defaults : {}),
+  });
+
   // Validate attributes accept primitive, enum array, or custom type refs (including X[])
   for (const [attrName, attrType] of Object.entries(pattern.attributes)) {
     const ok =
-      (typeof attrType === 'string' && isValidTypeRef(attrType)) ||
+      (typeof attrType === 'string' &&
+        (isNeverType(attrType) || isValidTypeRef(attrType))) ||
       isEnumArray(attrType);
     if (!ok) {
       return fail(
-        `[${componentName}] pattern.json -> 'pattern.attributes.${attrName}' must be 'string' | 'number' | 'boolean' | string[] | CustomType | CustomType[]`
+        `[${componentName}] pattern.json -> 'pattern.attributes.${attrName}' must be 'string' | 'number' | 'boolean' | 'color' | 'never' | string[] | CustomType | CustomType[]`
       );
     }
   }
@@ -167,7 +184,7 @@ async function validatePatternJson(componentDir, componentName) {
           isEnumArray(fieldType);
         if (!fieldOk) {
           return fail(
-            `[${componentName}] pattern.json -> 'types.${typeName}.${fieldName}' must be 'string' | 'number' | 'boolean' | string[] | CustomType | CustomType[]`
+            `[${componentName}] pattern.json -> 'types.${typeName}.${fieldName}' must be 'string' | 'number' | 'boolean' | 'color' | string[] | CustomType | CustomType[]`
           );
         }
       }
@@ -271,14 +288,27 @@ async function validatePatternJson(componentDir, componentName) {
 
     const mergedTypes = { ...(parentData.types || {}), ...(data.types || {}) };
     const mergedDefaults = {
-      ...(parentData.defaults || {}),
-      ...(data.defaults || {}),
+      ...buildDefaultsBlock(parentData),
+      ...buildDefaultsBlock(data),
     };
     const mergedAllowUnknown =
       typeof data.allowUnknownAttributes === 'boolean'
         ? data.allowUnknownAttributes
         : parentData.allowUnknownAttributes;
 
+    const mergedMetaAttributes = {
+      ...(parentData?.meta?.attributes || {}),
+      ...(data?.meta?.attributes || {}),
+    };
+    const mergedMeta =
+      parentData.meta || data.meta
+        ? {
+            ...(parentData.meta || {}),
+            ...(data.meta || {}),
+            attributes: mergedMetaAttributes,
+          }
+        : undefined;
+
     const mergedPattern = {
       ...parentData.pattern,
       ...data.pattern,
@@ -294,10 +324,19 @@ async function validatePatternJson(componentDir, componentName) {
       allowUnknownAttributes: mergedAllowUnknown,
       types: mergedTypes,
       defaults: mergedDefaults,
+      meta: mergedMeta,
       pattern: mergedPattern,
     };
   }
 
+  const resolvedDefaults = buildDefaultsBlock(data);
+  if (Object.keys(resolvedDefaults).length > 0) {
+    data = {
+      ...data,
+      defaults: resolvedDefaults,
+    };
+  }
+
   return data;
 }
 

package/scripts/prebuild/utils/validatePatternJson.js

@@ -60,15 +60,23 @@ export async function validatePatternJson(componentDir, componentName) {
     );
   }
 
+  const isPrimitiveType = value =>
+    value === 'string' ||
+    value === 'number' ||
+    value === 'boolean' ||
+    value === 'color' ||
+    value === 'size';
+
   for (const [attrName, attrType] of Object.entries(pattern.attributes)) {
     const isValidType =
-      typeof attrType === 'string' &&
-      (attrType === 'string' || attrType === 'number' || attrType === 'boolean')
-        ? true
-        : Array.isArray(attrType) && attrType.every(v => typeof v === 'string');
+      (typeof attrType === 'string' && isPrimitiveType(attrType)) ||
+      (typeof attrType === 'string' &&
+        attrType.endsWith('[]') &&
+        isPrimitiveType(attrType.slice(0, -2))) ||
+      (Array.isArray(attrType) && attrType.every(v => typeof v === 'string'));
     if (!isValidType) {
       return fail(
-        `[${componentName}] pattern.json -> 'pattern.attributes.${attrName}' must be 'string' | 'number' | 'boolean' | string[]`
+        `[${componentName}] pattern.json -> 'pattern.attributes.${attrName}' must be 'string' | 'number' | 'boolean' | 'color' | string[]`
       );
     }
   }