@blocklet/pages-kit-block-studio 0.4.98 → 0.4.99

package/lib/esm/utils/generate-wrapper-code.js

@@ -462,88 +462,18 @@ export function generatePropertiesTypesWithZod(properties) {
     const typeString = zodSchemaToTypeString(zodSchema, 'Props');
     return typeString;
 }
-/**
- * 将 Zod schema 序列化为 JSON 描述结构
- */
-export function serializeZodSchema(schema) {
-    // 处理不同类型的 schema
-    if (schema instanceof z.ZodObject) {
-        const shape = schema._def.shape();
-        const properties = {};
-        Object.entries(shape).forEach(([key, value]) => {
-            properties[key] = serializeZodSchema(value);
-        });
-        return {
-            type: 'object',
-            properties,
-            description: schema.description,
-        };
-    }
-    if (schema instanceof z.ZodString) {
-        return {
-            type: 'string',
-            description: schema.description,
-            optional: schema.isOptional(),
-        };
-    }
-    if (schema instanceof z.ZodNumber) {
-        return {
-            type: 'number',
-            description: schema.description,
-            optional: schema.isOptional(),
-        };
-    }
-    if (schema instanceof z.ZodBoolean) {
-        return {
-            type: 'boolean',
-            description: schema.description,
-            optional: schema.isOptional(),
-        };
-    }
-    if (schema instanceof z.ZodArray) {
-        return {
-            type: 'array',
-            items: serializeZodSchema(schema._def.type),
-            description: schema.description,
-            optional: schema.isOptional(),
-        };
-    }
-    if (schema instanceof z.ZodRecord) {
-        return {
-            type: 'record',
-            valueType: serializeZodSchema(schema._def.valueType),
-            description: schema.description,
-            optional: schema.isOptional(),
-        };
-    }
-    if (schema instanceof z.ZodOptional) {
-        const innerType = serializeZodSchema(schema._def.innerType);
-        innerType.optional = true;
-        return innerType;
-    }
-    if (schema instanceof z.ZodAny) {
-        return {
-            type: 'any',
-            description: schema.description,
-            optional: schema.isOptional(),
-        };
-    }
-    // 默认情况
-    return {
-        type: 'unknown',
-        description: schema.description,
-    };
-}
 /**
  * 生成特定页面所有 section 数据的 Zod 类型定义
+ * Agent 使用，内部不能包含 any 类型
  * @param state 应用状态
  * @param pageId 目标页面ID
  * @returns 包含所有 section 数据类型的 Zod schema 的序列化描述
  */
-export function generatePageSectionsDataZod(state, pageId) {
+export function generatePageSectionsDataZodToAgent(state, pageId) {
     const page = state.pages[pageId];
     if (!page) {
-        return serializeZodSchema(z.object({}).describe('Empty page data'));
+        // empty page data
+        return null;
     }
     const sectionSchemas = {};
     // 收集页面所有section的配置信息
@@ -583,15 +513,6 @@ export function generatePageSectionsDataZod(state, pageId) {
                 else if (value.type === 'boolean') {
                     acc[key] = z.boolean().optional();
                 }
-                else if (value.type === 'array') {
-                    acc[key] = z.array(z.any()).optional();
-                }
-                else if (value.type === 'object') {
-                    acc[key] = z.record(z.string(), z.any()).optional();
-                }
-                else {
-                    acc[key] = z.any().optional();
-                }
                 return acc;
             }, {});
             sectionSchemas[sectionName] = z.object(zodProperties).describe(section.templateDescription || '');
@@ -601,8 +522,6 @@ export function generatePageSectionsDataZod(state, pageId) {
             sectionSchemas[sectionName] = z.object({}).describe(section.templateDescription || '');
         }
     });
-    // FIXME: 这里需要优化，AIGNE Framework 校验修改后，不需要序列化，直接使用
-    // 创建包含所有section的schema并序列化返回
-    return serializeZodSchema(z.object(sectionSchemas).describe(`Page ${page.title || pageId} sections data`));
+    return z.object(sectionSchemas).describe(`Page ${page.title || pageId} sections data`);
 }
 export default generateWrapperCode;

