@blocklet/pages-kit-block-studio 0.0.16 → 0.0.18

package/lib/cjs/constants/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MEDIA_KIT_RESOURCE_TYPE = exports.MEDIA_KIT_DID = exports.PAGES_KIT_BLOCK_STUDIO_RESOURCE_TYPE = exports.PAGES_KIT_BLOCK_STUDIO_DID = exports.PAGES_KIT_RESOURCE_TYPE = exports.PAGES_KIT_DID = void 0;
+exports.PAGES_KIT_DID = 'z8iZiDFg3vkkrPwsiba1TLXy3H9XHzFERsP8o';
+exports.PAGES_KIT_RESOURCE_TYPE = 'page';
+exports.PAGES_KIT_BLOCK_STUDIO_DID = 'z2qa7rr3eUyVnWp2PCxEVARuUfLFh6cE5V2xV';
+exports.PAGES_KIT_BLOCK_STUDIO_RESOURCE_TYPE = 'page';
+exports.MEDIA_KIT_DID = 'z8ia1mAXo8ZE7ytGF36L5uBf9kD2kenhqFGp9';
+exports.MEDIA_KIT_RESOURCE_TYPE = 'imgpack';

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

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initBlockStudioRouter = void 0;
 const express_1 = require("express");
 const fs_1 = __importDefault(require("fs"));
+const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const helper_1 = require("../utils/helper");
 exports.initBlockStudioRouter = (0, express_1.Router)();
@@ -31,25 +32,23 @@ exports.initBlockStudioRouter.get('/', (req, res) => __awaiter(void 0, void 0, v
         return res.status(403).json({ error: 'Invalid path' });
     }
     try {
-        if (!fs_1.default.existsSync(filePath)) {
-            return res.json(null);
-        }
         const ext = path_1.default.extname(filePath).toLowerCase();
         if (BINARY_EXTENSIONS.includes(ext)) {
+            if (!fs_1.default.existsSync(filePath)) {
+                return res.json(null);
+            }
             // For images, stream the file directly
             const mimeType = `image/${ext.slice(1)}`;
             res.setHeader('Content-Type', mimeType);
             return fs_1.default.createReadStream(filePath).pipe(res);
         }
-        // For text files, try to parse as JSON
-        const content = fs_1.default.readFileSync(filePath, 'utf-8');
-        try {
-            return res.json(JSON.parse(content));
-        }
-        catch (_a) {
-            // If JSON parsing fails, return as plain text
-            return res.json(content);
+        const metadata = (0, helper_1.initializeMetadata)(filePath);
+        const code = (0, helper_1.getBlockCode)(filePath);
+        if (code) {
+            (0, lodash_1.set)(metadata, 'renderer.script', code);
+            (0, lodash_1.set)(metadata, 'renderer.type', 'react-component');
         }
+        return res.json(metadata);
     }
     catch (error) {
         return res.status(500).json({ error: 'Failed to read file' });
@@ -71,11 +70,60 @@ exports.initBlockStudioRouter.post('/', (req, res) => __awaiter(void 0, void 0,
         if (!fs_1.default.existsSync(dir)) {
             fs_1.default.mkdirSync(dir, { recursive: true });
         }
-        fs_1.default.writeFileSync(filePath, JSON.stringify(content, null, 2));
-        return res.json({ success: true });
+        const currentMetadata = (0, helper_1.initializeMetadata)(filePath);
+        const mergedContent = Object.assign(Object.assign({}, currentMetadata), content);
+        if ((0, lodash_1.isEqual)(currentMetadata, mergedContent)) {
+            return res.json({ success: true, content: mergedContent, message: 'No changes' });
+        }
+        mergedContent.updatedAt = new Date().toISOString();
+        // Check if this is a metadata file and has previewImage update
+        if ((0, helper_1.isMetadataFile)(filePath) && content.previewImage && currentMetadata.previewImage !== content.previewImage) {
+            const previewImagePath = path_1.default.join(dir, (0, helper_1.getPreviewImageRelativePath)(content.previewImage));
+            if (!fs_1.default.existsSync(previewImagePath)) {
+                yield (0, helper_1.downloadAsset)({
+                    asset: content.previewImage,
+                    savePath: previewImagePath,
+                    componentDid: process.env.BLOCKLET_COMPONENT_DID || '',
+                });
+            }
+        }
+        res.json({ success: true, content: mergedContent, message: 'Updated' });
+        // save metadata without renderer after response
+        delete mergedContent.renderer;
+        fs_1.default.writeFileSync(filePath, JSON.stringify(mergedContent, null, 2));
+        return null;
     }
     catch (error) {
         return res.status(500).json({ error: 'Failed to write file' });
     }
 }));
+exports.initBlockStudioRouter.get('/all', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    const { withBlockletData = true } = req.query;
+    const allBlocks = yield (0, helper_1.findComponentFiles)();
+    // get code to metadata
+    const allBlocksWithCode = allBlocks.map((block) => {
+        const code = (0, helper_1.getBlockCode)(block.fullPath);
+        if (code) {
+            (0, lodash_1.set)(block.metadata, 'renderer.script', code);
+            (0, lodash_1.set)(block.metadata, 'renderer.type', 'react-component');
+        }
+        return block;
+    });
+    if (withBlockletData) {
+        const allBlocksWithBlockletData = allBlocksWithCode.map((block) => {
+            const blockletInfo = (0, helper_1.getBlockStudioInfo)() || {
+                title: '',
+                did: '',
+            };
+            const item = {
+                blockletTitle: blockletInfo.title,
+                blockletId: blockletInfo.did,
+                data: block.metadata,
+            };
+            return item;
+        });
+        return res.json((0, lodash_1.keyBy)(allBlocksWithBlockletData, 'data.id'));
+    }
+    return res.json((0, lodash_1.keyBy)(allBlocksWithCode, 'id'));
+}));
 exports.default = exports.initBlockStudioRouter;

