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

package/lib/cjs/utils/ts-morph-utils.js

@@ -32,12 +32,23 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTsMorphProject = createTsMorphProject;
 exports.extractTypeWithDependencies = extractTypeWithDependencies;
 exports.combineTypeDefinitions = combineTypeDefinitions;
+exports.tsFileToZodSchema = tsFileToZodSchema;
+const config_1 = __importDefault(require("@blocklet/sdk/lib/config"));
+const fs_1 = require("fs");
+const lowerFirst_1 = __importDefault(require("lodash/lowerFirst"));
+const nanoid_1 = require("nanoid");
 const path = __importStar(require("path"));
 const ts_morph_1 = require("ts-morph");
+const ts_to_zod_1 = require("ts-to-zod");
+const zod_1 = require("zod");
+const helper_1 = require("./helper");
 /**
  * 创建 ts-morph 项目
  * @param tsConfigFilePath tsconfig.json 文件路径
@@ -253,3 +264,55 @@ function combineTypeDefinitions(typeText, dependencies, imports = []) {
     combinedText += typeText;
     return combinedText;
 }
+/**
+ * 从TypeScript文件中的类型声明生成Zod schema
+ * 支持处理外部引用类型
+ * @param sourceFilePath 源文件路径
+ * @param typeName 类型名称
+ * @param tsConfigFilePath tsconfig.json 路径，默认为项目根目录下的tsconfig.json
+ */
+async function tsFileToZodSchema(sourceFilePath, typeName) {
+    try {
+        const { typeText, dependencies, imports } = extractTypeWithDependencies(sourceFilePath, typeName);
+        // set imports to empty array
+        const combinedTypeDefinition = combineTypeDefinitions(typeText, dependencies, []);
+        // 使用 ts-to-zod 生成代码，需要手动添加 imports 和 combinedTypeDefinition，因为 zod-to-ts 对 import 处理存在问题
+        const result = (0, ts_to_zod_1.generate)({
+            sourceText: combinedTypeDefinition,
+            keepComments: true,
+        });
+        // 提取生成的 Zod schema 代码
+        const zodSchemaText = result.getZodSchemasFile('zod');
+        // 创建临时目录
+        const tmpDir = path.resolve(config_1.default.env.dataDir, 'temp');
+        try {
+            await fs_1.promises.stat(tmpDir);
+        }
+        catch (error) {
+            // 如果目录不存在，stat 会抛出错误
+            await fs_1.promises.mkdir(tmpDir, { recursive: true });
+        }
+        const fileName = `zodSchema_${typeName}_${(0, nanoid_1.nanoid)(helper_1.NANOID_LENGTH)}.ts`;
+        const filePath = path.join(tmpDir, fileName);
+        // 添加 ts-to-zod 的 imports 和 zodSchemaText
+        const zodSchemaTextWithImports = `
+${imports.join('\n')}
+
+${zodSchemaText}
+    `;
+        // 写入临时文件
+        await fs_1.promises.writeFile(filePath, zodSchemaTextWithImports);
+        // 首字母转换为小写
+        const schemaName = `${(0, lowerFirst_1.default)(typeName)}Schema`;
+        const module = await Promise.resolve(`${filePath}`).then(s => __importStar(require(s)));
+        const schema = module[schemaName];
+        // 清理临时文件
+        await fs_1.promises.unlink(filePath);
+        return schema;
+    }
+    catch (error) {
+        console.error('Failed to generate Zod schema from TypeScript file:', error);
+        console.error('Error details:', error);
+        return zod_1.z.object({}).passthrough();
+    }
+}

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

@@ -1,59 +1,15 @@
 "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.PROPERTIES_TYPE_SCHEMA = void 0;
 exports.propertiesToZodSchema = propertiesToZodSchema;
 exports.jsonSchemaToProperties = jsonSchemaToProperties;
 exports.zodSchemaToTypeString = zodSchemaToTypeString;
 exports.zodSchemaToJsonSchema = zodSchemaToJsonSchema;
-exports.tsFileToZodSchema = tsFileToZodSchema;
-exports.tsFileInterfaceToProperties = tsFileInterfaceToProperties;
-const config_1 = __importDefault(require("@blocklet/sdk/lib/config"));
-const fs_1 = require("fs");
-const lowerFirst_1 = __importDefault(require("lodash/lowerFirst"));
 const nanoid_1 = require("nanoid");
-const path = __importStar(require("path"));
-const ts_to_zod_1 = require("ts-to-zod");
 const zod_1 = require("zod");
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 const zod_to_ts_1 = require("zod-to-ts");
 const helper_1 = require("./helper");
-const ts_morph_utils_1 = require("./ts-morph-utils");
 const PROPERTY_PREFIX = '@description';
 const JOIN_SYMBOL = ' | ';
 // 转换为: type: string | visible: boolean
