@blocklet/pages-kit-core 0.4.32 → 0.4.34

package/lib/cjs/block.js

@@ -22,70 +22,59 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Block = void 0;
 class Block {
+    code;
+    // 预编译正则表达式
+    ESM_IMPORT_REGEX = /import\s+\w+\s+from/;
+    ESM_KEYWORDS = ['export {', 'export default', 'import {', 'import *'];
     constructor(code) {
         this.code = code;
-        // 预编译正则表达式
-        this.ESM_IMPORT_REGEX = /import\s+\w+\s+from/;
-        this.ESM_KEYWORDS = ['export {', 'export default', 'import {', 'import *'];
     }
     setData(code) {
         this.code = code;
     }
-    render(input, _options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (!this.code) {
-                return null;
-            }
-            try {
-                const isESM = this.ESM_KEYWORDS.some((keyword) => { var _a; return (_a = this.code) === null || _a === void 0 ? void 0 : _a.includes(keyword); }) ||
-                    this.ESM_IMPORT_REGEX.test(this.code || '');
-                if (!isESM) {
-                    // UMD 格式处理
-                    if (!((_a = this.code) === null || _a === void 0 ? void 0 : _a.includes('function(')) && !((_b = this.code) === null || _b === void 0 ? void 0 : _b.includes('function ('))) {
-                        throw new Error('Invalid code format: UMD wrapper not found');
-                    }
-                    if (!this.code.includes('Component')) {
-                        throw new Error('Invalid UMD format: Component export not found');
-                    }
-                    const Component = new Function(`${this.code}; return Component;`)();
-                    if (typeof Component !== 'function') {
-                        throw new Error('Invalid UMD format: Component is not a function');
-                    }
-                    return Component(Object.assign({}, input));
+    async render(input, _options) {
+        if (!this.code) {
+            return null;
+        }
+        try {
+            const isESM = this.ESM_KEYWORDS.some((keyword) => this.code?.includes(keyword)) ||
+                this.ESM_IMPORT_REGEX.test(this.code || '');
+            if (!isESM) {
+                // UMD 格式处理
+                if (!this.code?.includes('function(') && !this.code?.includes('function (')) {
+                    throw new Error('Invalid code format: UMD wrapper not found');
                 }
-                // ESM 格式处理
-                const blob = new Blob([this.code], { type: 'application/javascript' });
-                const url = URL.createObjectURL(blob);
-                try {
-                    const module = yield Promise.resolve(`${url}`).then(s => __importStar(require(s)));
-                    const Component = module.default;
-                    if (typeof Component !== 'function') {
-                        throw new Error('Invalid ESM format: default export is not a function');
-                    }
-                    return Component(Object.assign({}, input));
+                if (!this.code.includes('Component')) {
+                    throw new Error('Invalid UMD format: Component export not found');
                 }
-                finally {
-                    URL.revokeObjectURL(url);
+                const Component = new Function(`${this.code}; return Component;`)();
+                if (typeof Component !== 'function') {
+                    throw new Error('Invalid UMD format: Component is not a function');
+                }
+                return Component({ ...input });
+            }
+            // ESM 格式处理
+            const blob = new Blob([this.code], { type: 'application/javascript' });
+            const url = URL.createObjectURL(blob);
+            try {
+                const module = await Promise.resolve(`${url}`).then(s => __importStar(require(s)));
+                const Component = module.default;
+                if (typeof Component !== 'function') {
+                    throw new Error('Invalid ESM format: default export is not a function');
                 }
+                return Component({ ...input });
             }
-            catch (error) {
-                console.error('Failed to render block:', error);
-                throw new Error(`Failed to execute code: ${error.message}`);
+            finally {
+                URL.revokeObjectURL(url);
             }
-        });
+        }
+        catch (error) {
+            console.error('Failed to render block:', error);
+            throw new Error(`Failed to execute code: ${error.message}`);
+        }
     }
 }
 exports.Block = Block;

package/lib/cjs/core.js

@@ -1,41 +1,36 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Core = void 0;
 const lodash_1 = require("lodash");
 class Core {
+    blocks;
+    datasets;
+    pages;
+    options;
     constructor({ blocks = new Map(), datasets = new Map(), pages = new Map(), options = {}, } = {}) {
-        this.block = {
-            render: (_input, _options) => __awaiter(this, void 0, void 0, function* () {
-                const options = this.mergeRenderOptions(_options);
-                // eslint-disable-next-line no-console
-                console.log('options', options);
-                // Implementation here
-                return Promise.resolve();
-            }),
-        };
-        this.page = {
-            render: (_input, _options) => __awaiter(this, void 0, void 0, function* () {
-                const options = this.mergeRenderOptions(_options);
-                // eslint-disable-next-line no-console
-                console.log('options', options);
-                // Implementation here
-                return Promise.resolve();
-            }),
-        };
         this.blocks = blocks;
         this.datasets = datasets;
         this.pages = pages;
         this.options = options;
     }
+    block = {
+        render: async (_input, _options) => {
+            const options = this.mergeRenderOptions(_options);
+            // eslint-disable-next-line no-console
+            console.log('options', options);
+            // Implementation here
+            return Promise.resolve();
+        },
+    };
+    page = {
+        render: async (_input, _options) => {
+            const options = this.mergeRenderOptions(_options);
+            // eslint-disable-next-line no-console
+            console.log('options', options);
+            // Implementation here
+            return Promise.resolve();
+        },
+    };
     mergeRenderOptions(renderOptions) {
         return (0, lodash_1.merge)({}, this.options, renderOptions);
     }

package/lib/cjs/dataset.js

@@ -1,34 +1,20 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dataset = void 0;
 class Dataset {
+    store;
     constructor(initialData = {}) {
         this.store = initialData;
     }
-    get(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.store[key] || null;
-        });
+    async get(key) {
+        return this.store[key] || null;
     }
-    set(key, value) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.store[key] = value;
-            return this.store[key];
-        });
+    async set(key, value) {
+        this.store[key] = value;
+        return this.store[key];
     }
-    clear() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.store = {};
-        });
+    async clear() {
+        this.store = {};
     }
 }
 exports.Dataset = Dataset;