package/lib/esm/utils/zod-utils.js

@@ -60,39 +60,66 @@ export const PROPERTIES_TYPE_SCHEMA = {
             width: z.number().optional(),
             height: z.number().optional(),
         }),
-        json: (properties, { addZodDescribe, propLLMConfig }) => {
+        json: (properties, { skipAnyType, addZodDescribe, propLLMConfig, }) => {
             const { subProperties } = properties;
             if (subProperties && Object.keys(subProperties)?.length > 0) {
                 // 递归处理子属性
-                return propertiesToZodSchema(subProperties, { addZodDescribe, llmConfig: propLLMConfig?.subProperties });
+                return propertiesToZodSchema(subProperties, {
+                    skipAnyType,
+                    addZodDescribe,
+                    llmConfig: propLLMConfig?.subProperties,
+                });
             }
             return z.object({});
         },
-        yaml: (properties, { addZodDescribe, propLLMConfig }) => {
+        yaml: (properties, { skipAnyType, addZodDescribe, propLLMConfig, }) => {
             const { subProperties } = properties;
             if (subProperties && Object.keys(subProperties)?.length > 0) {
                 // 使用联合类型：字符串或结构化对象
-                return propertiesToZodSchema(subProperties, { addZodDescribe, llmConfig: propLLMConfig?.subProperties });
+                return propertiesToZodSchema(subProperties, {
+                    skipAnyType,
+                    addZodDescribe,
+                    llmConfig: propLLMConfig?.subProperties,
+                });
             }
             return z.object({});
         },
-        array: (properties, { addZodDescribe, propLLMConfig }) => {
+        array: (properties, { skipAnyType, addZodDescribe, propLLMConfig, }) => {
             const { subProperties } = properties;
             if (subProperties && Object.keys(subProperties)?.length > 0) {
                 // 递归处理子属性
-                return z.array(propertiesToZodSchema(subProperties, { addZodDescribe, llmConfig: propLLMConfig?.subProperties }));
+                return z.array(propertiesToZodSchema(subProperties, {
+                    skipAnyType,
+                    addZodDescribe,
+                    llmConfig: propLLMConfig?.subProperties,
+                }));
+            }
+            if (skipAnyType) {
+                return null;
             }
             return z.array(z.any());
         },
-        component: () => z.any(),
-        custom: () => z.any(),
+        component: ({ skipAnyType }) => {
+            if (skipAnyType) {
+                return null;
+            }
+            return z.any();
+        },
+        custom: ({ skipAnyType }) => {
+            if (skipAnyType) {
+                return null;
+            }
+            return z.any();
+        },
         default: () => z.string(),
     },
 };
 /**
  * 从 Properties 对象创建 Zod schema
  */
-export function propertiesToZodSchema(properties, { addZodDescribe = false, 
+export function propertiesToZodSchema(properties, { 
+// 是否跳过 any 类型
+skipAnyType = false, addZodDescribe = false, 
 // 这个目前来说都是可选的，避免用户在使用的过程中疯狂报错，并且目前 setting 中没有必填标识符
 isOptional = true, llmConfig, } = {}) {
     const schemaObj = {};
@@ -111,7 +138,15 @@ isOptional = true, llmConfig, } = {}) {
         const getSchemaFn = (propType in PROPERTIES_TYPE_SCHEMA.propertyToZod
             ? PROPERTIES_TYPE_SCHEMA.propertyToZod[propType]
             : PROPERTIES_TYPE_SCHEMA.propertyToZod.default);
-        schemaObj[propKey] = getSchemaFn(prop.data, { addZodDescribe, propLLMConfig });
+        const schema = getSchemaFn(prop.data, {
+            skipAnyType,
+            addZodDescribe,
+            propLLMConfig,
+        });
+        if (!schema) {
+            return;
+        }
+        schemaObj[propKey] = schema;
         if (isOptional) {
             schemaObj[propKey] = schemaObj[propKey].optional();
         }