package/lib/cjs/middlewares/init-resource-router.js

@@ -53,6 +53,7 @@ const component_1 = require("@blocklet/sdk/lib/component");
 const child_process_1 = require("child_process");
 const express_1 = require("express");
 const fs_1 = __importDefault(require("fs"));
+const set_1 = __importDefault(require("lodash/set"));
 const path_1 = __importStar(require("path"));
 const helper_1 = require("../utils/helper");
 const DID = 'z2qa7rr3eUyVnWp2PCxEVARuUfLFh6cE5V2xV';
@@ -153,9 +154,55 @@ exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, voi
         fs_1.default.rmSync(dir, { recursive: true, force: true });
         fs_1.default.mkdirSync(dir, { recursive: true });
         const rootDir = process.cwd();
-        const tmpPackage = (0, path_1.join)(rootDir, helper_1.libDir);
+        const distDir = (0, path_1.join)(rootDir, helper_1.libDir);
+        const tmpPackage = (0, path_1.join)(distDir, 'resource-blocklet');
+        fs_1.default.mkdirSync(tmpPackage, { recursive: true });
+        const pagesDir = (0, path_1.join)(tmpPackage, 'pages');
+        fs_1.default.mkdirSync(pagesDir, { recursive: true });
+        const componentsDir = (0, path_1.join)(tmpPackage, 'components');
+        fs_1.default.mkdirSync(componentsDir, { recursive: true });
+        // get @metadata.json by glob
+        const canUseComponents = (0, helper_1.findComponentFiles)({ cwd: rootDir, filter: componentIds });
+        // Filter and process metadata files
+        const metadataList = canUseComponents.map(({ fullPath, blockName, metadata: _metadata }) => {
+            // get metadata
+            const metadata = _metadata;
+            // get code to metadata
+            const code = fs_1.default.readFileSync((0, path_1.join)(distDir, 'es', `${blockName}.js`), 'utf8');
+            if (code) {
+                (0, set_1.default)(metadata, 'renderer.script', code);
+                (0, set_1.default)(metadata, 'renderer.type', 'react-component');
+            }
+            // write metadata to metadataPath
+            const metadataYmlPath = path_1.default.join(componentsDir, `${metadata.name || 'unnamed'}.${metadata.id}.yml`);
+            fs_1.default.writeFileSync(metadataYmlPath, (0, helper_1.generateYaml)(metadata));
+            // Handle preview image if exists
+            if (metadata.previewImage) {
+                const imagePath = path_1.default.join(path_1.default.dirname(fullPath), (0, helper_1.getPreviewImageRelativePath)(metadata.previewImage));
+                const imageDestPath = path_1.default.join(componentsDir, metadata.previewImage);
+                if (fs_1.default.existsSync(imagePath)) {
+                    fs_1.default.copyFileSync(imagePath, imageDestPath);
+                }
+            }
+            return metadata;
+        });
+        // write pages.config.yml
+        const pagesConfigPath = path_1.default.join(tmpPackage, '.blocklet/pages/pages.config.yml');
+        fs_1.default.mkdirSync(path_1.default.dirname(pagesConfigPath), { recursive: true });
+        const pagesConfig = {
+            pages: [],
+            components: metadataList.map((metadata) => ({
+                id: metadata.id,
+                name: metadata.name,
+            })),
+            supportedLocales: [],
+            config: {},
+        };
+        fs_1.default.writeFileSync(pagesConfigPath, (0, helper_1.generateYaml)(pagesConfig));
+        helper_1.logger.info('generate resource blocklet block count:', metadataList.length);
         yield copyRecursive(tmpPackage, dir);
