@blocklet/pages-kit 0.4.32 → 0.4.34

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

@@ -1,5 +1,4 @@
 export function injectESModulesShimsOptions(options = {}) {
-    var _a;
     // if already initialized, return
     if (window.esmsInitOptions && !options.force) {
         return;
@@ -7,7 +6,7 @@ export 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/esm/utils/inject-global-components-dump-json.js

@@ -1128,7 +1128,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/esm/utils/inject-global-components.js

@@ -2,7 +2,6 @@ import 'es-module-shims';
 import React from 'react';
 import { joinURL } from 'ufo';
 import * as arcblockUx from '../builtin/arcblock/ux';
-import * as aiRuntime from '../builtin/async/ai-runtime';
 import * as imagePreview from '../builtin/async/image-preview';
 import * as reactMarkdown from '../builtin/async/react-markdown';
 import * as reactScrollToBottom from '../builtin/async/react-scroll-to-bottom';
@@ -30,14 +29,13 @@ import { BuiltinModulesGlobalVariableName } from '../types/builtin';
 import { isRelativeModule } from './typescript/builtin-module-transformer';
 // Initialize ES Module Shims before any imports
 export function injectGlobalComponents() {
-    var _a;
     const win = window || {};
     // if already initialized, return
     if (win[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
         };
@@ -70,13 +68,12 @@ export 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': import('../builtin/async/ai-runtime'),
     };
     // set global variable
     win[BuiltinModulesGlobalVariableName] = {
         modules,
         require(module) {
-            var _a;
             // handle builtin module
             const builtinModule = this.modules[module];
             if (builtinModule) {
@@ -85,7 +82,7 @@ export function injectGlobalComponents() {
             // handle relative path import
             if (isRelativeModule(module)) {
                 const fileName = module.split('/').pop();
-                const fullUrl = 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 = joinURL(window.location.origin, window?.blocklet?.prefix || '/', 'chunks', fileName);
                 if (enableShim) {
                     const mod = window.importShim(/* @vite-ignore */ fullUrl);
                     return mod;
@@ -97,11 +94,23 @@ export 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[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(),
             }));
@@ -138,21 +147,21 @@ export 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['${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/esm/utils/preload.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 { PreloadComponentScriptModule, PreloadComponentsStateGlobalVariableName, } from '../types';
 export function injectPreloadComponents(data) {
     if (!data)
@@ -20,10 +9,7 @@ export function injectPreloadComponents(data) {
                 throw new Error(`Only support inject script with module ${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/esm/utils/property.js

@@ -3,46 +3,43 @@ export function componentUMDName({ componentId }) {
     return `PagesCustomComponent${componentId}`;
 }
 export 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;
@@ -56,13 +53,18 @@ export function mergeComponent({ componentId, getComponent, locale, defaultLocal
     return { script, properties };
 }
 export const RenderNestedComponent = '__RENDER_NESTED_COMPONENT__';
+export function safeJSONParse(value) {
+    if (typeof value === 'object' && value !== null) {
+        return value;
+    }
+    return JSON.parse(value);
+}
 export 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);
@@ -81,14 +83,17 @@ export 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: 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/esm/utils/typescript/builtin-module-transformer.js

@@ -2,6 +2,9 @@ import { BuiltinModulesGlobalVariableName } from '../../types/builtin';
 export const isRelativeModule = (moduleSpecifier) => {
     return moduleSpecifier.startsWith('./') || moduleSpecifier.startsWith('../');
 };
+export const isAwaitModule = (moduleSpecifier) => {
+    return ['@blocklet/pages-kit/builtin/async/ai-runtime'].includes(moduleSpecifier);
+};
 export const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     const { factory } = context;
     // 统一的模块导入收集器
@@ -12,27 +15,25 @@ export 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,
                         });
                     }
                 });
@@ -46,7 +47,9 @@ export const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
         // call inject-global-components require method
         const requireCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier(BuiltinModulesGlobalVariableName), 'require'), undefined, [factory.createStringLiteral(importInfo.moduleName)]);
         // create await expression if the module is ../ or ./
-        const mod = isRelativeModule(importInfo.moduleName) ? factory.createAwaitExpression(requireCall) : requireCall;
+        const mod = isRelativeModule(importInfo.moduleName) || isAwaitModule(importInfo.moduleName)
+            ? factory.createAwaitExpression(requireCall)
+            : requireCall;
         return [
             importInfo.name
                 ? factory.createVariableStatement([], factory.createVariableDeclarationList([
@@ -61,9 +64,8 @@ export 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/types/builtin/session.d.ts

@@ -1 +1,14 @@
 export * from '@arcblock/did-connect/lib/Session';
+export declare function useSessionContext(): {
+    session: {
+        user?: {
+            did: string;
+            fullName: string;
+            avatar: string;
+            role: string;
+        };
+        loading?: boolean;
+        login: (cb?: () => void) => any;
+    };
+    events: any;
+};