@blocklet/meta 1.8.68 → 1.8.69-beta-54faead3

package/lib/channel.d.ts

@@ -1,27 +1,32 @@
 declare const getAppPublicChannelRegex: () => RegExp;
+declare const getRelayChannelRegex: () => RegExp;
 declare const getAppPublicChannel: (appDid: string) => string;
+declare const getRelayChannel: (appDid: string, topic: string) => string;
 declare const CHANNEL_TYPE: {
     DID: string;
     APP: string;
+    RELAY: string;
 };
 declare const parseChannel: (channel: string) => {
     type: string;
     appDid?: string;
+    topic?: string;
 };
-export { CHANNEL_TYPE };
-export { getAppPublicChannel };
-export { getAppPublicChannelRegex };
-export { parseChannel };
+export { CHANNEL_TYPE, getAppPublicChannel, getAppPublicChannelRegex, getRelayChannel, getRelayChannelRegex, parseChannel, };
 declare const _default: {
     CHANNEL_TYPE: {
         DID: string;
         APP: string;
+        RELAY: string;
     };
     getAppPublicChannel: (appDid: string) => string;
     getAppPublicChannelRegex: () => RegExp;
+    getRelayChannel: (appDid: string, topic: string) => string;
+    getRelayChannelRegex: () => RegExp;
     parseChannel: (channel: string) => {
         type: string;
         appDid?: string;
+        topic?: string;
     };
 };
 export default _default;

package/lib/channel.js

@@ -1,26 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseChannel = exports.getAppPublicChannelRegex = exports.getAppPublicChannel = exports.CHANNEL_TYPE = void 0;
+exports.parseChannel = exports.getRelayChannelRegex = exports.getRelayChannel = exports.getAppPublicChannelRegex = exports.getAppPublicChannel = exports.CHANNEL_TYPE = void 0;
 /* eslint-disable @typescript-eslint/indent */
 const did_1 = require("@arcblock/did");
 const getAppPublicChannelRegex = () => /app:(\w+):public/;
 exports.getAppPublicChannelRegex = getAppPublicChannelRegex;
+const getRelayChannelRegex = () => /relay:(\w+):(\w+)/;
+exports.getRelayChannelRegex = getRelayChannelRegex;
 const getAppPublicChannel = (appDid) => `app:${appDid}:public`;
 exports.getAppPublicChannel = getAppPublicChannel;