-        fs_1.default.rmSync(tmpPackage, { recursive: true, force: true });
+        // remove tmpPackage
+        // fs.rmSync(tmpPackage, { recursive: true, force: true });
         res.json({ success: true });
     }
     catch (error) {

package/lib/cjs/middlewares/init-uploader-router.js

@@ -37,6 +37,7 @@ exports.initUploaderRouter = void 0;
 // @ts-ignore
 const uploader_server_1 = require("@blocklet/uploader-server");
 const express_1 = __importStar(require("express"));
+const constants_1 = require("../constants");
 // init uploader router
 exports.initUploaderRouter = (0, express_1.Router)();
 exports.initUploaderRouter.use('/', (0, uploader_server_1.initProxyToMediaKitUploadsMiddleware)({
@@ -46,20 +47,20 @@ exports.initUploaderRouter.use('/', (0, uploader_server_1.initProxyToMediaKitUpl
     resourceTypes: [
         // image bin resource
         {
-            type: 'imgpack',
-            did: 'z8ia1mAXo8ZE7ytGF36L5uBf9kD2kenhqFGp9',
+            type: constants_1.MEDIA_KIT_RESOURCE_TYPE,
+            did: constants_1.MEDIA_KIT_DID,
         },
         // pages kit resource (pages and components folder)
         {
-            type: 'page',
-            did: 'z8iZiDFg3vkkrPwsiba1TLXy3H9XHzFERsP8o',
+            type: constants_1.PAGES_KIT_RESOURCE_TYPE,
+            did: constants_1.PAGES_KIT_DID,
             folder: ['pages', 'components'],
             blacklist: ['.yml'],
         },
         // pages kit block studio resource
         {
-            type: 'page',
-            did: 'z2qa7rr3eUyVnWp2PCxEVARuUfLFh6cE5V2xV',
+            type: constants_1.PAGES_KIT_BLOCK_STUDIO_RESOURCE_TYPE,
+            did: constants_1.PAGES_KIT_BLOCK_STUDIO_DID,
             folder: ['pages', 'components'],
             blacklist: ['.yml'],
         },

package/lib/cjs/plugins/vite-plugin-block-studio.js

@@ -121,6 +121,9 @@ function initBlockStudioPlugins(options) {
                                     '@arcblock/did-connect',
                                 ],
                                 output: {
+                                    chunkFileNames: () => {
+                                        return '[format]/_chunks/[name]-[hash].js';
+                                    },
                                     // 为所有外部依赖提供全局变量
                                     globals: {
                                         react: 'React',
@@ -166,6 +169,7 @@ function initBlockStudioPlugins(options) {
                                     ? {
                                         isHtmlPreview: true,
                                         dataPath: filePath,
+                                        code: (0, vite_plugin_html_transform_1.generateComponent)((0, vite_plugin_html_transform_1.readHtmlFiles)(dirPath.split('?dir=')[1] || '')),
                                         blockName,
                                         dirPath,
                                         metadataPath,

package/lib/cjs/plugins/vite-plugin-html-transform.js

@@ -10,6 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RESOLVED_VIRTUAL_MODULE_ID = exports.VIRTUAL_MODULE_ID = void 0;
+exports.readHtmlFiles = readHtmlFiles;
+exports.generateComponent = generateComponent;
 exports.initHtmlPreviewTransformPlugin = initHtmlPreviewTransformPlugin;
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -191,6 +193,9 @@ ${content.trim()}`;
 function generateComponent(content, _isDev = true) {
     const htmlContent = content.html;
     const { name } = content;
+    if (_isDev) {
+        // do something
+    }
     return `import { createElement } from 'react';
 
 export default function HtmlPreview() {