@@ -245,70 +201,3 @@ function zodSchemaToTypeString(schema, typeName, removeUndefined = true) {
 function zodSchemaToJsonSchema(schema) {
     return (0, zod_to_json_schema_1.zodToJsonSchema)(schema, { $refStrategy: 'none' });
 }
-/**
- * 从TypeScript文件中的类型声明生成Zod schema
- * 支持处理外部引用类型
- * @param sourceFilePath 源文件路径
- * @param typeName 类型名称
- * @param tsConfigFilePath tsconfig.json 路径，默认为项目根目录下的tsconfig.json
- */
-async function tsFileToZodSchema(sourceFilePath, typeName) {
-    try {
-        const { typeText, dependencies, imports } = (0, ts_morph_utils_1.extractTypeWithDependencies)(sourceFilePath, typeName);
-        // set imports to empty array
-        const combinedTypeDefinition = (0, ts_morph_utils_1.combineTypeDefinitions)(typeText, dependencies, []);
-        // 使用 ts-to-zod 生成代码，需要手动添加 imports 和 combinedTypeDefinition，因为 zod-to-ts 对 import 处理存在问题
-        const result = (0, ts_to_zod_1.generate)({
-            sourceText: combinedTypeDefinition,
-            keepComments: true,
-        });
-        // 提取生成的 Zod schema 代码
-        const zodSchemaText = result.getZodSchemasFile('zod');
-        // 创建临时目录
-        const tmpDir = path.resolve(config_1.default.env.dataDir, 'temp');
-        try {
-            await fs_1.promises.stat(tmpDir);
-        }
-        catch (error) {
-            // 如果目录不存在，stat 会抛出错误
-            await fs_1.promises.mkdir(tmpDir, { recursive: true });
-        }
-        const fileName = `zodSchema_${typeName}_${(0, nanoid_1.nanoid)(helper_1.NANOID_LENGTH)}.ts`;
-        const filePath = path.join(tmpDir, fileName);
-        // 添加 ts-to-zod 的 imports 和 zodSchemaText
-        const zodSchemaTextWithImports = `
-${imports.join('\n')}
-
-${zodSchemaText}
-    `;
-        // 写入临时文件
-        await fs_1.promises.writeFile(filePath, zodSchemaTextWithImports);
-        // 动态导入生成的模块
-        const module = await Promise.resolve(`${`file://${filePath}`}`).then(s => __importStar(require(s)));
-        // 首字母转换为小写
-        const schemaName = `${(0, lowerFirst_1.default)(typeName)}Schema`;
-        // 获取 schema
-        const schema = module[schemaName];
-        // 清理临时文件
-        await fs_1.promises.unlink(filePath);
-        return schema;
-    }
-    catch (error) {
-        console.error('Failed to generate Zod schema from TypeScript file:', error);
-        console.error('Error details:', error);
-        return zod_1.z.object({}).passthrough();
-    }
-}
-/**
- * 从TypeScript文件中的类型生成Properties对象
- * 支持处理外部引用类型
- * @param sourceFilePath 源文件路径
- * @param typeName 类型名称
- * @param existingProperties 已存在的properties对象
- */
-async function tsFileInterfaceToProperties(sourceFilePath, typeName, existingProperties = {}) {
-    const zodSchema = await tsFileToZodSchema(sourceFilePath, typeName);
-    const jsonSchema = zodSchemaToJsonSchema(zodSchema);
-    // get jsonSchemaToProperties and set isRoot to true
-    return jsonSchemaToProperties(jsonSchema, { existingProperties, key: '', isRoot: true });
-}

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

@@ -8,7 +8,8 @@ import { METADATA_FILE_NAME, NEW_BLOCK_TEMPLATE_PATH, NEW_BLOCK_TEMPLATE_METADAT
 // 导入Zod相关工具
 import { findBlockPropsInterface } from '../utils/block-props-utils';
 import { isPathSafe, isDev, downloadAsset, isMetadataFile, getPreviewImageRelativePath, initializeMetadata, findComponentFiles, getBlockStudioInfo, getBlockCode, getBlockEntryFilesPattern, safeParse, } from '../utils/helper';
-import { propertiesToZodSchema, zodSchemaToTypeString, tsFileInterfaceToProperties } from '../utils/zod-utils';
+import { tsFileToZodSchema } from '../utils/ts-morph-utils';
+import { propertiesToZodSchema, zodSchemaToTypeString, zodSchemaToJsonSchema, jsonSchemaToProperties, } from '../utils/zod-utils';
 export const initBlockStudioRouter = Router();
 const BINARY_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.ico', '.svg'];
 // 共享的请求验证和文件路径处理
@@ -82,7 +83,7 @@ initBlockStudioRouter.post('/', async (req, res) => {
     try {
         const dir = path.dirname(filePath);
         if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir, { recursive: true });
+            throw new Error('Directory not found');
         }
         const currentMetadata = initializeMetadata(filePath);
         const mergedContent = { ...currentMetadata, ...content };
@@ -152,7 +153,7 @@ initBlockStudioRouter.post('/create', async (req, res) => {
         return res.status(500).json({ error: 'Failed to create block' });
     }
 });
-initBlockStudioRouter.get('/all', async (req, res) => {
+initBlockStudioRouter.get('/resources', async (req, res) => {
     const { withBlockletData = true } = req.query;
     const allBlocks = await findComponentFiles();
     // get code to metadata
@@ -181,6 +182,10 @@ initBlockStudioRouter.get('/all', async (req, res) => {
     }
     return res.json(keyBy(allBlocksWithCode, 'id'));
 });
+initBlockStudioRouter.get('/components', async (_req, res) => {
+    const allBlocks = await findComponentFiles();
+    return res.json(allBlocks);
+});
 // 统一的属性到接口转换端点 - 可以预览或生成
 initBlockStudioRouter.post('/properties-to-interface', async (req, res) => {
     const write = req.body.write === true;
@@ -269,7 +274,13 @@ initBlockStudioRouter.post('/interface-to-properties', async (req, res) => {
             return res.status(404).json({ success: false, error: 'BlockProps interface not found or could not be parsed' });
         }
         try {
-            const newProperties = await tsFileInterfaceToProperties(componentPath, 'BlockProps', currentMetadata.properties || {});
+            const zodSchema = await tsFileToZodSchema(componentPath, 'BlockProps');
+            const jsonSchema = zodSchemaToJsonSchema(zodSchema);
+            const newProperties = jsonSchemaToProperties(jsonSchema, {
+                existingProperties: currentMetadata.properties || {},
+                key: '',
+                isRoot: true,
+            });
             // 如果请求要求写入文件
             if (write) {
                 // 更新元数据