package/lib/cjs/page.js

@@ -1,19 +1,11 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = void 0;
 const block_1 = require("./block");
 class Page {
+    data;
+    blocks = new Map();
     constructor(data) {
-        this.blocks = new Map();
         this.data = data;
         if (data) {
             this.initBlocks(data.sections);
@@ -31,7 +23,10 @@ class Page {
         // 这里实现页面容器组件的创建逻辑
         return {
             type: 'div',
-            props: Object.assign(Object.assign({}, props), { children }),
+            props: {
+                ...props,
+                children,
+            },
         };
     }
     setData(data) {
@@ -39,40 +34,47 @@ class Page {
         this.blocks.clear();
         this.initBlocks(data.sections);
     }
-    render(input, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.data) {
-                return null;
-            }
-            try {
-                // 1. 处理页面级别的配置
-                const pageProps = Object.assign({ id: this.data.id, backgroundColor: this.data.meta.backgroundColor }, input);
-                // @FIXME: 这个 map 应该是不需要的
-                // 使用 Block 实例渲染 sections
-                const sections = yield Promise.all(this.data.sections.map((section) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const block = this.blocks.get(section.id);
-                        if (!block) {
-                            throw new Error(`Block not found for section ${section.id}`);
-                        }
-                        // 合并配置传入 Block
-                        const sectionProps = Object.assign(Object.assign({ key: section.id, id: section.id }, section.config), section.properties);
-                        const result = yield block.render(sectionProps, options);
-                        return result;
-                    }
-                    catch (error) {
-                        console.error(`Failed to render section ${section.id}:`, error);
-                        return null;
+    async render(input, options) {
+        if (!this.data) {
+            return null;
+        }
+        try {
+            // 1. 处理页面级别的配置
+            const pageProps = {
+                id: this.data.id,
+                backgroundColor: this.data.meta.backgroundColor,
+                ...input,
+            };
+            // @FIXME: 这个 map 应该是不需要的
+            // 使用 Block 实例渲染 sections
+            const sections = await Promise.all(this.data.sections.map(async (section) => {
+                try {
+                    const block = this.blocks.get(section.id);
+                    if (!block) {
+                        throw new Error(`Block not found for section ${section.id}`);
                     }
-                })));
-                // 3. 返回页面组件
-                return this.createPageElement(pageProps, sections.filter(Boolean));
-            }
-            catch (error) {
-                console.error('Failed to render page:', error);
-                throw new Error(`Failed to render page: ${error.message}`);
-            }
-        });
+                    // 合并配置传入 Block
+                    const sectionProps = {
+                        key: section.id,
+                        id: section.id,
+                        ...section.config,
+                        ...section.properties,
+                    };
+                    const result = await block.render(sectionProps, options);
+                    return result;
+                }
+                catch (error) {
+                    console.error(`Failed to render section ${section.id}:`, error);
+                    return null;
+                }
+            }));
+            // 3. 返回页面组件
+            return this.createPageElement(pageProps, sections.filter(Boolean));
+        }
+        catch (error) {
+            console.error('Failed to render page:', error);
+            throw new Error(`Failed to render page: ${error.message}`);
+        }
     }
 }
 exports.Page = Page;