@blocklet/pages-kit-block-studio 0.4.65 → 0.4.66

package/lib/cjs/constants/new-block-template/index.tsx

@@ -1,14 +1,23 @@
 import React from 'react';
 
-export interface HelloWorldProps {
+export interface BlockProps {
+  /** @description id: gs1rn5jmxfvpxptx | type: string | visible: true */
   title?: string;
-  logo?: string | { url: string };
+  /** @description id: 9ajrz12ik7esfk1z | type: string | visible: true */
   description?: string;
+  /** @description id: 3ckcfvf6b7zyskk8 | type: url | visible: true */
+  logo?: {
+    url: string;
+    mediaKitUrl?: string;
+    width?: number;
+    height?: number;
+  };
+  /** @description id: x3lqht8ikble1itx | type: string | visible: false */
   copyright?: string;
 }
 
 // default export
-export default function HelloWorld({ title = 'Hello World', logo, description, copyright }: HelloWorldProps) {
+export default function HelloWorld({ title = 'Hello World', logo, description, copyright }: BlockProps) {
   return (
     <div
       style={{
@@ -52,7 +61,7 @@ export default function HelloWorld({ title = 'Hello World', logo, description, c
 }
 
 // export edit component
-export const EditComponent: React.FC<HelloWorldProps & { onChange?: (value: HelloWorldProps) => void }> = ({
+export const EditComponent: React.FC<BlockProps & { onChange?: (value: BlockProps) => void }> = ({
   onChange,
   ...props
 }) => {

package/lib/cjs/middlewares/init-block-studio-router.js

@@ -1,17 +1,83 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initBlockStudioRouter = void 0;
+/* eslint-disable */
 const express_1 = require("express");
 const fs_1 = __importDefault(require("fs"));
 const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
+const ts = __importStar(require("typescript"));
 const constants_1 = require("../constants");
+// 导入Zod相关工具
+const block_props_utils_1 = require("../utils/block-props-utils");
 const helper_1 = require("../utils/helper");
+const zod_utils_1 = require("../utils/zod-utils");
 exports.initBlockStudioRouter = (0, express_1.Router)();
 const BINARY_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.ico', '.svg'];
+// 共享的请求验证和文件路径处理
+const validateRequest = (req, res) => {
+    if (!helper_1.isDev) {
+        return { error: res.status(403).json({ error: 'Only available in development mode' }) };
+    }
+    const { componentPath } = req.body;
+    if (!componentPath) {
+        return { error: res.status(400).json({ error: 'Component path is required' }) };
+    }
+    if (!(0, helper_1.isPathSafe)(componentPath)) {
+        return { error: res.status(403).json({ error: 'Invalid component path' }) };
+    }
+    return { componentPath };
+};
+// 解析组件源文件
+const parseComponentFile = (componentPath) => {
+    // 读取组件文件内容
+    const code = fs_1.default.readFileSync(componentPath, 'utf-8');
+    const sourceFile = ts.createSourceFile(componentPath, code, ts.ScriptTarget.Latest, true);
+    const metadataPath = path_1.default.join(path_1.default.dirname(componentPath), constants_1.METADATA_FILE_NAME);
+    const currentMetadata = (0, helper_1.initializeMetadata)(metadataPath);
+    return {
+        code,
+        sourceFile,
+        metadataPath,
+        currentMetadata,
+    };
+};
 exports.initBlockStudioRouter.get('/', async (req, res) => {
     if (!helper_1.isDev) {
         return res.status(403).json({ error: 'Only available in development mode' });
@@ -154,4 +220,132 @@ exports.initBlockStudioRouter.get('/all', async (req, res) => {
     }
     return res.json((0, lodash_1.keyBy)(allBlocksWithCode, 'id'));
 });
+// 统一的属性到接口转换端点 - 可以预览或生成
+exports.initBlockStudioRouter.post('/properties-to-interface', async (req, res) => {
+    const write = req.body.write === true;
+    const validation = validateRequest(req, res);
+    if (validation.error)
+        return validation.error;
+    const { componentPath } = validation;
+    try {
+        // 检查文件是否存在
+        if (!fs_1.default.existsSync(componentPath)) {
+            return res.status(404).json({ success: false, error: 'Component file not found' });
+        }
+        // 解析源文件和元数据
+        const { code, sourceFile, metadataPath } = parseComponentFile(componentPath);
+        // 获取元数据
+        if (!fs_1.default.existsSync(metadataPath)) {
+            return res.status(404).json({ success: false, error: 'Metadata file not found' });
+        }
+        const metadata = JSON.parse(fs_1.default.readFileSync(metadataPath, 'utf-8'));
+        if (!metadata.properties) {
+            return res.status(400).json({ success: false, error: 'No properties found in metadata' });
+        }
+        // 查找接口位置
+        const { found, interfaceText, interfaceStart, interfaceEnd, leadingComments } = (0, block_props_utils_1.findBlockPropsInterface)(sourceFile);
+        if (!found) {
+            return res.status(404).json({ success: false, error: 'BlockProps interface not found in component file' });
+        }
+        try {
+            const zodSchema = (0, zod_utils_1.propertiesToZodSchema)(metadata.properties || {}, {
+                addZodDescribe: true,
+            });
+            const typeString = (0, zod_utils_1.zodSchemaToTypeString)(zodSchema, 'BlockProps');
+            // 创建最终的接口定义
+            const newInterface = `export interface BlockProps ${typeString}`;
+            // 如果请求要求写入文件
+            if (write) {
+                // 拼接新的代码
+                const updatedCode = code.substring(0, interfaceStart) + (leadingComments || '') + newInterface + code.substring(interfaceEnd);
+                // 写入更新后的文件
+                fs_1.default.writeFileSync(componentPath, updatedCode);
+                return res.json({
+                    success: true,
+                    message: 'TypeScript接口已成功从metadata生成并写入文件',
+                });
+            }
+            // 否则，只返回生成的接口内容，不写入文件
+            return res.json({
+                success: true,
+                currentInterface: interfaceText,
+                newInterface,
+            });
+        }
+        catch (conversionError) {
+            console.error('Failed to convert properties to interface:', conversionError);
+            return res.status(500).json({
+                success: false,
+                error: `Failed to convert properties to interface: ${conversionError.message}`,
+            });
+        }
+    }
+    catch (error) {
+        console.error('Failed to generate interface:', error);
+        return res.status(500).json({
+            success: false,
+            error: `Failed to generate interface: ${error.message}`,
+        });
+    }
+});
+// 统一的接口到属性转换端点 - 可以预览或生成
+exports.initBlockStudioRouter.post('/interface-to-properties', async (req, res) => {
+    const write = req.body.write === true;
+    const validation = validateRequest(req, res);
+    if (validation.error)
+        return validation.error;
+    const { componentPath } = validation;
+    try {
+        // 检查文件是否存在
+        if (!fs_1.default.existsSync(componentPath)) {
+            return res.status(404).json({ success: false, error: 'Component file not found' });
+        }
+        // 解析源文件
+        const { sourceFile, metadataPath, currentMetadata } = parseComponentFile(componentPath);
+        // 查找BlockProps接口
+        const { found, interfaceText } = (0, block_props_utils_1.findBlockPropsInterface)(sourceFile);
+        if (!found || !interfaceText) {
+            return res.status(404).json({ success: false, error: 'BlockProps interface not found or could not be parsed' });
+        }
+        try {
+            const newProperties = await (0, zod_utils_1.tsFileInterfaceToProperties)(componentPath, 'BlockProps', currentMetadata.properties || {});
+            // 如果请求要求写入文件
+            if (write) {
+                // 更新元数据
+                const newMetadata = {
+                    ...currentMetadata,
+                    properties: newProperties,
+                    updatedAt: new Date().toISOString(),
+                };
+                // 写入文件
+                fs_1.default.writeFileSync(metadataPath, JSON.stringify(newMetadata, null, 2));
+                return res.json({
+                    success: true,
+                    metadata: newMetadata,
+                    message: 'Metadata 完全更新成功',
+                });
+            }
+            // 否则，只返回差异信息，不写入文件
+            return res.json({
+                success: true,
+                currentProperties: currentMetadata.properties || {},
+                newProperties,
+            });
+        }
+        catch (conversionError) {
+            console.error('Failed to convert interface to properties:', conversionError);
+            return res.status(500).json({
+                success: false,
+                error: `Failed to convert interface to properties: ${conversionError.message}`,
+            });
+        }
+    }
+    catch (error) {
+        console.error('Failed to generate metadata:', error);
+        return res.status(500).json({
+            success: false,
+            error: `Failed to generate metadata: ${error.message}`,
+        });
+    }
+});
 exports.default = exports.initBlockStudioRouter;