@blocklet/pages-kit 0.4.32 → 0.4.34

package/lib/cjs/utils/inject-es-module-shims-options.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectESModulesShimsOptions = injectESModulesShimsOptions;
 function injectESModulesShimsOptions(options = {}) {
-    var _a;
     // if already initialized, return
     if (window.esmsInitOptions && !options.force) {
         return;
@@ -10,7 +9,7 @@ function injectESModulesShimsOptions(options = {}) {
     window.esmsInitOptions = {
         // Notice: 不要修改 shimMode 的默认值，否则可能会影响到其他 blocklet 的正常使用
         // default is false, do not enable es-module-shims
-        shimMode: (_a = options.shimMode) !== null && _a !== void 0 ? _a : false,
+        shimMode: options.shimMode ?? false,
         polyfillEnable: ['css-modules', 'json-modules', 'wasm-modules', 'source-phase'],
     };
 }

package/lib/cjs/utils/inject-global-components-dump-json.js

@@ -1130,7 +1130,7 @@ if (cookie && shouldUpdateKnowledge && aiStudioUrl && datasetId) {
     })
         .then((res) => res.json())
         .then(({ items }) => {
-        console.info('items count: ', items === null || items === void 0 ? void 0 : items.length);
+        console.info('items count: ', items?.length);
         const successText = (data) => {
             console.info(`${data.name} success`);
         };

package/lib/cjs/utils/inject-global-components.js

@@ -31,7 +31,6 @@ require("es-module-shims");
 const react_1 = __importDefault(require("react"));
 const ufo_1 = require("ufo");
 const arcblockUx = __importStar(require("../builtin/arcblock/ux"));
-const aiRuntime = __importStar(require("../builtin/async/ai-runtime"));
 const imagePreview = __importStar(require("../builtin/async/image-preview"));
 const reactMarkdown = __importStar(require("../builtin/async/react-markdown"));
 const reactScrollToBottom = __importStar(require("../builtin/async/react-scroll-to-bottom"));
@@ -59,14 +58,13 @@ const builtin_1 = require("../types/builtin");
 const builtin_module_transformer_1 = require("./typescript/builtin-module-transformer");
 // Initialize ES Module Shims before any imports
 function injectGlobalComponents() {
-    var _a;
     const win = window || {};
     // if already initialized, return
     if (win[builtin_1.BuiltinModulesGlobalVariableName]) {
         return;
     }
-    const enableShim = !!((_a = window === null || window === void 0 ? void 0 : window.esmsInitOptions) === null || _a === void 0 ? void 0 : _a.shimMode);
-    if (!enableShim) {
+    const enableShim = !!window?.esmsInitOptions?.shimMode && win.importShim;
+    if (!enableShim && win.importShim?.addImportMap) {
         win.importShim.addImportMap = () => {
             // avoid addImportMap error
         };
@@ -99,13 +97,12 @@ function injectGlobalComponents() {
         '@blocklet/pages-kit/builtin/async/react-markdown': reactMarkdown,
         '@blocklet/pages-kit/builtin/async/react-syntax-highlighter': reactSyntaxHighlighter,
         '@blocklet/pages-kit/builtin/async/image-preview': imagePreview,
-        '@blocklet/pages-kit/builtin/async/ai-runtime': aiRuntime,
+        '@blocklet/pages-kit/builtin/async/ai-runtime': Promise.resolve().then(() => __importStar(require('../builtin/async/ai-runtime'))),
     };
     // set global variable
     win[builtin_1.BuiltinModulesGlobalVariableName] = {
         modules,
         require(module) {
-            var _a;
             // handle builtin module
             const builtinModule = this.modules[module];
             if (builtinModule) {
@@ -114,7 +111,7 @@ function injectGlobalComponents() {
             // handle relative path import
             if ((0, builtin_module_transformer_1.isRelativeModule)(module)) {
                 const fileName = module.split('/').pop();
-                const fullUrl = (0, ufo_1.joinURL)(window.location.origin, ((_a = window === null || window === void 0 ? void 0 : window.blocklet) === null || _a === void 0 ? void 0 : _a.prefix) || '/', 'chunks', fileName);
+                const fullUrl = (0, ufo_1.joinURL)(window.location.origin, window?.blocklet?.prefix || '/', 'chunks', fileName);
                 if (enableShim) {
                     const mod = window.importShim(/* @vite-ignore */ fullUrl);
                     return mod;
@@ -126,11 +123,23 @@ function injectGlobalComponents() {
         },
     };
     // create importmap
-    const setupImportMap = () => {
+    const setupImportMap = async () => {
+        const modulesResolved = {};
+        // 确保 modules 的 value 中的所有 promise 都加载为 es module
+        await Promise.all(Object.entries(modules).map(async ([modulePath, moduleContent]) => {
+            if (moduleContent instanceof Promise) {
+                const mod = await moduleContent;
+                modulesResolved[modulePath] = mod;
+                // replace the original moduleContent with the resolved module
+                win[builtin_1.BuiltinModulesGlobalVariableName].modules[modulePath] = mod;
+                return;
+            }
+            modulesResolved[modulePath] = moduleContent;
+        }));
         // 计算模块的 hash 值作为缓存版本
         const calculateModulesHash = () => {
             // 只提取模块路径和导出的键名用于 hash 计算
-            const moduleStructure = Object.entries(modules).map(([path, mod]) => ({
+            const moduleStructure = Object.entries(modulesResolved).map(([path, mod]) => ({
                 path,
                 exports: Object.keys(mod).sort(),
             }));
@@ -167,21 +176,21 @@ function injectGlobalComponents() {
             return null; // 缓存无效
         };
         // 尝试从缓存获取或重新计算
-        const imports = getImportsFromCache() ||
-            Object.entries(modules).reduce((acc, [modulePath, moduleContent]) => {
-                const namedExports = Object.keys(moduleContent).filter((key) => key !== 'default');
-                const hasDefaultExport = 'default' in moduleContent;
-                // create module code
-                const moduleCode = `// GENERATED FILE. DO NOT EDIT.
+        const imports = Object.entries(modulesResolved).reduce((acc, [modulePath, moduleContent]) => {
+            const moduleContentResolved = moduleContent;
+            const namedExports = Object.keys(moduleContentResolved).filter((key) => key !== 'default');
+            const hasDefaultExport = 'default' in moduleContentResolved;
+            // create module code
+            const moduleCode = `// GENERATED FILE. DO NOT EDIT.
 const moduleSource = window['${builtin_1.BuiltinModulesGlobalVariableName}'].modules['${modulePath}'];       
 ${namedExports.map((name) => `export const ${name} = moduleSource['${name}'];`).join('\n')}
 export default ${hasDefaultExport ? 'moduleSource.default' : 'moduleSource'};
 `;
-                // create base64 code
-                const base64Code = btoa(moduleCode);
-                acc[modulePath] = `data:application/javascript;base64,${base64Code}`;
-                return acc;
-            }, {});
+            // create base64 code
+            const base64Code = btoa(moduleCode);
+            acc[modulePath] = `data:application/javascript;base64,${base64Code}`;
+            return acc;
+        }, {});
         // 如果是新计算的 imports，保存到缓存
         if (!getImportsFromCache()) {
             try {

package/lib/cjs/utils/preload.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectPreloadComponents = injectPreloadComponents;
 const types_1 = require("../types");
@@ -23,10 +12,7 @@ function injectPreloadComponents(data) {
                 throw new Error(`Only support inject script with module ${types_1.PreloadComponentScriptModule.UMD_FN}`);
             return [componentId, { componentModuleGlobalVariable: script.moduleName, component }];
         })),
-        instances: Object.fromEntries(data.instances.map((_a) => {
-            var { id } = _a, instance = __rest(_a, ["id"]);
-            return [id, instance];
-        })),
+        instances: Object.fromEntries(data.instances.map(({ id, ...instance }) => [id, instance])),
     };
     return {
         html: `\

package/lib/cjs/utils/property.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderNestedComponent = void 0;
 exports.componentUMDName = componentUMDName;
 exports.mergeComponent = mergeComponent;
+exports.safeJSONParse = safeJSONParse;
 exports.parsePropertyValue = parsePropertyValue;
 exports.assignNullableFields = assignNullableFields;
 const js_yaml_1 = __importDefault(require("js-yaml"));
@@ -13,46 +14,43 @@ function componentUMDName({ componentId }) {
     return `PagesCustomComponent${componentId}`;
 }
 function mergeComponent({ componentId, getComponent, locale, defaultLocale, properties: parameters, }) {
-    var _a, _b, _c, _d, _e, _f, _g;
     let component = getComponent(componentId);
     if (!component)
         return null;
     let script;
-    const properties = Object.fromEntries(Object.entries(parameters !== null && parameters !== void 0 ? parameters : {}).map(([id, { value }]) => {
-        var _a, _b;
-        const property = (_b = (_a = component === null || component === void 0 ? void 0 : component.properties) === null || _a === void 0 ? void 0 : _a[id]) === null || _b === void 0 ? void 0 : _b.data;
+    const properties = Object.fromEntries(Object.entries(parameters ?? {}).map(([id, { value }]) => {
+        const property = component?.properties?.[id]?.data;
         if (!property)
             return [];
         // // if key is undefined, use id
         return [property.key || property.id, parsePropertyValue(property, value, { locale, defaultLocale })];
     }));
     while (component) {
-        assignNullableFields(properties, Object.fromEntries(Object.values((_a = component.properties) !== null && _a !== void 0 ? _a : {}).map(({ data }) => {
-            var _a, _b, _c, _d, _e;
-            return [
-                // if key is undefined, use id
-                data.key || data.id,
-                parsePropertyValue(data, (_c = (_b = (_a = data.locales) === null || _a === void 0 ? void 0 : _a[locale]) === null || _b === void 0 ? void 0 : _b.defaultValue) !== null && _c !== void 0 ? _c : (_e = (_d = data.locales) === null || _d === void 0 ? void 0 : _d[defaultLocale]) === null || _e === void 0 ? void 0 : _e.defaultValue, { locale, defaultLocale }),
-            ];
-        })));
-        if (((_b = component.renderer) === null || _b === void 0 ? void 0 : _b.type) === 'react-component') {
-            script = (_c = component.renderer) === null || _c === void 0 ? void 0 : _c.script;
+        assignNullableFields(properties, Object.fromEntries(Object.values(component.properties ?? {}).map(({ data }) => [
+            // if key is undefined, use id
+            data.key || data.id,
+            parsePropertyValue(data, data.locales?.[locale]?.defaultValue ?? data.locales?.[defaultLocale]?.defaultValue, { locale, defaultLocale }),
+        ])));
+        if (component.renderer?.type === 'react-component') {
+            script = component.renderer?.script;
             break;
         }
-        if (((_d = component.renderer) === null || _d === void 0 ? void 0 : _d.type) === 'web-component') {
-            script = (_e = component.renderer) === null || _e === void 0 ? void 0 : _e.script;
+        if (component.renderer?.type === 'web-component') {
+            script = component.renderer?.script;
             break;
         }
-        if (((_f = component.renderer) === null || _f === void 0 ? void 0 : _f.type) === 'component' && component.renderer.componentId) {
+        if (component.renderer?.type === 'component' && component.renderer.componentId) {
             const { componentId } = component.renderer;
             const next = getComponent(componentId);
             const nextParameters = component.renderer.properties;
-            assignNullableFields(properties, Object.fromEntries(Object.entries((_g = next === null || next === void 0 ? void 0 : next.properties) !== null && _g !== void 0 ? _g : {}).map(([id, { data }]) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                const locales = (_a = nextParameters === null || nextParameters === void 0 ? void 0 : nextParameters[id]) === null || _a === void 0 ? void 0 : _a.locales;
+            assignNullableFields(properties, Object.fromEntries(Object.entries(next?.properties ?? {}).map(([id, { data }]) => {
+                const locales = nextParameters?.[id]?.locales;
                 return [
                     data.key,
-                    parsePropertyValue(data, (_h = (_e = (_c = (_b = locales === null || locales === void 0 ? void 0 : locales[locale]) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : (_d = locales === null || locales === void 0 ? void 0 : locales[defaultLocale]) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : (_g = (_f = data.locales) === null || _f === void 0 ? void 0 : _f[locale]) === null || _g === void 0 ? void 0 : _g.defaultValue) !== null && _h !== void 0 ? _h : (_k = (_j = data.locales) === null || _j === void 0 ? void 0 : _j[defaultLocale]) === null || _k === void 0 ? void 0 : _k.defaultValue, { locale, defaultLocale }),
+                    parsePropertyValue(data, locales?.[locale]?.value ??
+                        locales?.[defaultLocale]?.value ??
+                        data.locales?.[locale]?.defaultValue ??
+                        data.locales?.[defaultLocale]?.defaultValue, { locale, defaultLocale }),
                 ];
             })));
             component = next;
@@ -66,13 +64,18 @@ function mergeComponent({ componentId, getComponent, locale, defaultLocale, prop
     return { script, properties };
 }
 exports.RenderNestedComponent = '__RENDER_NESTED_COMPONENT__';
+function safeJSONParse(value) {
+    if (typeof value === 'object' && value !== null) {
+        return value;
+    }
+    return JSON.parse(value);
+}
 function parsePropertyValue(property, value, { locale, defaultLocale }) {
-    var _a, _b, _c, _d, _e;
     if (property.type === 'json') {
         if (!value)
             return undefined;
         try {
-            return JSON.parse(value);
+            return safeJSONParse(value);
         }
         catch (error) {
             console.error('parse json value error', error);
@@ -91,14 +94,17 @@ function parsePropertyValue(property, value, { locale, defaultLocale }) {
         }
     }
     if (property.type === 'component') {
-        const componentId = value === null || value === void 0 ? void 0 : value.componentId;
+        const componentId = value?.componentId;
         if (typeof componentId !== 'string')
             return undefined;
         const { locales } = property;
         return {
             type: exports.RenderNestedComponent,
             componentId,
-            properties: Object.assign(Object.assign({}, ((_c = (_b = (_a = locales === null || locales === void 0 ? void 0 : locales[locale]) === null || _a === void 0 ? void 0 : _a.defaultValue) === null || _b === void 0 ? void 0 : _b.properties) !== null && _c !== void 0 ? _c : (_e = (_d = locales === null || locales === void 0 ? void 0 : locales[defaultLocale]) === null || _d === void 0 ? void 0 : _d.defaultValue) === null || _e === void 0 ? void 0 : _e.properties)), value === null || value === void 0 ? void 0 : value.properties),
+            properties: {
+                ...(locales?.[locale]?.defaultValue?.properties ?? locales?.[defaultLocale]?.defaultValue?.properties),
+                ...value?.properties,
+            },
         };
     }
     return value;

package/lib/cjs/utils/typescript/builtin-module-transformer.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBuiltinModuleTransformer = exports.isRelativeModule = void 0;
+exports.createBuiltinModuleTransformer = exports.isAwaitModule = exports.isRelativeModule = void 0;
 const builtin_1 = require("../../types/builtin");
 const isRelativeModule = (moduleSpecifier) => {
     return moduleSpecifier.startsWith('./') || moduleSpecifier.startsWith('../');
 };
 exports.isRelativeModule = isRelativeModule;
+const isAwaitModule = (moduleSpecifier) => {
+    return ['@blocklet/pages-kit/builtin/async/ai-runtime'].includes(moduleSpecifier);
+};
+exports.isAwaitModule = isAwaitModule;
 const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     const { factory } = context;
     // 统一的模块导入收集器
@@ -16,27 +20,25 @@ const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     };
     // filter and collect the import statements that need to be processed
     const statements = file.statements.filter((s) => {
-        var _a, _b, _c;
         if (ts.isImportDeclaration(s) &&
             ts.isStringLiteral(s.moduleSpecifier) &&
             isTargetModule(s.moduleSpecifier.text)) {
             const importInfo = {
                 moduleName: s.moduleSpecifier.text,
-                name: (_b = (_a = s.importClause) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.text,
+                name: s.importClause?.name?.text,
                 members: [],
                 namespace: '',
             };
-            const namedBindings = (_c = s.importClause) === null || _c === void 0 ? void 0 : _c.namedBindings;
+            const namedBindings = s.importClause?.namedBindings;
             if (namedBindings) {
                 if (ts.isNamespaceImport(namedBindings)) {
                     importInfo.namespace = namedBindings.name.text;
                 }
                 namedBindings.forEachChild((node) => {
-                    var _a;
                     if (ts.isImportSpecifier(node)) {
                         importInfo.members.push({
                             name: node.name.text,
-                            propertyName: (_a = node.propertyName) === null || _a === void 0 ? void 0 : _a.text,
+                            propertyName: node.propertyName?.text,
                         });
                     }
                 });
@@ -50,7 +52,9 @@ const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
         // call inject-global-components require method
         const requireCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier(builtin_1.BuiltinModulesGlobalVariableName), 'require'), undefined, [factory.createStringLiteral(importInfo.moduleName)]);
         // create await expression if the module is ../ or ./
-        const mod = (0, exports.isRelativeModule)(importInfo.moduleName) ? factory.createAwaitExpression(requireCall) : requireCall;
+        const mod = (0, exports.isRelativeModule)(importInfo.moduleName) || (0, exports.isAwaitModule)(importInfo.moduleName)
+            ? factory.createAwaitExpression(requireCall)
+            : requireCall;
         return [
             importInfo.name
                 ? factory.createVariableStatement([], factory.createVariableDeclarationList([
@@ -65,9 +69,8 @@ const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
                 : undefined,
             // handle named import
             ...importInfo.members.map((member) => {
-                var _a;
                 return factory.createVariableStatement([], factory.createVariableDeclarationList([
-                    factory.createVariableDeclaration(factory.createIdentifier(member.name), undefined, undefined, factory.createPropertyAccessExpression(mod, (_a = member.propertyName) !== null && _a !== void 0 ? _a : member.name)),
+                    factory.createVariableDeclaration(factory.createIdentifier(member.name), undefined, undefined, factory.createPropertyAccessExpression(mod, member.propertyName ?? member.name)),
                 ], ts.NodeFlags.Const));
             }),
         ].filter((i) => !!i);

package/lib/esm/api/call.js

@@ -1,20 +1,9 @@
-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());
-    });
-};
 import { call } from '@blocklet/sdk/lib/component';
-export function preloadComponents(input) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return call({
-            name: 'pages-kit',
-            method: 'POST',
-            path: '/api/components/preload',
-            data: input,
-        }).then((res) => res.data);
-    });
+export async function preloadComponents(input) {
+    return call({
+        name: 'pages-kit',
+        method: 'POST',
+        path: '/api/components/preload',
+        data: input,
+    }).then((res) => res.data);
 }

package/lib/esm/api/pages-kit.js

@@ -1,21 +1,9 @@
-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());
-    });
-};
 import axios from 'axios';
 import { joinURL } from 'ufo';
 const PAGES_KIT_DID = 'z8iZiDFg3vkkrPwsiba1TLXy3H9XHzFERsP8o';
-export function preloadComponents(input) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const prefix = ((_b = (_a = window.blocklet) === null || _a === void 0 ? void 0 : _a.componentMountPoints.find((i) => i.did === PAGES_KIT_DID && i.status === 'running')) === null || _b === void 0 ? void 0 : _b.mountPoint) ||
-            ((_c = window === null || window === void 0 ? void 0 : window.blocklet) === null || _c === void 0 ? void 0 : _c.prefix) ||
-            '/';
-        return axios.post(joinURL(prefix, '/api/components/preload'), input).then((res) => res.data);
-    });
+export async function preloadComponents(input) {
+    const prefix = window.blocklet?.componentMountPoints.find((i) => i.did === PAGES_KIT_DID && i.status === 'running')?.mountPoint ||
+        window?.blocklet?.prefix ||
+        '/';
+    return axios.post(joinURL(prefix, '/api/components/preload'), input).then((res) => res.data);
 }

package/lib/esm/builtin/async/react-scroll-to-bottom.js

@@ -5,4 +5,8 @@ export default () => Promise.all([
             import('react-scroll-to-bottom/lib/esm/hooks/internal/useInternalContext')
         : // @ts-ignore
             import('react-scroll-to-bottom/lib/hooks/internal/useInternalContext'),
-]).then(([mod, { default: useInternalContext }]) => (Object.assign(Object.assign({}, mod), { Composer: mod.Composer, useInternalContext })));
+]).then(([mod, { default: useInternalContext }]) => ({
+    ...mod,
+    Composer: mod.Composer,
+    useInternalContext,
+}));

package/lib/esm/builtin/components/LanguageField/index.js

@@ -1,14 +1,3 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
@@ -25,18 +14,17 @@ const filter = (options, state) => {
         return true;
     });
 };
-const LanguageField = forwardRef((_a, ref) => {
-    var { readOnly, parameter, onChange } = _a, props = __rest(_a, ["readOnly", "parameter", "onChange"]);
+const LanguageField = forwardRef(({ readOnly, parameter, onChange, ...props }, ref) => {
     const { locale } = useLocaleContext();
-    const value = (props === null || props === void 0 ? void 0 : props.value) ? languages.find((o) => o.en === props.value) : null;
-    return (_jsx(Autocomplete, Object.assign({ size: "small", ref: ref }, pick(props, 'autoFocus', 'fullWidth', 'sx', 'className', 'style'), { renderInput: (params) => (_jsx(TextField, Object.assign({}, pick(props, 'inputRef', 'size', 'hiddenLabel', 'helperText', 'error', 'placeholder', 'InputProps', 'inputProps'), params))), options: languages, getOptionKey: (i) => i.en, getOptionLabel: (o) => {
+    const value = props?.value ? languages.find((o) => o.en === props.value) : null;
+    return (_jsx(Autocomplete, { size: "small", ref: ref, ...pick(props, 'autoFocus', 'fullWidth', 'sx', 'className', 'style'), renderInput: (params) => (_jsx(TextField, { ...pick(props, 'inputRef', 'size', 'hiddenLabel', 'helperText', 'error', 'placeholder', 'InputProps', 'inputProps'), ...params })), options: languages, getOptionKey: (i) => i.en, getOptionLabel: (o) => {
             return locale === 'zh' ? o.cn : o.en;
         }, autoHighlight: true, value: value, filterOptions: filter, onChange: (_e, newValue) => {
-            onChange === null || onChange === void 0 ? void 0 : onChange(newValue === null || newValue === void 0 ? void 0 : newValue.en);
+            onChange?.(newValue?.en);
         }, renderOption: (props, option) => {
-            return (_createElement(MenuItem, Object.assign({}, props, { key: option.name }),
+            return (_createElement(MenuItem, { ...props, key: option.name },
                 _jsx(ListItemIcon, { children: _jsx(option.flag, {}) }),
                 _jsx(ListItemText, { primary: `${option.name} ${locale === 'zh' ? option.cn : option.en} (${option.abbr})` })));
-        } })));
+        } }));
 });
 export default LanguageField;

package/lib/esm/builtin/iconify/react.js

@@ -2,6 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Icon as IconifyIcon } from '@iconify/react';
 import { Box } from '@mui/material';
 export function Icon(props) {
-    return _jsx(Box, Object.assign({ component: IconifyIcon }, props));
+    return _jsx(Box, { component: IconifyIcon, ...props });
 }
 export default Icon;

package/lib/esm/builtin/page/header.js

@@ -22,12 +22,15 @@ export const useHeaderState = create()(immer((set, get) => ({
         for (const i of get().stack) {
             widgets.push(i());
         }
-        const r = widgets.reduce((res, i) => (Object.assign(Object.assign(Object.assign({}, res), i), { addons: (exists) => {
-                var _a, _b, _c, _d;
-                const a = (_b = (_a = res.addons) === null || _a === void 0 ? void 0 : _a.call(res, exists)) !== null && _b !== void 0 ? _b : exists;
-                const b = (_d = (_c = i.addons) === null || _c === void 0 ? void 0 : _c.call(i, a)) !== null && _d !== void 0 ? _d : a;
+        const r = widgets.reduce((res, i) => ({
+            ...res,
+            ...i,
+            addons: (exists) => {
+                const a = res.addons?.(exists) ?? exists;
+                const b = i.addons?.(a) ?? a;
                 return b;
-            } })), {});
+            },
+        }), {});
         set((state) => {
             state.logo = r.logo;
             state.description = r.description;

package/lib/esm/builtin/session.js

@@ -1 +1,6 @@
+import { SessionContext } from '@arcblock/did-connect/lib/Session';
+import { useContext } from 'react';
 export * from '@arcblock/did-connect/lib/Session';
+export function useSessionContext() {
+    return useContext(SessionContext);
+}

package/lib/esm/builtin/stream.js

@@ -21,7 +21,7 @@ export class EventSourceParserStream extends TransformStream {
                 });
             },
             transform(chunk) {
-                parser === null || parser === void 0 ? void 0 : parser.feed(chunk);
+                parser?.feed(chunk);
             },
         });
     }

package/lib/esm/builtin/utils.js

@@ -1,18 +1,16 @@
 import { joinURL } from 'ufo';
 export { joinURL, withQuery, getQuery } from 'ufo';
 export function getComponentMountPoint(name) {
-    var _a, _b;
     if (typeof window === 'undefined') {
         // eslint-disable-next-line global-require
         return require('@blocklet/sdk/lib/component').getComponentMountPoint(name);
     }
-    return (_b = (_a = globalThis.blocklet) === null || _a === void 0 ? void 0 : _a.componentMountPoints.find((i) => i.name === name || i.did === name)) === null || _b === void 0 ? void 0 : _b.mountPoint;
+    return globalThis.blocklet?.componentMountPoints.find((i) => i.name === name || i.did === name)?.mountPoint;
 }
 export function getMediaKitAbsoluteUrl(url) {
-    var _a, _b;
-    const PREFIX = ((_a = window.blocklet) === null || _a === void 0 ? void 0 : _a.prefix) || '/';
+    const PREFIX = window.blocklet?.prefix || '/';
     const IMAGE_BIN_DID = 'z8ia1mAXo8ZE7ytGF36L5uBf9kD2kenhqFGp9';
-    const IMAGE_BIN_PREFIX = ((_b = blocklet === null || blocklet === void 0 ? void 0 : blocklet.componentMountPoints.find((i) => i.did === IMAGE_BIN_DID)) === null || _b === void 0 ? void 0 : _b.mountPoint) || joinURL(PREFIX, '/image-bin');
+    const IMAGE_BIN_PREFIX = blocklet?.componentMountPoints.find((i) => i.did === IMAGE_BIN_DID)?.mountPoint || joinURL(PREFIX, '/image-bin');
     if (url && url.startsWith('mediakit://')) {
         return window.location.origin + joinURL(IMAGE_BIN_PREFIX, 'uploads', url.replace('mediakit://', ''));
     }

package/lib/esm/components/CustomComponentRenderer/BlockletReactComponentRenderer.js

@@ -1,23 +1,10 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import { getComponentMountPoint, joinURL } from '../../builtin/utils';
-export default function BlockletReactComponentRenderer(_a) {
-    var props = __rest(_a, []);
+export default function BlockletReactComponentRenderer({ ...props }) {
     const url = useMemo(() => {
-        var _a, _b, _c, _d;
-        const did = (_b = (_a = props.properties) === null || _a === void 0 ? void 0 : _a.blockletDid) === null || _b === void 0 ? void 0 : _b.value;
-        const path = (_d = (_c = props.properties) === null || _c === void 0 ? void 0 : _c.componentPath) === null || _d === void 0 ? void 0 : _d.value;
+        const did = props.properties?.blockletDid?.value;
+        const path = props.properties?.componentPath?.value;
         if (!did || !path)
             return null;
         return joinURL(window.location.origin, getComponentMountPoint(did), path);
@@ -26,11 +13,10 @@ export default function BlockletReactComponentRenderer(_a) {
         throw new Error('Missing required properties `blockletDid` or `componentPath`');
     }
     const C = loadComponent(url);
-    return _jsx(C, Object.assign({}, props.props));
+    return _jsx(C, { ...props.props });
 }
 const COMPONENTS_CACHE = {};
 function loadComponent(url) {
-    var _a;
-    (_a = COMPONENTS_CACHE[url]) !== null && _a !== void 0 ? _a : (COMPONENTS_CACHE[url] = React.lazy(() => import(/* @vite-ignore */ url)));
+    COMPONENTS_CACHE[url] ??= React.lazy(() => import(/* @vite-ignore */ url));
     return COMPONENTS_CACHE[url];
 }

package/lib/esm/components/CustomComponentRenderer/DevProvider.js

@@ -1,20 +1,8 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useContext } from 'react';
 const devContext = createContext(undefined);
-export function DevProvider(_a) {
-    var { dev } = _a, props = __rest(_a, ["dev"]);
-    return _jsx(devContext.Provider, Object.assign({ value: dev }, props));
+export function DevProvider({ dev, ...props }) {
+    return _jsx(devContext.Provider, { value: dev, ...props });
 }
 export function useDev() {
     return useContext(devContext);

package/lib/esm/components/CustomComponentRenderer/ErrorComponent.js

@@ -1,18 +1,6 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Typography, Button } from '@mui/material';
-export const ComponentError = (_a) => {
-    var { title = 'Component Failed to Load', message, componentId, componentName, blockletId, blockletTitle, showHints = false, error, resetErrorBoundary } = _a, rest = __rest(_a, ["title", "message", "componentId", "componentName", "blockletId", "blockletTitle", "showHints", "error", "resetErrorBoundary"]);
+export const ComponentError = ({ title = 'Component Failed to Load', message, componentId, componentName, blockletId, blockletTitle, showHints = false, error, resetErrorBoundary, ...rest }) => {
     // 如果提供了error但没有message，使用error.message
     const displayMessage = message || (error ? error.message : 'Unknown error');
     console.warn(rest);
@@ -32,5 +20,5 @@ export const ComponentError = (_a) => {
                     fontSize: '0.75rem',
                     overflow: 'auto',
                     maxHeight: '200px',
-                }, children: error.stack })), showHints && (_jsxs(_Fragment, { children: [_jsx(Typography, { variant: "body2", sx: { color: 'text.secondary' }, children: "Please try the following:" }), _jsxs(Box, { component: "ul", sx: { m: 0, pl: 2 }, children: [componentId && (_jsxs(Typography, { component: "li", variant: "body2", sx: { color: 'text.secondary' }, children: ["Select component", ' ', _jsx(Box, { component: "span", sx: { fontWeight: 500 }, children: componentName !== null && componentName !== void 0 ? componentName : componentId }), ' ', "in settings or create this component."] })), (blockletId || blockletTitle) && (_jsxs(Typography, { component: "li", variant: "body2", sx: { color: 'text.secondary' }, children: ["Contact administrator to install", ' ', _jsx(Box, { component: "span", sx: { fontWeight: 500 }, children: blockletTitle !== null && blockletTitle !== void 0 ? blockletTitle : blockletId }), ' ', "Blocklet"] }))] })] })), resetErrorBoundary && (_jsx(Box, { sx: { mt: 2 }, children: _jsx(Button, { variant: "outlined", color: "error", size: "small", onClick: resetErrorBoundary, children: "Try Again" }) }))] }));
+                }, children: error.stack })), showHints && (_jsxs(_Fragment, { children: [_jsx(Typography, { variant: "body2", sx: { color: 'text.secondary' }, children: "Please try the following:" }), _jsxs(Box, { component: "ul", sx: { m: 0, pl: 2 }, children: [componentId && (_jsxs(Typography, { component: "li", variant: "body2", sx: { color: 'text.secondary' }, children: ["Select component", ' ', _jsx(Box, { component: "span", sx: { fontWeight: 500 }, children: componentName ?? componentId }), ' ', "in settings or create this component."] })), (blockletId || blockletTitle) && (_jsxs(Typography, { component: "li", variant: "body2", sx: { color: 'text.secondary' }, children: ["Contact administrator to install", ' ', _jsx(Box, { component: "span", sx: { fontWeight: 500 }, children: blockletTitle ?? blockletId }), ' ', "Blocklet"] }))] })] })), resetErrorBoundary && (_jsx(Box, { sx: { mt: 2 }, children: _jsx(Button, { variant: "outlined", color: "error", size: "small", onClick: resetErrorBoundary, children: "Try Again" }) }))] }));
 };