+const getRelayChannel = (appDid, topic) => `relay:${appDid}:${topic}`;
+exports.getRelayChannel = getRelayChannel;
 const CHANNEL_TYPE = {
     DID: 'DID',
     APP: 'APP',
+    RELAY: 'RELAY',
 };
 exports.CHANNEL_TYPE = CHANNEL_TYPE;
 const parseChannel = (channel) => {
     if (!channel) {
         throw new Error('Channel should not be empty');
     }
-    const matchAppPublicChannel = getAppPublicChannelRegex().exec(channel);
-    if (matchAppPublicChannel) {
+    let match = getRelayChannelRegex().exec(channel);
+    if (match && (0, did_1.isValid)(match[1])) {
+        return {
+            type: CHANNEL_TYPE.RELAY,
+            appDid: match[1],
+            topic: match[2],
+        };
+    }
+    match = getAppPublicChannelRegex().exec(channel);
+    if (match && (0, did_1.isValid)(match[1])) {
         return {
             type: CHANNEL_TYPE.APP,
-            appDid: matchAppPublicChannel[1],
+            appDid: match[1],
         };
     }
     if ((0, did_1.isValid)(channel)) {
@@ -35,5 +48,7 @@ exports.default = {
     CHANNEL_TYPE,
     getAppPublicChannel,
     getAppPublicChannelRegex,
+    getRelayChannel,
+    getRelayChannelRegex,
     parseChannel,
 };

package/lib/did.js

@@ -3,6 +3,9 @@ const mcrypto_1 = require("@ocap/mcrypto");
 const util_1 = require("@ocap/util");
 const did_1 = require("@arcblock/did");
 const toBlockletDid = (name) => {
+    if ((0, did_1.isValid)(name)) {
+        return name;
+    }
     const pk = (0, util_1.toHex)(Buffer.from(typeof name === 'string' ? name.trim() : name));
     return (0, did_1.fromPublicKey)(pk, { role: mcrypto_1.types.RoleType.ROLE_ANY });
 };

package/lib/extension.d.ts

@@ -1,5 +1,9 @@
 import { Extension, Root } from 'joi';
 declare const fileExtension: (joi: Root) => Extension;
+/**
+ * joi extend did 判断
+ * 由于需要兼容新旧两种 did 模式判断，所以这里不能做 role 类型判断
+ */
 declare const didExtension: (joi: Root) => Extension;
 export { fileExtension };
 export { didExtension };

package/lib/extension.js

@@ -60,6 +60,10 @@ const fileExtension = (joi) => ({
     },
 });
 exports.fileExtension = fileExtension;
+/**
+ * joi extend did 判断
+ * 由于需要兼容新旧两种 did 模式判断，所以这里不能做 role 类型判断
+ */
 const didExtension = (joi) => ({
     type: 'DID',
     base: joi.string(),

package/lib/file.d.ts

@@ -6,7 +6,9 @@ declare const select: (dir: string, { throwOnError }?: {
 declare const update: (file: string, meta: TBlockletMeta, { fix }?: {
     fix?: boolean;
 }) => void;
+declare const read: (file: string) => unknown;
 export { list };
+export { read };
 export { select };
 export { update };
 declare const _default: {

package/lib/file.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.update = exports.select = exports.list = void 0;
+exports.update = exports.select = exports.read = exports.list = void 0;
 const path_1 = __importDefault(require("path"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -43,6 +43,11 @@ const update = (file, meta, { fix = true } = {}) => {
     fs_extra_1.default.writeFileSync(file, js_yaml_1.default.dump(meta, { sortKeys: false, skipInvalid: true }));
 };
 exports.update = update;
+const read = (file) => {
+    const fileContent = fs_extra_1.default.readFileSync(file, 'utf8').toString();
+    return js_yaml_1.default.load(fileContent);
+};
+exports.read = read;
 exports.default = {
     list,
     select,

package/lib/fix.d.ts

@@ -8,12 +8,14 @@ declare const formatPerson: (person: string | Record<string, any>) => string;
 declare const parsePerson: (person: string) => any;
 declare const fixPerson: (data: any) => any;
 declare const fixInterfaces: (meta: any, removeMerged?: boolean) => any;
+declare const fixName: (meta: any) => any;
 export { fixRequired };
 export { fixRepository };
 export { fixFiles };
 export { fixKeywords };
 export { fixPerson };
 export { fixTags };
+export { fixName };
 export { formatPerson };
 export { parsePerson };
 export { fixInterfaces };
@@ -25,6 +27,7 @@ declare const _default: {
     fixKeywords: (data: any) => void;
     fixPerson: (data: any) => any;
     fixTags: (data: any) => void;
+    fixName: (meta: any) => any;
     formatPerson: (person: string | Record<string, any>) => string;
     parsePerson: (person: string) => any;
     fixInterfaces: (meta: any, removeMerged?: boolean) => any;

package/lib/fix.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixService = exports.fixInterfaces = exports.parsePerson = exports.formatPerson = exports.fixTags = exports.fixPerson = exports.fixKeywords = exports.fixFiles = exports.fixRepository = exports.fixRequired = void 0;
+exports.fixService = exports.fixInterfaces = exports.parsePerson = exports.formatPerson = exports.fixName = exports.fixTags = exports.fixPerson = exports.fixKeywords = exports.fixFiles = exports.fixRepository = exports.fixRequired = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const get_1 = __importDefault(require("lodash/get"));
@@ -35,6 +35,7 @@ const debug_1 = __importDefault(require("debug"));
 const validate_1 = require("./validate");
 Object.defineProperty(exports, "fixService", { enumerable: true, get: function () { return validate_1.fixAndValidateService; } });
 const constants_1 = __importDefault(require("./constants"));
+const name_1 = require("./name");
 const debug = (0, debug_1.default)('@blocklet/meta:fix');
 const { BLOCKLET_DEFAULT_VERSION, BLOCKLET_DEFAULT_PORT_NAME, BLOCKLET_DYNAMIC_PATH_PREFIX, BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_INTERFACE_PUBLIC, } = constants_1.default;
 // Assign sensible defaults: description/main/group/version/public_url
@@ -228,6 +229,18 @@ const fixInterfaces = (meta, removeMerged = true) => {
     return meta;
 };
 exports.fixInterfaces = fixInterfaces;
+const fixName = (meta) => {
+    const { did } = meta;
+    try {
+        (0, name_1.validateNewDid)(did);
+        meta.name = did;
+    }
+    catch {
+        /* empty */
+    }
+    return meta;
+};
+exports.fixName = fixName;
 exports.default = {
     fixRequired,
     fixRepository,
@@ -235,6 +248,7 @@ exports.default = {
     fixKeywords,
     fixPerson,
     fixTags,
+    fixName,
     formatPerson,
     parsePerson,
     fixInterfaces,

package/lib/index.d.ts

@@ -6,13 +6,14 @@ import getBlockletWallet from './wallet';
 import getBlockletInfo from './info';
 import getBlockletEngine from './engine';
 import { validateMeta, fixAndValidateService } from './validate';
-import { formatPerson, parsePerson, fixPerson, fixInterfaces, fixService } from './fix';
-import { list, select, update } from './file';
+import { formatPerson, parsePerson, fixPerson, fixInterfaces, fixService, fixName } from './fix';
+import { list, select, update, read } from './file';
 import verifyMultiSig from './verify-multi-sig';
 export { constants };
 export { list };
 export { select };
 export { update };
+export { read };
 export { parse };
 export { validateMeta };
 export { fixAndValidateService };
@@ -21,6 +22,7 @@ export { parsePerson };
 export { fixPerson };
 export { fixInterfaces };
 export { fixService };
+export { fixName };
 export { toBlockletDid };
 export { getBlockletWallet };
 export { getBlockletInfo };
@@ -35,6 +37,7 @@ declare const _default: {
     update: (file: string, meta: import("./types").TBlockletMeta, { fix }?: {
         fix?: boolean;
     }) => void;
+    read: (file: string) => unknown;
     parse: (dir: string, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, extraRawAttrs, schemaOptions, defaultStoreUrl, fix, }?: {
         ensureMain?: boolean;
         ensureFiles?: boolean;
@@ -59,6 +62,7 @@ declare const _default: {
     parsePerson: (person: string) => any;
     fixPerson: (data: any) => any;
     fixInterfaces: (meta: any, removeMerged?: boolean) => any;
+    fixName: (meta: any) => any;
     fixService: (meta: import("./types").TBlockletMeta) => import("./types").TBlockletMeta;
     toBlockletDid: {
         (name: string | Buffer): string;
@@ -70,7 +74,7 @@ declare const _default: {
             name: string;
         };
     };
-    getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: import("@arcblock/did").DIDType, index?: number) => import("@ocap/wallet").WalletObject<string>;
+    getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: string | import("@arcblock/did").DIDType, index?: number) => import("@ocap/wallet").WalletObject<string>;
     getBlockletInfo: (state: import("@abtnode/client").BlockletState, nodeSk?: string, { returnWallet }?: {
         returnWallet?: boolean;
     }) => {
@@ -78,9 +82,10 @@ declare const _default: {
         name: string;
         version: string;
         description: string;
-        passportColor?: string;
+        passportColor: string;
         appUrl: string;
-        wallet?: import("@ocap/wallet").WalletObject<string>;
+        wallet: import("@ocap/wallet").WalletObject<string>;
+        permanentWallet: import("@ocap/wallet").WalletObject<string>;
     };
     getBlockletEngine: (meta: import("./types").TBlockletMeta) => import("./types").TEngine;
     verifyMultiSig: (blockletMeta: import("./types").TBlockletMeta) => boolean;

package/lib/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyMultiSig = exports.getBlockletEngine = exports.getBlockletInfo = exports.getBlockletWallet = exports.toBlockletDid = exports.fixService = exports.fixInterfaces = exports.fixPerson = exports.parsePerson = exports.formatPerson = exports.fixAndValidateService = exports.validateMeta = exports.parse = exports.update = exports.select = exports.list = exports.constants = void 0;
+exports.verifyMultiSig = exports.getBlockletEngine = exports.getBlockletInfo = exports.getBlockletWallet = exports.toBlockletDid = exports.fixName = exports.fixService = exports.fixInterfaces = exports.fixPerson = exports.parsePerson = exports.formatPerson = exports.fixAndValidateService = exports.validateMeta = exports.parse = exports.read = exports.update = exports.select = exports.list = exports.constants = void 0;
 const constants_1 = __importDefault(require("./constants"));
 exports.constants = constants_1.default;
 const parse_1 = __importDefault(require("./parse"));
@@ -25,10 +25,12 @@ Object.defineProperty(exports, "parsePerson", { enumerable: true, get: function
 Object.defineProperty(exports, "fixPerson", { enumerable: true, get: function () { return fix_1.fixPerson; } });
 Object.defineProperty(exports, "fixInterfaces", { enumerable: true, get: function () { return fix_1.fixInterfaces; } });
 Object.defineProperty(exports, "fixService", { enumerable: true, get: function () { return fix_1.fixService; } });
+Object.defineProperty(exports, "fixName", { enumerable: true, get: function () { return fix_1.fixName; } });
 const file_1 = require("./file");
 Object.defineProperty(exports, "list", { enumerable: true, get: function () { return file_1.list; } });
 Object.defineProperty(exports, "select", { enumerable: true, get: function () { return file_1.select; } });
 Object.defineProperty(exports, "update", { enumerable: true, get: function () { return file_1.update; } });
+Object.defineProperty(exports, "read", { enumerable: true, get: function () { return file_1.read; } });
 const verify_multi_sig_1 = __importDefault(require("./verify-multi-sig"));
 exports.verifyMultiSig = verify_multi_sig_1.default;
 exports.default = {
@@ -36,6 +38,7 @@ exports.default = {
     list: file_1.list,
     select: file_1.select,
     update: file_1.update,
+    read: file_1.read,
     parse: parse_1.default,
     validateMeta: validate_1.validateMeta,
     fixAndValidateService: validate_1.fixAndValidateService,
@@ -43,6 +46,7 @@ exports.default = {
     parsePerson: fix_1.parsePerson,
     fixPerson: fix_1.fixPerson,
     fixInterfaces: fix_1.fixInterfaces,
+    fixName: fix_1.fixName,
     fixService: fix_1.fixService,
     toBlockletDid: did_1.default,
     getBlockletWallet: wallet_1.default,

package/lib/info.d.ts

@@ -7,8 +7,9 @@ declare const getBlockletInfo: (state: BlockletState, nodeSk?: string, { returnW
     name: string;
     version: string;
     description: string;
-    passportColor?: string;
+    passportColor: string;
     appUrl: string;
-    wallet?: WalletObject;
+    wallet: WalletObject;
+    permanentWallet: WalletObject;
 };
 export = getBlockletInfo;

package/lib/info.js

@@ -25,21 +25,26 @@ const getBlockletInfo = (state, nodeSk, { returnWallet = true } = {}) => {
             version,
             name,
             description,
+            passportColor,
             appUrl,
+            wallet: null,
+            permanentWallet: null,
         };
     }
     const customSk = envs.find((x) => x.key === 'BLOCKLET_APP_SK');
     const customType = envs.find((x) => x.key === 'BLOCKLET_WALLET_TYPE');
+    const permanentSk = envs.find((x) => x.key === 'BLOCKLET_APP_PSK');
     let type;
     if (customType && customType.value === 'eth') {
         type = customType.value;
     }
     let wallet = null;
-    if (customSk && customSk.value && customType) {
-        wallet = (0, wallet_1.default)(customSk.value, null, type);
-    }
-    else if (customSk && customSk.value) {
-        wallet = (0, wallet_1.default)(customSk.value);
+    let permanentWallet = null;
+    if (customSk && customSk.value) {
+        wallet = (0, wallet_1.default)(customSk.value, undefined, type);
+        if (permanentSk && permanentSk.value && permanentSk.value !== customSk.value) {
+            permanentWallet = (0, wallet_1.default)(permanentSk.value, undefined, type);
+        }
     }
     else {
         if (!nodeSk || typeof nodeSk !== 'string') {
@@ -60,6 +65,7 @@ const getBlockletInfo = (state, nodeSk, { returnWallet = true } = {}) => {
         passportColor,
         appUrl,
         wallet,
+        permanentWallet: permanentWallet || wallet,
     };
 };
 module.exports = getBlockletInfo;

package/lib/name.d.ts

@@ -1,5 +1,11 @@
+/**
+ * 检查一个 did 是否为新版 blocklet-did（这里只需要判断是否为 ROLE_BLOCKLET 即可）
+ * @param did 需要检查是否为新版 did 的值
+ */
+export declare const validateNewDid: (did: string) => void;
 export declare const validateName: (name: string) => void;
 declare const _default: {
     validateName: (name: string) => void;
+    validateNewDid: (did: string) => void;
 };
 export default _default;

package/lib/name.js

@@ -3,15 +3,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateName = void 0;
+exports.validateName = exports.validateNewDid = void 0;
+const did_1 = require("@arcblock/did");
 const validate_npm_package_name_1 = __importDefault(require("validate-npm-package-name"));
+const MAX_NAME_LENGTH = 32;
+/**
+ * 检查一个 did 是否为新版 blocklet-did（这里只需要判断是否为 ROLE_BLOCKLET 即可）
+ * @param did 需要检查是否为新版 did 的值
+ */
+const validateNewDid = (did) => {
+    const typeInfo = (0, did_1.toTypeInfo)(did);
+    if (typeInfo.role !== did_1.types.RoleType.ROLE_BLOCKLET) {
+        throw new Error("Blocklet DID's type must be ROLE_BLOCKLET");
+    }
+};
+exports.validateNewDid = validateNewDid;
 const validateName = (name) => {
-    const { validForNewPackages, errors = [], warnings = [] } = (0, validate_npm_package_name_1.default)(name);
-    if (!validForNewPackages) {
-        throw new Error(errors[0] || warnings[0]);
+    if ((0, did_1.isValid)(name)) {
+        // new did mode
+        (0, exports.validateNewDid)(name);
+    }
+    else {
+        // old did mode
+        const { validForNewPackages, errors = [], warnings = [] } = (0, validate_npm_package_name_1.default)(name);
+        if (!validForNewPackages) {
+            throw new Error(errors[0] || warnings[0]);
+        }
+        if (name.length > MAX_NAME_LENGTH) {
+            throw new Error('Blocklet name is too long');
+        }
     }
 };
 exports.validateName = validateName;
 exports.default = {
     validateName: exports.validateName,
+    validateNewDid: exports.validateNewDid,
 };

package/lib/parse-navigation-from-blocklet.js

@@ -74,13 +74,13 @@ function tryParseItem(item) {
     try {
         return JSON.parse(item);
     }
-    catch (_a) {
+    catch {
         return item;
     }
 }
 function normalizeNavigationList(navigationList) {
     return navigationList.map((item) => {
-        const tempData = Object.assign({}, item);
+        const tempData = { ...item };
         if (tempData.role) {
             tempData.role = tryParseItem(tempData.role);
         }
@@ -209,11 +209,10 @@ function parseBlockletNavigationList(blocklet = {}) {
      * @returns
      */
     function genNavigationListByBlocklet(current, parent = {}) {
-        var _a, _b, _c, _d, _e, _f, _g;
         const targetList = [];
         const { children = [], meta = {} } = current;
-        const navigation = (0, cloneDeep_1.default)((meta === null || meta === void 0 ? void 0 : meta.navigation) || []);
-        if (((_b = (_a = current.meta) === null || _a === void 0 ? void 0 : _a.capabilities) === null || _b === void 0 ? void 0 : _b.navigation) !== false) {
+        const navigation = (0, cloneDeep_1.default)(meta?.navigation || []);
+        if (current.meta?.capabilities?.navigation !== false) {
             targetList.push(...navigation);
         }
         const parentName = parent.name || '';
@@ -226,15 +225,17 @@ function parseBlockletNavigationList(blocklet = {}) {
             const mergeName = [parentName, currentName, childName].filter(Boolean).join('.');
             const childNavigation = child.meta.navigation || [];
             const mergeBase = (0, url_join_1.default)(parentBase, currentBase, childBase);
-            if (((_d = (_c = child.meta) === null || _c === void 0 ? void 0 : _c.capabilities) === null || _d === void 0 ? void 0 : _d.navigation) !== false) {
+            if (child.meta?.capabilities?.navigation !== false) {
                 components.push({
                     did: child.meta.did,
                     name: mergeName,
                     link: mergeBase,
                     title: child.meta.title || '',
-                    navigation: childNavigation.map((item) => (Object.assign({ 
+                    navigation: childNavigation.map((item) => ({
                         // 给每个 navigation 赋予一个 setion，用于在 autocomplete 提供依据 section 筛选的基础
-                        section: DEFAULT_SECTION }, item))),
+                        section: DEFAULT_SECTION,
+                        ...item,
+                    })),
                 });
             }
             // 在现有的 navigation 中判断是否存在 children
@@ -250,7 +251,7 @@ function parseBlockletNavigationList(blocklet = {}) {
                     if (child.meta.navigation && child.meta.navigation.length > 0) {
                         const items = genNavigationListByBlocklet(child, { mountPoint: currentBase, name: currentName });
                         if (items.length > 0) {
-                            matchNavigation.items = (_e = matchNavigation.items) !== null && _e !== void 0 ? _e : [];
+                            matchNavigation.items = matchNavigation.items ?? [];
                             matchNavigation.items.push(...items);
                         }
                     }
@@ -259,7 +260,7 @@ function parseBlockletNavigationList(blocklet = {}) {
                     }
                 }
             }
-            else if (((_g = (_f = child.meta) === null || _f === void 0 ? void 0 : _f.capabilities) === null || _g === void 0 ? void 0 : _g.navigation) !== false) {
+            else if (child.meta?.capabilities?.navigation !== false) {
                 const childItems = genNavigationListByBlocklet(child, { mountPoint: currentBase, name: currentName });
                 // 否则动态注入一个 navigation
                 const tmpData = {
@@ -289,7 +290,6 @@ function parseBlockletNavigationList(blocklet = {}) {
 function patchBuiltinNavigation(navigation) {
     const copyNavigation = (0, cloneDeep_1.default)(navigation).filter((item) => item.id);
     deepWalk(copyNavigation, (item, parent) => {
-        var _a;
         if (item.items && item.items.length) {
             for (let i = item.items.length - 1; i >= 0; i--) {
                 if (!item.items[i].id) {
@@ -309,7 +309,7 @@ function patchBuiltinNavigation(navigation) {
             item.id = [parent.id, item.id].join(ID_SEPARATE);
         }
         item.from = item.from || 'yaml';
-        item.visible = (_a = item.visible) !== null && _a !== void 0 ? _a : true;
+        item.visible = item.visible ?? true;
     }, { key: 'items' });
     return copyNavigation;
 }
@@ -324,7 +324,6 @@ function compactNavigation(navigation, depth = 2) {
     const resData = flatternNavigation(copyNavigation, {
         depth,
         transform: (item, parent) => {
-            var _a;
             if (parent) {
                 if (!item._parent) {
                     item._parent = parent.id;
@@ -333,7 +332,7 @@ function compactNavigation(navigation, depth = 2) {
                     }
                 }
                 item.section = item.section || parent.section || [DEFAULT_SECTION];
-                item.visible = (_a = item.visible) !== null && _a !== void 0 ? _a : parent.visible;
+                item.visible = item.visible ?? parent.visible;
             }
             item.component = [parent.component, item.component].filter(Boolean).join('.');
             return item;
@@ -374,7 +373,7 @@ function getNavigationListBySection(navigationItem, section) {
             }
             return false;
         })
-            .map((item) => (Object.assign(Object.assign({}, item), { section })));
+            .map((item) => ({ ...item, section }));
     }
     return [];
 }
@@ -392,7 +391,11 @@ function splitNavigationBySection(navigation) {
         // eslint-disable-next-line no-inner-declarations
         function patchNavigationItem(item, section) {
             const sectionNavigationList = getNavigationListBySection(item, section);
-            itemNavigationList.push(Object.assign(Object.assign({}, baseNavigation), { section, items: sectionNavigationList }));
+            itemNavigationList.push({
+                ...baseNavigation,
+                section,
+                items: sectionNavigationList,
+            });
         }
         if (Array.isArray(navigationItem.section)) {
             for (const section of navigationItem.section) {
@@ -415,7 +418,10 @@ function splitNavigationBySection(navigation) {
             }
         }
         else {
-            itemNavigationList.push(Object.assign(Object.assign({}, navigationItem), { section: DEFAULT_SECTION }));
+            itemNavigationList.push({
+                ...navigationItem,
+                section: DEFAULT_SECTION,
+            });
         }
         allNavigationList.push(...itemNavigationList);
     }
@@ -453,7 +459,7 @@ exports.nestNavigationList = nestNavigationList;
 function filterNavigation(navigationList, components = []) {
     const nestedNavigation = nestNavigationList(navigationList);
     deepWalk(nestedNavigation, (item) => {
-        if (item === null || item === void 0 ? void 0 : item.component) {
+        if (item?.component) {
             if (!components.some((x) => x.name === item.component)) {
                 item.visible = false;
             }
@@ -467,14 +473,13 @@ function filterNavigation(navigationList, components = []) {
         }
     }, { key: 'items' });
     const filteredNavigation = nestedNavigation.filter((item) => {
-        var _a;
         if (item.visible === false)
             return false;
         // 如果某一菜单的 子菜单 均为隐藏状态，则一级菜单本身也不显示出来
         if (item.items &&
             Array.isArray(item.items) &&
             item.items.length > 0 &&
-            ((_a = item.items) === null || _a === void 0 ? void 0 : _a.every((v) => v.visible === false)))
+            item.items?.every((v) => v.visible === false))
             return false;
         return true;
     });
@@ -494,10 +499,9 @@ function cleanOrphanNavigation(list) {
 }
 exports.cleanOrphanNavigation = cleanOrphanNavigation;
 function parseNavigation(blocklet = {}, options = {}) {
-    var _a;
     const { beforeProcess = (v) => v } = options;
     const { navigationList: builtinNavigation, components } = parseBlockletNavigationList(blocklet);
-    const customNavigationList = ((_a = blocklet === null || blocklet === void 0 ? void 0 : blocklet.settings) === null || _a === void 0 ? void 0 : _a.navigations) || [];
+    const customNavigationList = blocklet?.settings?.navigations || [];
     const compactedNavigation = compactNavigation(beforeProcess(builtinNavigation));
     const patchedNavigation = patchBuiltinNavigation(compactedNavigation);
     const splitNavigation = splitNavigationBySection(patchedNavigation);
@@ -509,7 +513,7 @@ function parseNavigation(blocklet = {}, options = {}) {
                     const { section } = cur;
                     const link = smartJoinLink(cur.link, x.link);
                     const component = [cur.component, x.component].filter(Boolean).join('.');
-                    return Object.assign(Object.assign({}, x), { section, link, component, parent: '' });
+                    return { ...x, section, link, component, parent: '' };
                 }));
                 return all;
             }
@@ -520,10 +524,10 @@ function parseNavigation(blocklet = {}, options = {}) {
     const flatNavigation = flatternNavigation(levelUpNavigation, {
         transform(item, parent) {
             let { component } = item;
-            if (parent === null || parent === void 0 ? void 0 : parent.component) {
+            if (parent?.component) {
                 component = [parent.component, item.component].filter(Boolean).join('.');
             }
-            return Object.assign(Object.assign({}, item), { component });
+            return { ...item, component };
         },
     });
     const rawNavigation = (0, unionWith_1.default)(normalizeNavigationList(customNavigationList), flatNavigation, (prev, next) => {